From 7af1b35d17b7077b13e04c2717b48a55960fa8ce Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 3 Mar 2020 16:18:45 -0500 Subject: Sync some specials/drop unnecessary prefixes --- data/event_scripts.s | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'data/event_scripts.s') diff --git a/data/event_scripts.s b/data/event_scripts.s index 564e18fb9..36f184fa0 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1093,7 +1093,7 @@ EventScript_WallTownMap:: @ 81A6C32 msgbox Text_ATownMap goto_if_questlog EventScript_ReleaseEnd fadescreen FADE_TO_BLACK - special Special_TownMap + special ShowTownMap waitstate releaseall end @@ -1154,7 +1154,7 @@ EventScript_SetEnteringCyclingRoad:: @ 81A77C1 .include "data/scripts/route23.inc" EventScript_GetElevatorFloor:: @ 81A7AB9 - special Special_GetElevatorFloor + special GetElevatorFloor return .include "data/scripts/aide.inc" @@ -1198,7 +1198,7 @@ EventScript_GetInGameTradeSpeciesInfo:: @ 81A8CAD return EventScript_ChooseMonForInGameTrade:: @ 81A8CBD - special Special_ChooseMonFromParty + special ChoosePartyMon waitstate lock faceplayer @@ -1307,11 +1307,11 @@ EventScript_TryDarkenRuins:: @ 81A925E return EventScript_BrailleCursorWaitButton:: @ 81A926C - special Special_BrailleCursorToggle + special BrailleCursorToggle waitbuttonpress playse SE_SELECT setvar VAR_0x8006, 1 - special Special_BrailleCursorToggle + special BrailleCursorToggle return EventScript_NoMoreRoomForPokemon:: @ 81A927C -- cgit v1.2.3 From 9fbe7e14a898aadbef5d8fe4cd44507d02d1a991 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 3 Mar 2020 17:50:24 -0500 Subject: Label remaining JP script text --- data/event_scripts.s | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'data/event_scripts.s') diff --git a/data/event_scripts.s b/data/event_scripts.s index 36f184fa0..3c221d2aa 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -957,22 +957,23 @@ Text_VoiceRangOutDontRunAway:: @ 81A5C4D .string "Someone's voice rang out,\n" .string "“Don't run away!”$" -Text_1A5C79:: @ 81A5C79 +@ Uncear what the below unused JP texts were for +Text_IdLikeToSeeRequest:: @ 81A5C79 .string "えっとー\n" .string "{STR_VAR_2}が　みてみたいなー\p" .string "それも　{STR_VAR_1}{STR_VAR_3}\n" .string "{STR_VAR_2}が　みてみたいなー$" -Text_1A5C9F:: @ 81A5C9F +Text_ThankYouForShowingMe:: @ 81A5C9F .string "わぁー　すごい！\n" .string "{STR_VAR_1}{STR_VAR_3}{STR_VAR_2}だー！\p" .string "ありがとー\n" .string "また　よろしくねー！$" -Text_1A5CC3:: @ 81A5CC3 +Text_ThatsNotRight:: @ 81A5CC3 .string "それっ　ちがうよー！$" -Text_1A5CCE:: @ 81A5CCE +Text_ISee:: @ 81A5CCE .string "そっか‥$" Text_TheDoorIsClosed:: @ 81A5CD3 -- cgit v1.2.3 From 4df660dc76b5f35d2a89e0cb627180b79e9caa12 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 4 Mar 2020 10:42:40 -0500 Subject: Add enums for help system text, label help context --- data/event_scripts.s | 1 + 1 file changed, 1 insertion(+) (limited to 'data/event_scripts.s') diff --git a/data/event_scripts.s b/data/event_scripts.s index 3c221d2aa..ed293ba64 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -35,6 +35,7 @@ #include "constants/daycare.h" #include "constants/easy_chat.h" #include "constants/trainer_card.h" +#include "constants/help_system.h" .include "asm/macros.inc" .include "asm/macros/event.inc" .set FALSE, 0 -- cgit v1.2.3 From a82a7b5fcbb751f91db02d41e355b4b2a5bec8c9 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 4 Mar 2020 18:29:32 -0500 Subject: Lowercase new pokedude labels --- data/event_scripts.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/event_scripts.s') diff --git a/data/event_scripts.s b/data/event_scripts.s index ed293ba64..0940cf955 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1358,4 +1358,4 @@ Text_TestMsg:: @ 81ACD45 .include "data/scripts/test.inc" .include "data/text/save.inc" .include "data/text/new_game_intro.inc" - .include "data/text/poke_dude.inc" + .include "data/text/pokedude.inc" -- cgit v1.2.3