From 67152b92424419a470ed2bb0cf5e5f8a8ced38de Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 28 Sep 2019 02:37:01 -0400 Subject: Split off more files from event_scripts --- data/scripts/kecleon.inc | 119 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) create mode 100644 data/scripts/kecleon.inc (limited to 'data/scripts/kecleon.inc') diff --git a/data/scripts/kecleon.inc b/data/scripts/kecleon.inc new file mode 100644 index 000000000..567b44037 --- /dev/null +++ b/data/scripts/kecleon.inc @@ -0,0 +1,119 @@ +Route120_EventScript_2722DB:: @ 82722DB + lock + faceplayer + setvar VAR_0x8009, 1 + goto Route120_EventScript_272336 + end + +Route120_EventScript_2722E8:: @ 82722E8 + lock + faceplayer + setvar VAR_0x8009, 2 + goto Route120_EventScript_272336 + end + +Route120_EventScript_2722F5:: @ 82722F5 + lock + faceplayer + setvar VAR_0x8009, 3 + goto Route120_EventScript_272336 + end + +Route120_EventScript_272302:: @ 8272302 + lock + faceplayer + setvar VAR_0x8009, 4 + goto Route120_EventScript_272336 + end + +Route120_EventScript_27230F:: @ 827230F + lock + faceplayer + setvar VAR_0x8009, 5 + goto Route120_EventScript_272336 + end + +Route119_EventScript_27231C:: @ 827231C + lock + faceplayer + setvar VAR_0x8009, 6 + goto Route119_EventScript_272336 + end + +Route119_EventScript_272329:: @ 8272329 + lock + faceplayer + setvar VAR_0x8009, 7 + goto Route119_EventScript_272336 + end + +Route119_EventScript_272336:: @ 8272336 +Route120_EventScript_272336:: @ 8272336 + checkitem ITEM_DEVON_SCOPE, 1 + compare VAR_RESULT, 1 + goto_if_eq Route119_EventScript_272350 + msgbox Route119_Text_1F5D00, MSGBOX_DEFAULT + release + end + +Route119_EventScript_272350:: @ 8272350 + msgbox Route119_Text_1F5D23, MSGBOX_YESNO + compare VAR_RESULT, 1 + goto_if_eq Route119_EventScript_272365 + release + end + +Route119_EventScript_272365:: @ 8272365 + msgbox Route119_Text_1F5D63, MSGBOX_DEFAULT + closemessage + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer + waitmovement 0 + applymovement VAR_LAST_TALKED, Route119_Movement_2723C7 + waitmovement 0 + waitse + playmoncry SPECIES_KECLEON, 2 + delay 40 + waitmoncry + setwildbattle SPECIES_KECLEON, 30, ITEM_NONE + setflag FLAG_SYS_CTRL_OBJ_DELETE + dowildbattle + clearflag FLAG_SYS_CTRL_OBJ_DELETE + specialvar VAR_RESULT, GetBattleOutcome + compare VAR_RESULT, 1 + goto_if_eq EventScript_RemoveKecleon + compare VAR_RESULT, 4 + goto_if_eq EventScript_RemoveKecleon + compare VAR_RESULT, 5 + goto_if_eq EventScript_RemoveKecleon + release + end + +EventScript_RemoveKecleon:: @ 82723C1 + goto Common_EventScript_RemoveStaticPokemon + end + +FortreeCity_Movement_2723C7: @ 82723C7 +Route119_Movement_2723C7: @ 82723C7 +Route120_Movement_2723C7: @ 82723C7 + set_visible + delay_4 + set_invisible + delay_4 + set_visible + delay_4 + set_invisible + delay_4 + set_visible + delay_8 + set_invisible + delay_8 + set_visible + delay_8 + set_invisible + delay_8 + set_visible + delay_16 + set_invisible + delay_16 + set_visible + step_end -- cgit v1.2.3 From 749247b9104426fc8c652c5454fc1508b35c43b0 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 5 Oct 2019 10:52:48 -0400 Subject: Convert 4 spaces in .inc to tab --- data/scripts/kecleon.inc | 186 +++++++++++++++++++++++------------------------ 1 file changed, 93 insertions(+), 93 deletions(-) (limited to 'data/scripts/kecleon.inc') diff --git a/data/scripts/kecleon.inc b/data/scripts/kecleon.inc index 567b44037..e4118d3e1 100644 --- a/data/scripts/kecleon.inc +++ b/data/scripts/kecleon.inc @@ -1,119 +1,119 @@ Route120_EventScript_2722DB:: @ 82722DB - lock - faceplayer - setvar VAR_0x8009, 1 - goto Route120_EventScript_272336 - end + lock + faceplayer + setvar VAR_0x8009, 1 + goto Route120_EventScript_272336 + end Route120_EventScript_2722E8:: @ 82722E8 - lock - faceplayer - setvar VAR_0x8009, 2 - goto Route120_EventScript_272336 - end + lock + faceplayer + setvar VAR_0x8009, 2 + goto Route120_EventScript_272336 + end Route120_EventScript_2722F5:: @ 82722F5 - lock - faceplayer - setvar VAR_0x8009, 3 - goto Route120_EventScript_272336 - end + lock + faceplayer + setvar VAR_0x8009, 3 + goto Route120_EventScript_272336 + end Route120_EventScript_272302:: @ 8272302 - lock - faceplayer - setvar VAR_0x8009, 4 - goto Route120_EventScript_272336 - end + lock + faceplayer + setvar VAR_0x8009, 4 + goto Route120_EventScript_272336 + end Route120_EventScript_27230F:: @ 827230F - lock - faceplayer - setvar VAR_0x8009, 5 - goto Route120_EventScript_272336 - end + lock + faceplayer + setvar VAR_0x8009, 5 + goto Route120_EventScript_272336 + end Route119_EventScript_27231C:: @ 827231C - lock - faceplayer - setvar VAR_0x8009, 6 - goto Route119_EventScript_272336 - end + lock + faceplayer + setvar VAR_0x8009, 6 + goto Route119_EventScript_272336 + end Route119_EventScript_272329:: @ 8272329 - lock - faceplayer - setvar VAR_0x8009, 7 - goto Route119_EventScript_272336 - end + lock + faceplayer + setvar VAR_0x8009, 7 + goto Route119_EventScript_272336 + end Route119_EventScript_272336:: @ 8272336 Route120_EventScript_272336:: @ 8272336 - checkitem ITEM_DEVON_SCOPE, 1 - compare VAR_RESULT, 1 - goto_if_eq Route119_EventScript_272350 - msgbox Route119_Text_1F5D00, MSGBOX_DEFAULT - release - end + checkitem ITEM_DEVON_SCOPE, 1 + compare VAR_RESULT, 1 + goto_if_eq Route119_EventScript_272350 + msgbox Route119_Text_1F5D00, MSGBOX_DEFAULT + release + end Route119_EventScript_272350:: @ 8272350 - msgbox Route119_Text_1F5D23, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq Route119_EventScript_272365 - release - end + msgbox Route119_Text_1F5D23, MSGBOX_YESNO + compare VAR_RESULT, 1 + goto_if_eq Route119_EventScript_272365 + release + end Route119_EventScript_272365:: @ 8272365 - msgbox Route119_Text_1F5D63, MSGBOX_DEFAULT - closemessage - applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer - waitmovement 0 - applymovement VAR_LAST_TALKED, Route119_Movement_2723C7 - waitmovement 0 - waitse - playmoncry SPECIES_KECLEON, 2 - delay 40 - waitmoncry - setwildbattle SPECIES_KECLEON, 30, ITEM_NONE - setflag FLAG_SYS_CTRL_OBJ_DELETE - dowildbattle - clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 - goto_if_eq EventScript_RemoveKecleon - compare VAR_RESULT, 4 - goto_if_eq EventScript_RemoveKecleon - compare VAR_RESULT, 5 - goto_if_eq EventScript_RemoveKecleon - release - end + msgbox Route119_Text_1F5D63, MSGBOX_DEFAULT + closemessage + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer + waitmovement 0 + applymovement VAR_LAST_TALKED, Route119_Movement_2723C7 + waitmovement 0 + waitse + playmoncry SPECIES_KECLEON, 2 + delay 40 + waitmoncry + setwildbattle SPECIES_KECLEON, 30, ITEM_NONE + setflag FLAG_SYS_CTRL_OBJ_DELETE + dowildbattle + clearflag FLAG_SYS_CTRL_OBJ_DELETE + specialvar VAR_RESULT, GetBattleOutcome + compare VAR_RESULT, 1 + goto_if_eq EventScript_RemoveKecleon + compare VAR_RESULT, 4 + goto_if_eq EventScript_RemoveKecleon + compare VAR_RESULT, 5 + goto_if_eq EventScript_RemoveKecleon + release + end EventScript_RemoveKecleon:: @ 82723C1 - goto Common_EventScript_RemoveStaticPokemon - end + goto Common_EventScript_RemoveStaticPokemon + end FortreeCity_Movement_2723C7: @ 82723C7 Route119_Movement_2723C7: @ 82723C7 Route120_Movement_2723C7: @ 82723C7 - set_visible - delay_4 - set_invisible - delay_4 - set_visible - delay_4 - set_invisible - delay_4 - set_visible - delay_8 - set_invisible - delay_8 - set_visible - delay_8 - set_invisible - delay_8 - set_visible - delay_16 - set_invisible - delay_16 - set_visible - step_end + set_visible + delay_4 + set_invisible + delay_4 + set_visible + delay_4 + set_invisible + delay_4 + set_visible + delay_8 + set_invisible + delay_8 + set_visible + delay_8 + set_invisible + delay_8 + set_visible + delay_16 + set_invisible + delay_16 + set_visible + step_end -- cgit v1.2.3 From 02070eaf730800c6c85285877de54ea59440a2ef Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 6 Oct 2019 16:06:34 -0400 Subject: Document kecleon --- data/scripts/kecleon.inc | 57 +++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 30 deletions(-) (limited to 'data/scripts/kecleon.inc') diff --git a/data/scripts/kecleon.inc b/data/scripts/kecleon.inc index e4118d3e1..ac0931fd8 100644 --- a/data/scripts/kecleon.inc +++ b/data/scripts/kecleon.inc @@ -1,74 +1,73 @@ -Route120_EventScript_2722DB:: @ 82722DB +Route120_EventScript_Kecleon1:: @ 82722DB lock faceplayer setvar VAR_0x8009, 1 - goto Route120_EventScript_272336 + goto EventScript_Kecleon end -Route120_EventScript_2722E8:: @ 82722E8 +Route120_EventScript_Kecleon2:: @ 82722E8 lock faceplayer setvar VAR_0x8009, 2 - goto Route120_EventScript_272336 + goto EventScript_Kecleon end -Route120_EventScript_2722F5:: @ 82722F5 +Route120_EventScript_Kecleon3:: @ 82722F5 lock faceplayer setvar VAR_0x8009, 3 - goto Route120_EventScript_272336 + goto EventScript_Kecleon end -Route120_EventScript_272302:: @ 8272302 +Route120_EventScript_Kecleon4:: @ 8272302 lock faceplayer setvar VAR_0x8009, 4 - goto Route120_EventScript_272336 + goto EventScript_Kecleon end -Route120_EventScript_27230F:: @ 827230F +Route120_EventScript_Kecleon5:: @ 827230F lock faceplayer setvar VAR_0x8009, 5 - goto Route120_EventScript_272336 + goto EventScript_Kecleon end -Route119_EventScript_27231C:: @ 827231C +Route119_EventScript_Kecleon1:: @ 827231C lock faceplayer setvar VAR_0x8009, 6 - goto Route119_EventScript_272336 + goto EventScript_Kecleon end -Route119_EventScript_272329:: @ 8272329 +Route119_EventScript_Kecleon2:: @ 8272329 lock faceplayer setvar VAR_0x8009, 7 - goto Route119_EventScript_272336 + goto EventScript_Kecleon end -Route119_EventScript_272336:: @ 8272336 -Route120_EventScript_272336:: @ 8272336 +EventScript_Kecleon:: @ 8272336 checkitem ITEM_DEVON_SCOPE, 1 compare VAR_RESULT, 1 - goto_if_eq Route119_EventScript_272350 - msgbox Route119_Text_1F5D00, MSGBOX_DEFAULT + goto_if_eq EventScript_AskUseDevonScope + msgbox Kecleon_Text_SomethingUnseeable, MSGBOX_DEFAULT release end -Route119_EventScript_272350:: @ 8272350 - msgbox Route119_Text_1F5D23, MSGBOX_YESNO +EventScript_AskUseDevonScope:: @ 8272350 + msgbox Kecleon_Text_WantToUseDevonScope, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq Route119_EventScript_272365 + goto_if_eq EventScript_BattleKecleon release end -Route119_EventScript_272365:: @ 8272365 - msgbox Route119_Text_1F5D63, MSGBOX_DEFAULT +EventScript_BattleKecleon:: @ 8272365 + msgbox Kecleon_Text_UseDevonScopeMonAttacked, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 - applymovement VAR_LAST_TALKED, Route119_Movement_2723C7 + applymovement VAR_LAST_TALKED, Movement_KecleonAppears waitmovement 0 waitse playmoncry SPECIES_KECLEON, 2 @@ -79,11 +78,11 @@ Route119_EventScript_272365:: @ 8272365 dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 + compare VAR_RESULT, B_OUTCOME_WON goto_if_eq EventScript_RemoveKecleon - compare VAR_RESULT, 4 + compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq EventScript_RemoveKecleon - compare VAR_RESULT, 5 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if_eq EventScript_RemoveKecleon release end @@ -92,9 +91,7 @@ EventScript_RemoveKecleon:: @ 82723C1 goto Common_EventScript_RemoveStaticPokemon end -FortreeCity_Movement_2723C7: @ 82723C7 -Route119_Movement_2723C7: @ 82723C7 -Route120_Movement_2723C7: @ 82723C7 +Movement_KecleonAppears: @ 82723C7 set_visible delay_4 set_invisible -- cgit v1.2.3 From 033c6cea3bbd982b7c60ee4fe5bee477e8d8773e Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 2 Nov 2019 12:34:53 -0400 Subject: Use YES/NO constants for MSGBOX_YESNO --- data/scripts/kecleon.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/kecleon.inc') diff --git a/data/scripts/kecleon.inc b/data/scripts/kecleon.inc index ac0931fd8..659cd027b 100644 --- a/data/scripts/kecleon.inc +++ b/data/scripts/kecleon.inc @@ -57,7 +57,7 @@ EventScript_Kecleon:: @ 8272336 EventScript_AskUseDevonScope:: @ 8272350 msgbox Kecleon_Text_WantToUseDevonScope, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_BattleKecleon release end -- cgit v1.2.3