From 5d9cbfec53532ba07e5eb5ff3030229c27ff34e8 Mon Sep 17 00:00:00 2001 From: igidrau <36123998+igidrau@users.noreply.github.com> Date: Thu, 12 Jul 2018 20:21:55 +0200 Subject: [PATCH 1/5] Labeled everything --- maps/PlayersHouse1F.asm | 56 ++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm index d82ae9d86..ae6dcb499 100644 --- a/maps/PlayersHouse1F.asm +++ b/maps/PlayersHouse1F.asm @@ -27,14 +27,14 @@ MeetMomRightScript: turnobject PLAYER, LEFT checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse .OnRight - applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a5fc + applymovement PLAYERSHOUSE1F_MOM1, Movement_MomTurnsTowardPlayer jump MeetMomScript .OnRight: - applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a5fe + applymovement PLAYERSHOUSE1F_MOM1, Movement_MomWalksToPlayer MeetMomScript: opentext - writetext UnknownText_0x7a604 + writetext Text_ElmsLookingForYou buttonsound stringtotext GearName, MEM_BUFFER_1 scall PlayersHouse1FReceiveItemStd @@ -44,11 +44,11 @@ MeetMomScript: setscene SCENE_FINISHED setevent EVENT_PLAYERS_HOUSE_MOM_1 clearevent EVENT_PLAYERS_HOUSE_MOM_2 - writetext UnknownText_0x7a6bd + writetext Text_Pokegear buttonsound special SetDayOfWeek .SetDayOfWeek: - writetext UnknownText_0x7a742 + writetext Text_DST yesorno iffalse .WrongDay special InitialSetDSTFlag @@ -61,23 +61,23 @@ MeetMomScript: yesorno iffalse .SetDayOfWeek .DayOfWeekDone: - writetext UnknownText_0x7a763 + writetext Text_ComeHomeForDST yesorno iffalse .ExplainPhone jump .KnowPhone .KnowPhone: - writetext UnknownText_0x7a7cb + writetext Text_KnowTheInstructions buttonsound jump .FinishPhone .ExplainPhone: - writetext UnknownText_0x7a807 + writetext Text_DontKnowTheInstructions buttonsound jump .FinishPhone .FinishPhone: - writetext UnknownText_0x7a850 + writetext Text_InstructionsNext waitbutton closetext checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 @@ -87,11 +87,11 @@ MeetMomScript: jump .Finish .FromRight: - applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a600 + applymovement PLAYERSHOUSE1F_MOM1, Movement_MomTurnsBack jump .Finish .FromLeft: - applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a602 + applymovement PLAYERSHOUSE1F_MOM1, Movement_MomWalksBack jump .Finish .Finish: @@ -124,19 +124,19 @@ MomScript: iftrue .GaveMysteryEgg checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue .GotAPokemon - writetext UnknownText_0x7a8b5 + writetext Text_HurryUpElmIsWaiting waitbutton closetext end .GotAPokemon: - writetext UnknownText_0x7a8e5 + writetext Text_AfterGotAMon waitbutton closetext end .FirstTimeBanking: - writetext UnknownText_0x7a957 + writetext Text_ImBehindYou waitbutton closetext end @@ -194,23 +194,23 @@ SinkScript: FridgeScript: jumptext FridgeText -MovementData_0x7a5fc: +Movement_MomTurnsTowardPlayer: turn_head RIGHT step_end -MovementData_0x7a5fe: +Movement_MomWalksToPlayer: slow_step RIGHT step_end -MovementData_0x7a600: +Movement_MomTurnsBack: turn_head LEFT step_end -MovementData_0x7a602: +Movement_MomWalksBack: slow_step LEFT step_end -UnknownText_0x7a604: +Text_ElmsLookingForYou: text "Oh, …! Our" line "neighbor, PROF." @@ -230,7 +230,7 @@ UnknownText_0x7a604: para "Here you go!" done -UnknownText_0x7a6bd: +Text_Pokegear: text "#MON GEAR, or" line "just #GEAR." @@ -245,12 +245,12 @@ UnknownText_0x7a6bd: line "that!" done -UnknownText_0x7a742: +Text_DST: text "Is it Daylight" line "Saving Time now?" done -UnknownText_0x7a763: +Text_ComeHomeForDST: text "Come home to" line "adjust your clock" @@ -262,7 +262,7 @@ UnknownText_0x7a763: cont "the PHONE?" done -UnknownText_0x7a7cb: +Text_KnowTheInstructions: text "Don't you just" line "turn the #GEAR" @@ -270,7 +270,7 @@ UnknownText_0x7a7cb: line "PHONE icon?" done -UnknownText_0x7a807: +Text_DontKnowTheInstructions: text "I'll read the" line "instructions." @@ -279,7 +279,7 @@ UnknownText_0x7a807: cont "PHONE icon." done -UnknownText_0x7a850: +Text_InstructionsNext: text "Phone numbers are" line "stored in memory." @@ -290,14 +290,14 @@ UnknownText_0x7a850: line "convenient?" done -UnknownText_0x7a8b5: +Text_HurryUpElmIsWaiting: text "PROF.ELM is wait-" line "ing for you." para "Hurry up, baby!" done -UnknownText_0x7a8e5: +Text_AfterGotAMon: text "So, what was PROF." line "ELM's errand?" @@ -311,7 +311,7 @@ UnknownText_0x7a8e5: cont "rely on you." done -UnknownText_0x7a957: +Text_ImBehindYou: text ", do it!" para "I'm behind you all" From 1aa569b32920d53528d20e07957bad0806158279 Mon Sep 17 00:00:00 2001 From: igidrau <36123998+igidrau@users.noreply.github.com> Date: Thu, 12 Jul 2018 22:32:11 +0200 Subject: [PATCH 2/5] Changed some label according to Rangi's comment I changed things from GitHub, so I hope this still works --- maps/PlayersHouse1F.asm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm index ae6dcb499..97903390b 100644 --- a/maps/PlayersHouse1F.asm +++ b/maps/PlayersHouse1F.asm @@ -44,11 +44,11 @@ MeetMomScript: setscene SCENE_FINISHED setevent EVENT_PLAYERS_HOUSE_MOM_1 clearevent EVENT_PLAYERS_HOUSE_MOM_2 - writetext Text_Pokegear + writetext Text_MomGivePokegear buttonsound special SetDayOfWeek .SetDayOfWeek: - writetext Text_DST + writetext Text_IsItDSTNow yesorno iffalse .WrongDay special InitialSetDSTFlag @@ -67,17 +67,17 @@ MeetMomScript: jump .KnowPhone .KnowPhone: - writetext Text_KnowTheInstructions + writetext Text_KnowThePhoneInstructions buttonsound jump .FinishPhone .ExplainPhone: - writetext Text_DontKnowTheInstructions + writetext Text_DontKnowThePhoneInstructions buttonsound jump .FinishPhone .FinishPhone: - writetext Text_InstructionsNext + writetext Text_PhoneInstructionsNext waitbutton closetext checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 @@ -230,7 +230,7 @@ Text_ElmsLookingForYou: para "Here you go!" done -Text_Pokegear: +Text_MomGivePokegear: text "#MON GEAR, or" line "just #GEAR." @@ -245,7 +245,7 @@ Text_Pokegear: line "that!" done -Text_DST: +Text_IsItDSTNow: text "Is it Daylight" line "Saving Time now?" done @@ -262,7 +262,7 @@ Text_ComeHomeForDST: cont "the PHONE?" done -Text_KnowTheInstructions: +Text_KnowThePhoneInstructions: text "Don't you just" line "turn the #GEAR" @@ -270,7 +270,7 @@ Text_KnowTheInstructions: line "PHONE icon?" done -Text_DontKnowTheInstructions: +Text_DontKnowThePhoneInstructions: text "I'll read the" line "instructions." @@ -279,7 +279,7 @@ Text_DontKnowTheInstructions: cont "PHONE icon." done -Text_InstructionsNext: +Text_PhoneInstructionsNext: text "Phone numbers are" line "stored in memory." From 88a563e6e7e206710f1d4885219af9a192a11f12 Mon Sep 17 00:00:00 2001 From: igidrau <36123998+igidrau@users.noreply.github.com> Date: Wed, 8 Aug 2018 10:47:07 +0200 Subject: [PATCH 3/5] Changed the labels accordingly to the standard style --- maps/PlayersHouse1F.asm | 60 ++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm index 97903390b..5508e5a32 100644 --- a/maps/PlayersHouse1F.asm +++ b/maps/PlayersHouse1F.asm @@ -27,14 +27,14 @@ MeetMomRightScript: turnobject PLAYER, LEFT checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse .OnRight - applymovement PLAYERSHOUSE1F_MOM1, Movement_MomTurnsTowardPlayer + applymovement PLAYERSHOUSE1F_MOM1, MomTurnsTowardPlayerMovement jump MeetMomScript .OnRight: - applymovement PLAYERSHOUSE1F_MOM1, Movement_MomWalksToPlayer + applymovement PLAYERSHOUSE1F_MOM1, MomWalksToPlayerMovement MeetMomScript: opentext - writetext Text_ElmsLookingForYou + writetext ElmsLookingForYouText buttonsound stringtotext GearName, MEM_BUFFER_1 scall PlayersHouse1FReceiveItemStd @@ -44,11 +44,11 @@ MeetMomScript: setscene SCENE_FINISHED setevent EVENT_PLAYERS_HOUSE_MOM_1 clearevent EVENT_PLAYERS_HOUSE_MOM_2 - writetext Text_MomGivePokegear + writetext MomGivesPokegearText buttonsound special SetDayOfWeek .SetDayOfWeek: - writetext Text_IsItDSTNow + writetext IsItDSTText yesorno iffalse .WrongDay special InitialSetDSTFlag @@ -61,23 +61,23 @@ MeetMomScript: yesorno iffalse .SetDayOfWeek .DayOfWeekDone: - writetext Text_ComeHomeForDST + writetext ComeHomeForDSTText yesorno iffalse .ExplainPhone jump .KnowPhone .KnowPhone: - writetext Text_KnowThePhoneInstructions + writetext KnowTheInstructionsText buttonsound jump .FinishPhone .ExplainPhone: - writetext Text_DontKnowThePhoneInstructions + writetext DontKnowTheInstructionsText buttonsound jump .FinishPhone .FinishPhone: - writetext Text_PhoneInstructionsNext + writetext InstructionsNextText waitbutton closetext checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 @@ -87,11 +87,11 @@ MeetMomScript: jump .Finish .FromRight: - applymovement PLAYERSHOUSE1F_MOM1, Movement_MomTurnsBack + applymovement PLAYERSHOUSE1F_MOM1, MomTurnsBackMovement jump .Finish .FromLeft: - applymovement PLAYERSHOUSE1F_MOM1, Movement_MomWalksBack + applymovement PLAYERSHOUSE1F_MOM1, MomWalksBackMovement jump .Finish .Finish: @@ -124,19 +124,19 @@ MomScript: iftrue .GaveMysteryEgg checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue .GotAPokemon - writetext Text_HurryUpElmIsWaiting + writetext HurryUpElmIsWaitingText waitbutton closetext end .GotAPokemon: - writetext Text_AfterGotAMon + writetext AfterGotAMonText waitbutton closetext end .FirstTimeBanking: - writetext Text_ImBehindYou + writetext ImBehindYouText waitbutton closetext end @@ -194,23 +194,23 @@ SinkScript: FridgeScript: jumptext FridgeText -Movement_MomTurnsTowardPlayer: +MomTurnsTowardPlayerMovement: turn_head RIGHT step_end -Movement_MomWalksToPlayer: +MomWalksToPlayerMovement: slow_step RIGHT step_end -Movement_MomTurnsBack: +MomTurnsBackMovement: turn_head LEFT step_end -Movement_MomWalksBack: +MomWalksBackMovement: slow_step LEFT step_end -Text_ElmsLookingForYou: +ElmsLookingForYouText: text "Oh, …! Our" line "neighbor, PROF." @@ -230,7 +230,7 @@ Text_ElmsLookingForYou: para "Here you go!" done -Text_MomGivePokegear: +MomGivesPokegearText: text "#MON GEAR, or" line "just #GEAR." @@ -245,12 +245,12 @@ Text_MomGivePokegear: line "that!" done -Text_IsItDSTNow: +IsItDSTText: text "Is it Daylight" line "Saving Time now?" done -Text_ComeHomeForDST: +ComeHomeForDSTText: text "Come home to" line "adjust your clock" @@ -262,7 +262,7 @@ Text_ComeHomeForDST: cont "the PHONE?" done -Text_KnowThePhoneInstructions: +KnowTheInstructionsText: text "Don't you just" line "turn the #GEAR" @@ -270,7 +270,7 @@ Text_KnowThePhoneInstructions: line "PHONE icon?" done -Text_DontKnowThePhoneInstructions: +DontKnowTheInstructionsText: text "I'll read the" line "instructions." @@ -279,7 +279,7 @@ Text_DontKnowThePhoneInstructions: cont "PHONE icon." done -Text_PhoneInstructionsNext: +InstructionsNextText: text "Phone numbers are" line "stored in memory." @@ -290,14 +290,14 @@ Text_PhoneInstructionsNext: line "convenient?" done -Text_HurryUpElmIsWaiting: +HurryUpElmIsWaitingText: text "PROF.ELM is wait-" line "ing for you." para "Hurry up, baby!" done -Text_AfterGotAMon: +AfterGotAMonText: text "So, what was PROF." line "ELM's errand?" @@ -311,7 +311,7 @@ Text_AfterGotAMon: cont "rely on you." done -Text_ImBehindYou: +ImBehindYouText: text ", do it!" para "I'm behind you all" @@ -374,7 +374,7 @@ FridgeText: TVText: text "There's a movie on" - line "TV: Stars dot the" + line "TV Stars dot the": para "sky as two boys" line "ride on a train…" @@ -382,7 +382,7 @@ TVText: para "I'd better get" line "rolling too!" done - + PlayersHouse1F_MapEvents: db 0, 0 ; filler From 4aed8ea922d7658d13bde57b8103f042f9b23af8 Mon Sep 17 00:00:00 2001 From: igidrau <36123998+igidrau@users.noreply.github.com> Date: Wed, 8 Aug 2018 10:56:14 +0200 Subject: [PATCH 4/5] There was an error in the previous commit --- maps/PlayersHouse1F.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm index 5508e5a32..e78c4053f 100644 --- a/maps/PlayersHouse1F.asm +++ b/maps/PlayersHouse1F.asm @@ -374,7 +374,7 @@ FridgeText: TVText: text "There's a movie on" - line "TV Stars dot the": + line "TV: Stars dot the" para "sky as two boys" line "ride on a train…" From f2ac3b96fa11afb5ce59dd3e3161c73c480aec1b Mon Sep 17 00:00:00 2001 From: igidrau <36123998+igidrau@users.noreply.github.com> Date: Sat, 25 Aug 2018 21:44:30 +0200 Subject: [PATCH 5/5] Changed some labels according to Rangi's comments --- maps/PlayersHouse1F.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm index e78c4053f..b7ab18a81 100644 --- a/maps/PlayersHouse1F.asm +++ b/maps/PlayersHouse1F.asm @@ -130,7 +130,7 @@ MomScript: end .GotAPokemon: - writetext AfterGotAMonText + writetext SoWhatWasProfElmsErrandText waitbutton closetext end @@ -297,7 +297,7 @@ HurryUpElmIsWaitingText: para "Hurry up, baby!" done -AfterGotAMonText: +SoWhatWasProfElmsErrandText: text "So, what was PROF." line "ELM's errand?" @@ -382,7 +382,7 @@ TVText: para "I'd better get" line "rolling too!" done - + PlayersHouse1F_MapEvents: db 0, 0 ; filler