diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-08 03:07:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-08 03:07:50 -0500 |
| commit | 9140594b233b08d05d0832b62d3e64d50528a460 (patch) | |
| tree | 1175aa70b24f9c07b8089e23b2e8e7fdcba1b524 | |
| parent | e19b9c9d467aa51c1ca550d2d9af4e3e9e5fd11e (diff) | |
| parent | 030784dece994daf90ac1cb06a44912245b519ea (diff) | |
Merge branch 'master' into doc-littleroot
130 files changed, 2292 insertions, 2302 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 40430fe53..20b5f3e60 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1080,9 +1080,11 @@ .byte \check .endm - @ Hides the secondary box spawned by showmoney. + @ Hides the secondary box spawned by showmoney. Consumption of the x and y arguments was dummied out. .macro hidemoneybox .byte 0x94 + .byte 0 @ \x + .byte 0 @ \y .endm @ Updates the secondary box spawned by showmoney. Consumes but does not use arguments. diff --git a/data/event_scripts.s b/data/event_scripts.s index 7bd77505c..d06c90115 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -6,6 +6,7 @@ #include "constants/battle_setup.h" #include "constants/berry.h" #include "constants/cable_club.h" +#include "constants/coins.h" #include "constants/contest.h" #include "constants/daycare.h" #include "constants/decorations.h" @@ -746,8 +747,7 @@ Common_EventScript_ReadyPetalburgGymForBattle:: @ 8271E84 setflag FLAG_PETALBURG_MART_EXPANDED_ITEMS return -DewfordTown_EventScript_271E8B:: @ 8271E8B -DewfordTown_Hall_EventScript_271E8B:: @ 8271E8B +Common_EventScript_BufferTrendyPhrase:: @ 8271E8B dotimebasedevents setvar VAR_0x8004, 0 special BufferTrendyPhraseString @@ -847,7 +847,7 @@ EventScript_HideMrBriney:: @ 82721F8 setvar VAR_BRINEY_LOCATION, 0 return -RusturfTunnel_EventScript_272216:: @ 8272216 +RusturfTunnel_EventScript_SetRusturfTunnelOpen:: @ 8272216 removeobject 1 removeobject 10 clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json index 32fe0c313..bfa5a2e8b 100644 --- a/data/maps/DewfordTown/map.json +++ b/data/maps/DewfordTown/map.json @@ -35,7 +35,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_EventScript_1E95B1", + "script": "DewfordTown_EventScript_Woman", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "3", - "script": "DewfordTown_EventScript_1E9511", + "script": "DewfordTown_EventScript_Briney", "flag": "FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN" }, { @@ -61,7 +61,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_EventScript_1E95D5", + "script": "DewfordTown_EventScript_OldRodFisherman", "flag": "0" }, { @@ -87,7 +87,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_EventScript_1E9922", + "script": "DewfordTown_EventScript_TrendyPhraseBoy", "flag": "0" } ], @@ -136,7 +136,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "DewfordTown_EventScript_1E95BA" + "script": "DewfordTown_EventScript_TownSign" }, { "type": "sign", @@ -144,7 +144,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "DewfordTown_EventScript_1E95C3" + "script": "DewfordTown_EventScript_GymSign" }, { "type": "sign", @@ -168,7 +168,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "DewfordTown_EventScript_1E95CC" + "script": "DewfordTown_EventScript_HallSign" } ] }
\ No newline at end of file diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index 9d6011a1f..137b394b1 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -6,131 +6,131 @@ DewfordTown_OnTransition: @ 81E950D setflag FLAG_VISITED_DEWFORD_TOWN end -DewfordTown_EventScript_1E9511:: @ 81E9511 +DewfordTown_EventScript_Briney:: @ 81E9511 lock faceplayer - goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, DewfordTown_EventScript_1E9585 - message DewfordTown_Text_1E9C8A + goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, DewfordTown_EventScript_ReturnToPetalburgPrompt + message DewfordTown_Text_WhereAreWeBound waitmessage multichoicedefault 21, 6, MULTI_BRINEY_ON_DEWFORD, 2, 0 switch VAR_RESULT - case 0, DewfordTown_EventScript_1E955A - case 1, DewfordTown_EventScript_1E956A - case 2, DewfordTown_EventScript_1E957A - case MULTI_B_PRESSED, DewfordTown_EventScript_1E957A + case 0, DewfordTown_EventScript_ChoosePetalburg + case 1, DewfordTown_EventScript_ChooseSlateport + case 2, DewfordTown_EventScript_CancelSailSelect + case MULTI_B_PRESSED, DewfordTown_EventScript_CancelSailSelect end -DewfordTown_EventScript_1E955A:: @ 81E955A - msgbox DewfordTown_Text_1E9CE5, MSGBOX_DEFAULT +DewfordTown_EventScript_ChoosePetalburg:: @ 81E955A + msgbox DewfordTown_Text_PetalburgWereSettingSail, MSGBOX_DEFAULT closemessage - goto DewfordTown_EventScript_1E9660 + goto DewfordTown_EventScript_SailToPetalburg release end -DewfordTown_EventScript_1E956A:: @ 81E956A - msgbox DewfordTown_Text_1E9D3A, MSGBOX_DEFAULT +DewfordTown_EventScript_ChooseSlateport:: @ 81E956A + msgbox DewfordTown_Text_SlateportWereSettingSail, MSGBOX_DEFAULT closemessage - goto DewfordTown_EventScript_1E96E7 + goto DewfordTown_EventScript_SailToSlateport release end -DewfordTown_EventScript_1E957A:: @ 81E957A - msgbox DewfordTown_Text_1E9D8F, MSGBOX_DEFAULT +DewfordTown_EventScript_CancelSailSelect:: @ 81E957A + msgbox DewfordTown_Text_JustTellMeWhenYouNeedToSetSail, MSGBOX_DEFAULT closemessage release end -DewfordTown_EventScript_1E9585:: @ 81E9585 - msgbox DewfordTown_Text_1E9B24, MSGBOX_YESNO +DewfordTown_EventScript_ReturnToPetalburgPrompt:: @ 81E9585 + msgbox DewfordTown_Text_SetSailBackToPetalburg, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq DewfordTown_EventScript_1E95A2 - msgbox DewfordTown_Text_1E9BD9, MSGBOX_DEFAULT + goto_if_eq DewfordTown_EventScript_SailBackToPetalburg + msgbox DewfordTown_Text_GoDeliverIllBeWaiting, MSGBOX_DEFAULT release end -DewfordTown_EventScript_1E95A2:: @ 81E95A2 - msgbox DewfordTown_Text_1E9B7F, MSGBOX_DEFAULT +DewfordTown_EventScript_SailBackToPetalburg:: @ 81E95A2 + msgbox DewfordTown_Text_PetalburgWereSettingSail2, MSGBOX_DEFAULT closemessage - goto DewfordTown_EventScript_1E9660 + goto DewfordTown_EventScript_SailToPetalburg end -DewfordTown_EventScript_1E95B1:: @ 81E95B1 - msgbox DewfordTown_Text_1E99A8, MSGBOX_NPC +DewfordTown_EventScript_Woman:: @ 81E95B1 + msgbox DewfordTown_Text_TinyIslandCommunity, MSGBOX_NPC end -DewfordTown_EventScript_1E95BA:: @ 81E95BA - msgbox DewfordTown_Text_1E9A0F, MSGBOX_SIGN +DewfordTown_EventScript_TownSign:: @ 81E95BA + msgbox DewfordTown_Text_TownSign, MSGBOX_SIGN end -DewfordTown_EventScript_1E95C3:: @ 81E95C3 - msgbox DewfordTown_Text_1E9A3D, MSGBOX_SIGN +DewfordTown_EventScript_GymSign:: @ 81E95C3 + msgbox DewfordTown_Text_GymSign, MSGBOX_SIGN end -DewfordTown_EventScript_1E95CC:: @ 81E95CC - msgbox DewfordTown_Text_1E9A7F, MSGBOX_SIGN +DewfordTown_EventScript_HallSign:: @ 81E95CC + msgbox DewfordTown_Text_HallSign, MSGBOX_SIGN end -DewfordTown_EventScript_1E95D5:: @ 81E95D5 +DewfordTown_EventScript_OldRodFisherman:: @ 81E95D5 lock faceplayer - goto_if_set FLAG_RECEIVED_OLD_ROD, DewfordTown_EventScript_1E962A - msgbox DewfordTown_Text_1E9DD1, MSGBOX_YESNO + goto_if_set FLAG_RECEIVED_OLD_ROD, DewfordTown_EventScript_HowsFishing + msgbox DewfordTown_Text_GettingItchToFish, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq DewfordTown_EventScript_1E95FF + goto_if_eq DewfordTown_EventScript_GiveOldRod compare VAR_RESULT, NO - goto_if_eq DewfordTown_EventScript_1E9620 + goto_if_eq DewfordTown_EventScript_NotGettingItchToFish end -DewfordTown_EventScript_1E95FF:: @ 81E95FF - msgbox DewfordTown_Text_1E9E14, MSGBOX_DEFAULT +DewfordTown_EventScript_GiveOldRod:: @ 81E95FF + msgbox DewfordTown_Text_GiveYouOneOfMyRods, MSGBOX_DEFAULT giveitem_std ITEM_OLD_ROD setflag FLAG_RECEIVED_OLD_ROD - msgbox DewfordTown_Text_1E9E65, MSGBOX_DEFAULT + msgbox DewfordTown_Text_ThrowInFishingAdvice, MSGBOX_DEFAULT release end -DewfordTown_EventScript_1E9620:: @ 81E9620 - msgbox DewfordTown_Text_1E9F92, MSGBOX_DEFAULT +DewfordTown_EventScript_NotGettingItchToFish:: @ 81E9620 + msgbox DewfordTown_Text_ThatsTooBadThen, MSGBOX_DEFAULT release end -DewfordTown_EventScript_1E962A:: @ 81E962A - message DewfordTown_Text_1E9FB8 +DewfordTown_EventScript_HowsFishing:: @ 81E962A + message DewfordTown_Text_HowsYourFishing waitmessage multichoice 20, 8, MULTI_HOWS_FISHING, 1 compare VAR_RESULT, 0 - goto_if_eq DewfordTown_EventScript_1E964C + goto_if_eq DewfordTown_EventScript_FishingExcellent compare VAR_RESULT, 1 - goto_if_eq DewfordTown_EventScript_1E9656 + goto_if_eq DewfordTown_EventScript_FishingNotSoGood end -DewfordTown_EventScript_1E964C:: @ 81E964C - msgbox DewfordTown_Text_1E9FD0, MSGBOX_DEFAULT +DewfordTown_EventScript_FishingExcellent:: @ 81E964C + msgbox DewfordTown_Text_GreatHaulInSomeBigOnes, MSGBOX_DEFAULT release end -DewfordTown_EventScript_1E9656:: @ 81E9656 - msgbox DewfordTown_Text_1EA004, MSGBOX_DEFAULT +DewfordTown_EventScript_FishingNotSoGood:: @ 81E9656 + msgbox DewfordTown_Text_FishingAdvice, MSGBOX_DEFAULT release end -DewfordTown_EventScript_1E9660:: @ 81E9660 +DewfordTown_EventScript_SailToPetalburg:: @ 81E9660 call EventScript_BackupMrBrineyLocation setobjectpriority 2, MAP_DEWFORD_TOWN, 0 setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN, 0 - applymovement 2, DewfordTown_Movement_1E991D + applymovement 2, DewfordTown_Movement_BrineyBoardBoat waitmovement 0 removeobject 2 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9911 + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_PlayerBoardBoat waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN call Common_EventScript_PlayBrineysBoatMusic - applymovement 4, DewfordTown_Movement_1E97A2 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E97A2 + applymovement 4, DewfordTown_Movement_SailToPetalburg + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_SailToPetalburg waitmovement 0 showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 call Common_EventScript_StopBrineysBoatMusic - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9914 + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_ExitBoatPetalburg waitmovement 0 showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY @@ -146,36 +146,36 @@ DewfordTown_EventScript_1E9660:: @ 81E9660 release end -DewfordTown_EventScript_1E96E7:: @ 81E96E7 +DewfordTown_EventScript_SailToSlateport:: @ 81E96E7 call EventScript_BackupMrBrineyLocation setobjectpriority 2, MAP_DEWFORD_TOWN, 0 setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN, 1 - applymovement 2, DewfordTown_Movement_1E991D + applymovement 2, DewfordTown_Movement_BrineyBoardBoat waitmovement 0 removeobject 2 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9911 + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_PlayerBoardBoat waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN call Common_EventScript_PlayBrineysBoatMusic - applymovement 4, DewfordTown_Movement_1E9865 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9865 + applymovement 4, DewfordTown_Movement_SailToSlateport + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_SailToSlateport waitmovement 0 call Common_EventScript_StopBrineysBoatMusic showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE109 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9918 + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_ExitBoatSlateport waitmovement 0 setobjectxyperm 2, 21, 26 addobject 2 setobjectpriority 2, MAP_ROUTE109, 0 - applymovement 2, DewfordTown_Movement_1E991F + applymovement 2, DewfordTown_Movement_BrineyExitBoat waitmovement 0 clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY addobject 1 clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN hideobjectat 4, MAP_DEWFORD_TOWN - call_if_unset FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_1E9790 - call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_1E9799 + call_if_unset FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_LandedSlateportDeliverGoods + call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_LandedSlateport closemessage copyvar VAR_BRINEY_LOCATION, VAR_0x8008 resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN @@ -184,15 +184,15 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7 release end -DewfordTown_EventScript_1E9790:: @ 81E9790 +DewfordTown_EventScript_LandedSlateportDeliverGoods:: @ 81E9790 msgbox DewfordTown_Text_BrineyLandedInSlateportDeliverGoods, MSGBOX_DEFAULT return -DewfordTown_EventScript_1E9799:: @ 81E9799 +DewfordTown_EventScript_LandedSlateport:: @ 81E9799 msgbox DewfordTown_Text_BrineyLandedInSlateport, MSGBOX_DEFAULT return -DewfordTown_Movement_1E97A2: @ 81E97A2 +DewfordTown_Movement_SailToPetalburg: @ 81E97A2 walk_up walk_up walk_fast_up @@ -389,7 +389,7 @@ DewfordTown_Movement_1E97A2: @ 81E97A2 walk_up step_end -DewfordTown_Movement_1E9865: @ 81E9865 +DewfordTown_Movement_SailToSlateport: @ 81E9865 walk_right walk_fast_right walk_fast_right @@ -563,94 +563,94 @@ DewfordTown_Movement_1E9865: @ 81E9865 walk_fast_up step_end -DewfordTown_Movement_1E9911: @ 81E9911 +DewfordTown_Movement_PlayerBoardBoat: @ 81E9911 walk_right walk_up step_end -DewfordTown_Movement_1E9914: @ 81E9914 +DewfordTown_Movement_ExitBoatPetalburg: @ 81E9914 walk_up walk_up walk_up step_end -DewfordTown_Movement_1E9918: @ 81E9918 +DewfordTown_Movement_ExitBoatSlateport: @ 81E9918 walk_up walk_up walk_up walk_in_place_fastest_down step_end -DewfordTown_Movement_1E991D: @ 81E991D +DewfordTown_Movement_BrineyBoardBoat: @ 81E991D walk_up step_end -DewfordTown_Movement_1E991F: @ 81E991F +DewfordTown_Movement_BrineyExitBoat: @ 81E991F walk_up walk_up step_end -DewfordTown_EventScript_1E9922:: @ 81E9922 +DewfordTown_EventScript_TrendyPhraseBoy:: @ 81E9922 lock faceplayer - call DewfordTown_EventScript_271E8B - msgbox DewfordTown_Text_1EA136, MSGBOX_YESNO + call Common_EventScript_BufferTrendyPhrase + msgbox DewfordTown_Text_XIsTheBiggestHappeningThingRight, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq DewfordTown_EventScript_1E9948 + goto_if_eq DewfordTown_EventScript_ConfirmTrendyPhrase compare VAR_RESULT, NO - goto_if_eq DewfordTown_EventScript_1E9952 + goto_if_eq DewfordTown_EventScript_RejectTrendyPhrase end -DewfordTown_EventScript_1E9948:: @ 81E9948 - msgbox DewfordTown_Text_1EA491, MSGBOX_DEFAULT +DewfordTown_EventScript_ConfirmTrendyPhrase:: @ 81E9948 + msgbox DewfordTown_Text_YeahDefinitionOfInRightNow, MSGBOX_DEFAULT release end -DewfordTown_EventScript_1E9952:: @ 81E9952 - msgbox DewfordTown_Text_1EA242, MSGBOX_DEFAULT +DewfordTown_EventScript_RejectTrendyPhrase:: @ 81E9952 + msgbox DewfordTown_Text_TellMeWhatsNewAndIn, MSGBOX_DEFAULT setvar VAR_0x8004, EASY_CHAT_TYPE_TRENDY_PHRASE call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 - goto_if_eq DewfordTown_EventScript_1E997D + goto_if_eq DewfordTown_EventScript_GiveNewTrendyPhrase compare VAR_RESULT, 0 - goto_if_eq DewfordTown_EventScript_1E9994 + goto_if_eq DewfordTown_EventScript_CancelNewTrendyPhrase end -DewfordTown_EventScript_1E997D:: @ 81E997D +DewfordTown_EventScript_GiveNewTrendyPhrase:: @ 81E997D incrementgamestat GAME_STAT_STARTED_TRENDS compare VAR_0x8004, 0 - goto_if_eq DewfordTown_EventScript_1E999E - msgbox DewfordTown_Text_1EA2AA, MSGBOX_DEFAULT + goto_if_eq DewfordTown_EventScript_PhraseNotTrendyEnough + msgbox DewfordTown_Text_OfCourseIKnowAboutThat, MSGBOX_DEFAULT release end -DewfordTown_EventScript_1E9994:: @ 81E9994 - msgbox DewfordTown_Text_1EA443, MSGBOX_DEFAULT +DewfordTown_EventScript_CancelNewTrendyPhrase:: @ 81E9994 + msgbox DewfordTown_Text_HearOfAnyTrendsComeShareWithMe, MSGBOX_DEFAULT release end -DewfordTown_EventScript_1E999E:: @ 81E999E - msgbox DewfordTown_Text_1EA3FE, MSGBOX_DEFAULT +DewfordTown_EventScript_PhraseNotTrendyEnough:: @ 81E999E + msgbox DewfordTown_Text_XHuhIThinkYIsCool, MSGBOX_DEFAULT release end -DewfordTown_Text_1E99A8: @ 81E99A8 +DewfordTown_Text_TinyIslandCommunity: @ 81E99A8 .string "DEWFORD is a tiny island community.\n" .string "If something gets trendy here,\l" .string "everyone picks up on it right away.$" -DewfordTown_Text_1E9A0F: @ 81E9A0F +DewfordTown_Text_TownSign: @ 81E9A0F .string "DEWFORD TOWN\n" .string "“A tiny island in the blue sea.”$" -DewfordTown_Text_1E9A3D: @ 81E9A3D +DewfordTown_Text_GymSign: @ 81E9A3D .string "DEWFORD TOWN POKéMON GYM\n" .string "LEADER: BRAWLY\l" .string "“A big wave in fighting!”$" -DewfordTown_Text_1E9A7F: @ 81E9A7F +DewfordTown_Text_HallSign: @ 81E9A7F .string "DEWFORD HALL\n" .string "“Everyone's information exchange!”$" @@ -660,18 +660,18 @@ Route104_Text_LandedInDewfordDeliverLetter: @ 81E9AAF .string "I suppose you're off to deliver that\n" .string "LETTER to, who was it now, STEVEN!$" -DewfordTown_Text_1E9B24: @ 81E9B24 +DewfordTown_Text_SetSailBackToPetalburg: @ 81E9B24 .string "MR. BRINEY: Have you delivered your\n" .string "LETTER?\p" .string "Or were you meaning to sail back to\n" .string "PETALBURG?$" -DewfordTown_Text_1E9B7F: @ 81E9B7F +DewfordTown_Text_PetalburgWereSettingSail2: @ 81E9B7F .string "MR. BRINEY: PETALBURG it is, then!\p" .string "Anchors aweigh!\n" .string "PEEKO, we're setting sail, my darling!$" -DewfordTown_Text_1E9BD9: @ 81E9BD9 +DewfordTown_Text_GoDeliverIllBeWaiting: @ 81E9BD9 .string "MR. BRINEY: Then you go on and deliver\n" .string "the LETTER. I'll be waiting.$" @@ -681,35 +681,35 @@ DewfordTown_Text_BrineyLandedInDewford: @ 81E9C1D .string "You just go on and tell me whenever\n" .string "you want to set sail again!$" -DewfordTown_Text_1E9C8A: @ 81E9C8A +DewfordTown_Text_WhereAreWeBound: @ 81E9C8A .string "MR. BRINEY: Ahoy!\n" .string "For you, I'll go out to sea anytime!\p" .string "Now, my friend, where are we bound?$" -DewfordTown_Text_1E9CE5: @ 81E9CE5 +DewfordTown_Text_PetalburgWereSettingSail: @ 81E9CE5 .string "MR. BRINEY: PETALBURG, is it?\p" .string "Anchors aweigh!\n" .string "PEEKO, we're setting sail, my darling!$" -DewfordTown_Text_1E9D3A: @ 81E9D3A +DewfordTown_Text_SlateportWereSettingSail: @ 81E9D3A .string "MR. BRINEY: SLATEPORT, is it?\p" .string "Anchors aweigh!\n" .string "PEEKO, we're setting sail, my darling!$" -DewfordTown_Text_1E9D8F: @ 81E9D8F +DewfordTown_Text_JustTellMeWhenYouNeedToSetSail: @ 81E9D8F .string "MR. BRINEY: You just tell me whenever\n" .string "you need to set sail again!$" -DewfordTown_Text_1E9DD1: @ 81E9DD1 +DewfordTown_Text_GettingItchToFish: @ 81E9DD1 .string "This is a renowned fishing spot.\n" .string "Are you getting the itch to fish?$" -DewfordTown_Text_1E9E14: @ 81E9E14 +DewfordTown_Text_GiveYouOneOfMyRods: @ 81E9E14 .string "I hear you, and I like what\n" .string "you're saying!\p" .string "I'll give you one of my fishing RODS.$" -DewfordTown_Text_1E9E65: @ 81E9E65 +DewfordTown_Text_ThrowInFishingAdvice: @ 81E9E65 .string "And, as an added bonus, I'll even throw\n" .string "in a little fishing advice!\p" .string "First, you want to face the water,\n" @@ -721,19 +721,19 @@ DewfordTown_Text_1E9E65: @ 81E9E65 .string "you need to time the pulls on your ROD\l" .string "to haul them in.$" -DewfordTown_Text_1E9F92: @ 81E9F92 +DewfordTown_Text_ThatsTooBadThen: @ 81E9F92 .string "Oh, is that so?\n" .string "That's too bad, then.$" -DewfordTown_Text_1E9FB8: @ 81E9FB8 +DewfordTown_Text_HowsYourFishing: @ 81E9FB8 .string "Yo!\n" .string "How's your fishing?$" -DewfordTown_Text_1E9FD0: @ 81E9FD0 +DewfordTown_Text_GreatHaulInSomeBigOnes: @ 81E9FD0 .string "Is that right! That's great!\n" .string "Haul in some big ones!$" -DewfordTown_Text_1EA004: @ 81EA004 +DewfordTown_Text_FishingAdvice: @ 81EA004 .string "Oh, hey, don't get down on yourself!\n" .string "I'll give you a little fishing advice.\p" .string "First, you want to face the water,\n" @@ -745,7 +745,7 @@ DewfordTown_Text_1EA004: @ 81EA004 .string "you need to time the pulls on your ROD\l" .string "to haul them in.$" -DewfordTown_Text_1EA136: @ 81EA136 +DewfordTown_Text_XIsTheBiggestHappeningThingRight: @ 81EA136 .string "I like what's hip, happening, and trendy.\n" .string "I'm always checking it out.\p" .string "Listen, have you heard about this new\n" @@ -759,13 +759,13 @@ DewfordTown_Text_1EA136: @ 81EA136 .string "“{STR_VAR_1}”\l" .string "is the biggest happening thing, right?$" -DewfordTown_Text_1EA242: @ 81EA242 +DewfordTown_Text_TellMeWhatsNewAndIn: @ 81EA242 .string "Hunh?\n" .string "It's not the hip and happening thing?\p" .string "Well, hey, you have to tell me,\n" .string "what's new and what's “in”?$" -DewfordTown_Text_1EA2AA: @ 81EA2AA +DewfordTown_Text_OfCourseIKnowAboutThat: @ 81EA2AA .string "Hunh?\n" .string "“{STR_VAR_2}”?\p" .string "… …\p" @@ -783,18 +783,18 @@ DewfordTown_Text_1EA2AA: @ 81EA2AA .string "Now, “{STR_VAR_2}” is\n" .string "what's vital and in tune with the times!$" -DewfordTown_Text_1EA3FE: @ 81EA3FE +DewfordTown_Text_XHuhIThinkYIsCool: @ 81EA3FE .string "Hmm…\n" .string "“{STR_VAR_2},” huh?\p" .string "But personally, I think\n" .string "“{STR_VAR_1}”\l" .string "is what's real in cool.$" -DewfordTown_Text_1EA443: @ 81EA443 +DewfordTown_Text_HearOfAnyTrendsComeShareWithMe: @ 81EA443 .string "Well, if you hear of any happening new\n" .string "trends, come share them with me, okay?$" -DewfordTown_Text_1EA491: @ 81EA491 +DewfordTown_Text_YeahDefinitionOfInRightNow: @ 81EA491 .string "Yeah, absolutely right!\p" .string "“{STR_VAR_1}” is the\n" .string "definition of “in” right now.$" diff --git a/data/maps/DewfordTown_Hall/map.json b/data/maps/DewfordTown_Hall/map.json index b801ea3c2..087981fde 100644 --- a/data/maps/DewfordTown_Hall/map.json +++ b/data/maps/DewfordTown_Hall/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_1FD4D0", + "script": "DewfordTown_Hall_EventScript_Girl", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_1FD4F9", + "script": "DewfordTown_Hall_EventScript_Woman", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_1FD50A", + "script": "DewfordTown_Hall_EventScript_Man", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_1FD547", + "script": "DewfordTown_Hall_EventScript_ExpertM", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_1FD563", + "script": "DewfordTown_Hall_EventScript_Twin", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_1FD57F", + "script": "DewfordTown_Hall_EventScript_LittleBoy", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_1FD62F", + "script": "DewfordTown_Hall_EventScript_SchoolKidM", "flag": "0" }, { @@ -115,7 +115,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_1FD63B", + "script": "DewfordTown_Hall_EventScript_PsychicM", "flag": "0" }, { @@ -128,7 +128,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_1FD7DA", + "script": "DewfordTown_Hall_EventScript_SludgeBombMan", "flag": "FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN" } ], @@ -156,7 +156,7 @@ "y": 1, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "DewfordTown_Hall_EventScript_1FD590" + "script": "DewfordTown_Hall_EventScript_Bookshelf" }, { "type": "sign", @@ -164,7 +164,7 @@ "y": 1, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "DewfordTown_Hall_EventScript_1FD5A0" + "script": "DewfordTown_Hall_EventScript_Painting" } ] }
\ No newline at end of file diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index e6eeec010..971dd2321 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -1,319 +1,319 @@ DewfordTown_Hall_MapScripts:: @ 81FD4CF .byte 0 -DewfordTown_Hall_EventScript_1FD4D0:: @ 81FD4D0 +DewfordTown_Hall_EventScript_Girl:: @ 81FD4D0 lock faceplayer - call DewfordTown_Hall_EventScript_271E8B + call Common_EventScript_BufferTrendyPhrase special TrendyPhraseIsOld - compare VAR_RESULT, 1 - goto_if_eq DewfordTown_Hall_EventScript_1FD4EF - msgbox DewfordTown_Hall_Text_1FD818, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq DewfordTown_Hall_EventScript_GirlBoredOfTrend + msgbox DewfordTown_Hall_Text_CantImagineLifeWithoutTrend, MSGBOX_DEFAULT release end -DewfordTown_Hall_EventScript_1FD4EF:: @ 81FD4EF - msgbox DewfordTown_Hall_Text_1FD877, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_GirlBoredOfTrend:: @ 81FD4EF + msgbox DewfordTown_Hall_Text_GettingBoredOfTrend, MSGBOX_DEFAULT release end -DewfordTown_Hall_EventScript_1FD4F9:: @ 81FD4F9 +DewfordTown_Hall_EventScript_Woman:: @ 81FD4F9 lock faceplayer - call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FD8ED, MSGBOX_DEFAULT + call Common_EventScript_BufferTrendyPhrase + msgbox DewfordTown_Hall_Text_TeachingMonAboutTrend, MSGBOX_DEFAULT release end -DewfordTown_Hall_EventScript_1FD50A:: @ 81FD50A +DewfordTown_Hall_EventScript_Man:: @ 81FD50A lock faceplayer - call DewfordTown_Hall_EventScript_271E8B + call Common_EventScript_BufferTrendyPhrase special sub_811EF6C - msgbox DewfordTown_Hall_Text_1FD948, MSGBOX_YESNO + msgbox DewfordTown_Hall_Text_DeepLinkBetweenXAndY, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq DewfordTown_Hall_EventScript_1FD533 + goto_if_eq DewfordTown_Hall_EventScript_ConfirmTrendLink compare VAR_RESULT, NO - goto_if_eq DewfordTown_Hall_EventScript_1FD53D + goto_if_eq DewfordTown_Hall_EventScript_RejectTrendLink end -DewfordTown_Hall_EventScript_1FD533:: @ 81FD533 - msgbox DewfordTown_Hall_Text_1FD9B3, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_ConfirmTrendLink:: @ 81FD533 + msgbox DewfordTown_Hall_Text_MyHunchWasRight, MSGBOX_DEFAULT release end -DewfordTown_Hall_EventScript_1FD53D:: @ 81FD53D - msgbox DewfordTown_Hall_Text_1FDA06, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_RejectTrendLink:: @ 81FD53D + msgbox DewfordTown_Hall_Text_NotEasyToKeepUp, MSGBOX_DEFAULT release end -DewfordTown_Hall_EventScript_1FD547:: @ 81FD547 +DewfordTown_Hall_EventScript_ExpertM:: @ 81FD547 lock faceplayer - call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FDA5C, MSGBOX_DEFAULT + call Common_EventScript_BufferTrendyPhrase + msgbox DewfordTown_Hall_Text_TVShowAboutTrend, MSGBOX_DEFAULT closemessage applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 release end -DewfordTown_Hall_EventScript_1FD563:: @ 81FD563 +DewfordTown_Hall_EventScript_Twin:: @ 81FD563 lock faceplayer - call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FDA99, MSGBOX_DEFAULT + call Common_EventScript_BufferTrendyPhrase + msgbox DewfordTown_Hall_Text_IsTrendMorePopularAcrossSea, MSGBOX_DEFAULT closemessage applymovement 5, Common_Movement_WalkInPlaceFastestUp waitmovement 0 release end -DewfordTown_Hall_EventScript_1FD57F:: @ 81FD57F +DewfordTown_Hall_EventScript_LittleBoy:: @ 81FD57F lock faceplayer - call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FDAC4, MSGBOX_DEFAULT + call Common_EventScript_BufferTrendyPhrase + msgbox DewfordTown_Hall_Text_CollectTrendMerchandise, MSGBOX_DEFAULT release end -DewfordTown_Hall_EventScript_1FD590:: @ 81FD590 +DewfordTown_Hall_EventScript_Bookshelf:: @ 81FD590 lockall - call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FDB89, MSGBOX_DEFAULT + call Common_EventScript_BufferTrendyPhrase + msgbox DewfordTown_Hall_Text_BooksAboutTrend, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1FD5A0:: @ 81FD5A0 +DewfordTown_Hall_EventScript_Painting:: @ 81FD5A0 lockall - call DewfordTown_Hall_EventScript_271E8B + call Common_EventScript_BufferTrendyPhrase special GetDewfordHallPaintingNameIndex switch VAR_RESULT - case 0, DewfordTown_Hall_EventScript_1FD607 - case 4, DewfordTown_Hall_EventScript_1FD607 - case 1, DewfordTown_Hall_EventScript_1FD611 - case 5, DewfordTown_Hall_EventScript_1FD607 - case 2, DewfordTown_Hall_EventScript_1FD61B - case 6, DewfordTown_Hall_EventScript_1FD61B - case 3, DewfordTown_Hall_EventScript_1FD625 - case 7, DewfordTown_Hall_EventScript_1FD61B + case 0, DewfordTown_Hall_EventScript_ScreamTitle + case 4, DewfordTown_Hall_EventScript_ScreamTitle + case 1, DewfordTown_Hall_EventScript_SmileTitle + case 5, DewfordTown_Hall_EventScript_ScreamTitle + case 2, DewfordTown_Hall_EventScript_LastTitle + case 6, DewfordTown_Hall_EventScript_LastTitle + case 3, DewfordTown_Hall_EventScript_BirthTitle + case 7, DewfordTown_Hall_EventScript_LastTitle end -DewfordTown_Hall_EventScript_1FD607:: @ 81FD607 - msgbox DewfordTown_Hall_Text_1FDC05, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_ScreamTitle:: @ 81FD607 + msgbox DewfordTown_Hall_Text_TrendsScream, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1FD611:: @ 81FD611 - msgbox DewfordTown_Hall_Text_1FDC21, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_SmileTitle:: @ 81FD611 + msgbox DewfordTown_Hall_Text_TrendsSmile, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1FD61B:: @ 81FD61B - msgbox DewfordTown_Hall_Text_1FDC3C, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_LastTitle:: @ 81FD61B + msgbox DewfordTown_Hall_Text_LastTrend, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1FD625:: @ 81FD625 - msgbox DewfordTown_Hall_Text_1FDC57, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_BirthTitle:: @ 81FD625 + msgbox DewfordTown_Hall_Text_BirthOfTrend, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1FD62F:: @ 81FD62F +DewfordTown_Hall_EventScript_SchoolKidM:: @ 81FD62F lockall setvar VAR_0x8008, 0 - goto DewfordTown_Hall_EventScript_1FD647 + goto DewfordTown_Hall_EventScript_DoTrendDebate end -DewfordTown_Hall_EventScript_1FD63B:: @ 81FD63B +DewfordTown_Hall_EventScript_PsychicM:: @ 81FD63B lockall setvar VAR_0x8008, 1 - goto DewfordTown_Hall_EventScript_1FD647 + goto DewfordTown_Hall_EventScript_DoTrendDebate end -DewfordTown_Hall_EventScript_1FD647:: @ 81FD647 - call DewfordTown_Hall_EventScript_271E8B +DewfordTown_Hall_EventScript_DoTrendDebate:: @ 81FD647 + call Common_EventScript_BufferTrendyPhrase special GetDewfordHallPaintingNameIndex switch VAR_RESULT - case 0, DewfordTown_Hall_EventScript_1FD6AD - case 1, DewfordTown_Hall_EventScript_1FD6AD - case 2, DewfordTown_Hall_EventScript_1FD6C9 - case 3, DewfordTown_Hall_EventScript_1FD6C9 - case 4, DewfordTown_Hall_EventScript_1FD6E5 - case 5, DewfordTown_Hall_EventScript_1FD6E5 - case 6, DewfordTown_Hall_EventScript_1FD701 - case 7, DewfordTown_Hall_EventScript_1FD71D + case 0, DewfordTown_Hall_EventScript_TrendDebate1 + case 1, DewfordTown_Hall_EventScript_TrendDebate1 + case 2, DewfordTown_Hall_EventScript_TrendDebate2 + case 3, DewfordTown_Hall_EventScript_TrendDebate2 + case 4, DewfordTown_Hall_EventScript_TrendDebate3 + case 5, DewfordTown_Hall_EventScript_TrendDebate3 + case 6, DewfordTown_Hall_EventScript_TrendDebate4 + case 7, DewfordTown_Hall_EventScript_TrendDebate5 end -DewfordTown_Hall_EventScript_1FD6AD:: @ 81FD6AD - call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FDC76, MSGBOX_DEFAULT - call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FDCE2, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_TrendDebate1:: @ 81FD6AD + call DewfordTown_Hall_EventScript_DebateReact1 + msgbox DewfordTown_Hall_Text_SawTrendCoolestThing, MSGBOX_DEFAULT + call DewfordTown_Hall_EventScript_DebateReact2 + msgbox DewfordTown_Hall_Text_AllegedTrendNotAuthentic, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1FD6C9:: @ 81FD6C9 - call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FDD95, MSGBOX_DEFAULT - call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FDE0E, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_TrendDebate2:: @ 81FD6C9 + call DewfordTown_Hall_EventScript_DebateReact1 + msgbox DewfordTown_Hall_Text_ComposedTrendThemeSong, MSGBOX_DEFAULT + call DewfordTown_Hall_EventScript_DebateReact2 + msgbox DewfordTown_Hall_Text_WorkOnYourSinging, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1FD6E5:: @ 81FD6E5 - call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FDE77, MSGBOX_DEFAULT - call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FDED8, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_TrendDebate3:: @ 81FD6E5 + call DewfordTown_Hall_EventScript_DebateReact1 + msgbox DewfordTown_Hall_Text_OrganizeTrendParty, MSGBOX_DEFAULT + call DewfordTown_Hall_EventScript_DebateReact2 + msgbox DewfordTown_Hall_Text_BrilliantIndeed, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1FD701:: @ 81FD701 - call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FDF72, MSGBOX_DEFAULT - call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FDFF1, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_TrendDebate4:: @ 81FD701 + call DewfordTown_Hall_EventScript_DebateReact1 + msgbox DewfordTown_Hall_Text_TrendHasBecomePartOfLife, MSGBOX_DEFAULT + call DewfordTown_Hall_EventScript_DebateReact2 + msgbox DewfordTown_Hall_Text_TrendWeighsHeavilyOnMind, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1FD71D:: @ 81FD71D - call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FE09A, MSGBOX_DEFAULT - call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FE0F2, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_TrendDebate5:: @ 81FD71D + call DewfordTown_Hall_EventScript_DebateReact1 + msgbox DewfordTown_Hall_Text_IfWeTeamUpWellBeInvincible, MSGBOX_DEFAULT + call DewfordTown_Hall_EventScript_DebateReact2 + msgbox DewfordTown_Hall_Text_WellBeTrendDuo, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1FD739:: @ 81FD739 +DewfordTown_Hall_EventScript_DontMovePlayer1:: @ 81FD739 return -DewfordTown_Hall_EventScript_1FD73A:: @ 81FD73A - applymovement 8, DewfordTown_Hall_Movement_1FD7D6 +DewfordTown_Hall_EventScript_DebateReact1:: @ 81FD73A + applymovement 8, DewfordTown_Hall_Movement_PsychicWalkInPlaceLeft waitmovement 0 compare VAR_0x8008, 0 - goto_if_eq DewfordTown_Hall_EventScript_1FD75B + goto_if_eq DewfordTown_Hall_EventScript_PlayerReactWest compare VAR_0x8008, 1 - goto_if_eq DewfordTown_Hall_EventScript_1FD771 + goto_if_eq DewfordTown_Hall_EventScript_DontMovePlayer2 end -DewfordTown_Hall_EventScript_1FD75B:: @ 81FD75B +DewfordTown_Hall_EventScript_PlayerReactWest:: @ 81FD75B compare VAR_FACING, DIR_EAST - goto_if_eq DewfordTown_Hall_EventScript_1FD739 + goto_if_eq DewfordTown_Hall_EventScript_DontMovePlayer1 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -DewfordTown_Hall_EventScript_1FD771:: @ 81FD771 +DewfordTown_Hall_EventScript_DontMovePlayer2:: @ 81FD771 return -DewfordTown_Hall_EventScript_1FD772:: @ 81FD772 - applymovement 7, DewfordTown_Hall_Movement_1FD7D8 +DewfordTown_Hall_EventScript_DebateReact2:: @ 81FD772 + applymovement 7, DewfordTown_Hall_Movement_SchoolKidWalkInPlaceRight waitmovement 0 compare VAR_0x8008, 0 - goto_if_eq DewfordTown_Hall_EventScript_1FD793 + goto_if_eq DewfordTown_Hall_EventScript_PlayerReactNorthSouth compare VAR_0x8008, 1 - goto_if_eq DewfordTown_Hall_EventScript_1FD7C0 + goto_if_eq DewfordTown_Hall_EventScript_PlayerReactEast end -DewfordTown_Hall_EventScript_1FD793:: @ 81FD793 +DewfordTown_Hall_EventScript_PlayerReactNorthSouth:: @ 81FD793 compare VAR_FACING, DIR_NORTH - call_if_eq DewfordTown_Hall_EventScript_1FD7AA + call_if_eq DewfordTown_Hall_EventScript_PlayerWalkInPlaceUp compare VAR_FACING, DIR_SOUTH - call_if_eq DewfordTown_Hall_EventScript_1FD7B5 + call_if_eq DewfordTown_Hall_EventScript_PlayerWalkInPlaceDown return -DewfordTown_Hall_EventScript_1FD7AA:: @ 81FD7AA +DewfordTown_Hall_EventScript_PlayerWalkInPlaceUp:: @ 81FD7AA applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -DewfordTown_Hall_EventScript_1FD7B5:: @ 81FD7B5 +DewfordTown_Hall_EventScript_PlayerWalkInPlaceDown:: @ 81FD7B5 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0 +DewfordTown_Hall_EventScript_PlayerReactEast:: @ 81FD7C0 compare VAR_FACING, DIR_WEST - goto_if_eq DewfordTown_Hall_EventScript_1FD739 + goto_if_eq DewfordTown_Hall_EventScript_DontMovePlayer1 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -DewfordTown_Hall_Movement_1FD7D6: @ 81FD7D6 +DewfordTown_Hall_Movement_PsychicWalkInPlaceLeft: @ 81FD7D6 walk_in_place_left step_end -DewfordTown_Hall_Movement_1FD7D8: @ 81FD7D8 +DewfordTown_Hall_Movement_SchoolKidWalkInPlaceRight: @ 81FD7D8 walk_in_place_right step_end -DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA +DewfordTown_Hall_EventScript_SludgeBombMan:: @ 81FD7DA lock faceplayer - call DewfordTown_Hall_EventScript_271E8B - goto_if_set FLAG_RECEIVED_TM36, DewfordTown_Hall_EventScript_1FD80E - msgbox DewfordTown_Hall_Text_1FE142, MSGBOX_DEFAULT + call Common_EventScript_BufferTrendyPhrase + goto_if_set FLAG_RECEIVED_TM36, DewfordTown_Hall_EventScript_ReceivedSludgeBomb + msgbox DewfordTown_Hall_Text_GiveYouSludgeBomb, MSGBOX_DEFAULT giveitem_std ITEM_TM36 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM36 release end -DewfordTown_Hall_EventScript_1FD80E:: @ 81FD80E - msgbox DewfordTown_Hall_Text_1FE1ED, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_ReceivedSludgeBomb:: @ 81FD80E + msgbox DewfordTown_Hall_Text_LoveSludgeBombButTrendInToo, MSGBOX_DEFAULT release end -DewfordTown_Hall_Text_1FD818: @ 81FD818 +DewfordTown_Hall_Text_CantImagineLifeWithoutTrend: @ 81FD818 .string "What's in vogue? Why, it has to be\n" .string "“{STR_VAR_1}”!\p" .string "I can't imagine what life would be like\n" .string "without “{STR_VAR_1}”!$" -DewfordTown_Hall_Text_1FD877: @ 81FD877 +DewfordTown_Hall_Text_GettingBoredOfTrend: @ 81FD877 .string "What's in vogue? Why, it has to be\n" .string "“{STR_VAR_1}”!\p" .string "But I'm getting kind of bored with it.\p" .string "I should look for the next big thing.$" -DewfordTown_Hall_Text_1FD8ED: @ 81FD8ED +DewfordTown_Hall_Text_TeachingMonAboutTrend: @ 81FD8ED .string "I'm teaching my POKéMON about\n" .string "“{STR_VAR_1},”\l" .string "but it's not going well.\p" .string "It's a bit too much, I think.$" -DewfordTown_Hall_Text_1FD948: @ 81FD948 +DewfordTown_Hall_Text_DeepLinkBetweenXAndY: @ 81FD948 .string "I'm studying up on the hip and trendy\n" .string "“{STR_VAR_1}” now.\p" .string "Is it true that there's a deep link\n" .string "between “{STR_VAR_1}”\l" .string "and “{STR_VAR_2}”?$" -DewfordTown_Hall_Text_1FD9B3: @ 81FD9B3 +DewfordTown_Hall_Text_MyHunchWasRight: @ 81FD9B3 .string "Oh!\n" .string "So, my hunch was right!\p" .string "I'm one step closer to being hip and\n" .string "happening, yowza!$" -DewfordTown_Hall_Text_1FDA06: @ 81FDA06 +DewfordTown_Hall_Text_NotEasyToKeepUp: @ 81FDA06 .string "What?!\n" .string "Is that so?!\p" .string "It's not easy for an older fellow like\n" .string "me to keep up with trends!$" -DewfordTown_Hall_Text_1FDA5C: @ 81FDA5C +DewfordTown_Hall_Text_TVShowAboutTrend: @ 81FDA5C .string "This whole business about\n" .string "“{STR_VAR_1}”…\l" .string "Isn't there a TV show on it?$" -DewfordTown_Hall_Text_1FDA99: @ 81FDA99 +DewfordTown_Hall_Text_IsTrendMorePopularAcrossSea: @ 81FDA99 .string "Across the sea…\p" .string "Is “{STR_VAR_1}”\n" .string "even more popular?$" -DewfordTown_Hall_Text_1FDAC4: @ 81FDAC4 +DewfordTown_Hall_Text_CollectTrendMerchandise: @ 81FDAC4 .string "I collect official\n" .string "“{STR_VAR_1}”\l" .string "licensed merchandise.\p" @@ -327,7 +327,7 @@ DewfordTown_Hall_Text_1FDAC4: @ 81FDAC4 .string "Heheh, I own!\n" .string "I'm not sharing anything with you!$" -DewfordTown_Hall_Text_1FDB89: @ 81FDB89 +DewfordTown_Hall_Text_BooksAboutTrend: @ 81FDB89 .string "IDENTIFYING GOOD\n" .string "“{STR_VAR_1}” &\l" .string "BAD “{STR_VAR_1}”…\p" @@ -339,30 +339,30 @@ DewfordTown_Hall_Text_1FDB89: @ 81FDB89 .string "It's neatly jammed with books about\n" .string "“{STR_VAR_1}.”$" -DewfordTown_Hall_Text_1FDC05: @ 81FDC05 +DewfordTown_Hall_Text_TrendsScream: @ 81FDC05 .string "“{STR_VAR_1}'S\n" .string "SCREAM” is the title.$" -DewfordTown_Hall_Text_1FDC21: @ 81FDC21 +DewfordTown_Hall_Text_TrendsSmile: @ 81FDC21 .string "“{STR_VAR_1}'S\n" .string "SMILE” is the title.$" -DewfordTown_Hall_Text_1FDC3C: @ 81FDC3C +DewfordTown_Hall_Text_LastTrend: @ 81FDC3C .string "It's titled “THE LAST\n" .string "{STR_VAR_1}”.$" -DewfordTown_Hall_Text_1FDC57: @ 81FDC57 +DewfordTown_Hall_Text_BirthOfTrend: @ 81FDC57 .string "It's titled “THE BIRTH OF\n" .string "{STR_VAR_1}”.$" -DewfordTown_Hall_Text_1FDC76: @ 81FDC76 +DewfordTown_Hall_Text_SawTrendCoolestThing: @ 81FDC76 .string "I saw “{STR_VAR_1}”!\n" .string "Cool, huh?\p" .string "It's, like, the coolest thing going!\p" .string "It was awesome!\n" .string "It was the real thing, oh yeah!$" -DewfordTown_Hall_Text_1FDCE2: @ 81FDCE2 +DewfordTown_Hall_Text_AllegedTrendNotAuthentic: @ 81FDCE2 .string "Oh, no, no, no.\p" .string "That alleged\n" .string "“{STR_VAR_1}”\l" @@ -372,7 +372,7 @@ DewfordTown_Hall_Text_1FDCE2: @ 81FDCE2 .string "Sharper, yet more mellow!\p" .string "Ah, no matter. It's astonishing!$" -DewfordTown_Hall_Text_1FDD95: @ 81FDD95 +DewfordTown_Hall_Text_ComposedTrendThemeSong: @ 81FDD95 .string "Hey, listen, I composed a theme song\n" .string "for “{STR_VAR_1}.”\p" .string "“{STR_VAR_1}”\n" @@ -384,20 +384,20 @@ DewfordTown_Hall_Text_1FDD95: @ 81FDD95 .string "Wonderful\n" .string "{STR_VAR_1}!$" -DewfordTown_Hall_Text_1FDE0E: @ 81FDE0E +DewfordTown_Hall_Text_WorkOnYourSinging: @ 81FDE0E .string "… …\p" .string "I dare say, chap, it would pay for you\n" .string "to work on your singing before you\l" .string "trifle yourself with\l" .string "“{STR_VAR_1}.”$" -DewfordTown_Hall_Text_1FDE77: @ 81FDE77 +DewfordTown_Hall_Text_OrganizeTrendParty: @ 81FDE77 .string "Anyway, as I was saying earlier, we\n" .string "should get together and organize a\l" .string "“{STR_VAR_1}” party\l" .string "on the island.$" -DewfordTown_Hall_Text_1FDED8: @ 81FDED8 +DewfordTown_Hall_Text_BrilliantIndeed: @ 81FDED8 .string "Oh, a smashing good idea!\p" .string "It will settle once and for all\n" .string "who is the best at\l" @@ -406,14 +406,14 @@ DewfordTown_Hall_Text_1FDED8: @ 81FDED8 .string "Starting today, our lives will revolve\n" .string "around “{STR_VAR_1}”!$" -DewfordTown_Hall_Text_1FDF72: @ 81FDF72 +DewfordTown_Hall_Text_TrendHasBecomePartOfLife: @ 81FDF72 .string "I was thinking, though…\p" .string "Wouldn't you agree that\n" .string "“{STR_VAR_1}” has\l" .string "grown from being something trendy to\l" .string "being a part of our daily lives?$" -DewfordTown_Hall_Text_1FDFF1: @ 81FDFF1 +DewfordTown_Hall_Text_TrendWeighsHeavilyOnMind: @ 81FDFF1 .string "Beg pardon?\n" .string "That much, what?\p" .string "However, it's true that\n" @@ -424,19 +424,19 @@ DewfordTown_Hall_Text_1FDFF1: @ 81FDFF1 .string "“{STR_VAR_1}”\l" .string "PROFESSOR, old sport!$" -DewfordTown_Hall_Text_1FE09A: @ 81FE09A +DewfordTown_Hall_Text_IfWeTeamUpWellBeInvincible: @ 81FE09A .string "If you and me team up as a combo,\n" .string "we'll be invincible when it comes to all\l" .string "things “{STR_VAR_1}”!$" -DewfordTown_Hall_Text_1FE0F2: @ 81FE0F2 +DewfordTown_Hall_Text_WellBeTrendDuo: @ 81FE0F2 .string "Spot on, my friend!\p" .string "We shall be the\n" .string "“{STR_VAR_1}” DUO!\p" .string "Isn't that a ripe image?\n" .string "Hahahah!$" -DewfordTown_Hall_Text_1FE142: @ 81FE142 +DewfordTown_Hall_Text_GiveYouSludgeBomb: @ 81FE142 .string "For me, SLUDGE BOMB is at the peak\n" .string "of popularity. It's the one.\p" .string "Hunh? You're telling me that you don't\n" @@ -444,7 +444,7 @@ DewfordTown_Hall_Text_1FE142: @ 81FE142 .string "That's outright pitiful.\n" .string "I'll give you one.$" -DewfordTown_Hall_Text_1FE1ED: @ 81FE1ED +DewfordTown_Hall_Text_LoveSludgeBombButTrendInToo: @ 81FE1ED .string "I love SLUDGE BOMB.\p" .string "But POKéMON with the move\n" .string "“{STR_VAR_1}”\l" diff --git a/data/maps/DewfordTown_House1/map.json b/data/maps/DewfordTown_House1/map.json index dfae500bd..beb6d5275 100644 --- a/data/maps/DewfordTown_House1/map.json +++ b/data/maps/DewfordTown_House1/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_House1_EventScript_1FC3D7", + "script": "DewfordTown_House1_EventScript_Woman", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_House1_EventScript_1FC3CE", + "script": "DewfordTown_House1_EventScript_Man", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_House1_EventScript_1FC3E0", + "script": "DewfordTown_House1_EventScript_Zigzagoon", "flag": "0" } ], diff --git a/data/maps/DewfordTown_House1/scripts.inc b/data/maps/DewfordTown_House1/scripts.inc index 32706dbde..06e377057 100644 --- a/data/maps/DewfordTown_House1/scripts.inc +++ b/data/maps/DewfordTown_House1/scripts.inc @@ -1,36 +1,36 @@ DewfordTown_House1_MapScripts:: @ 81FC3CD .byte 0 -DewfordTown_House1_EventScript_1FC3CE:: @ 81FC3CE - msgbox DewfordTown_House1_Text_1FC3F3, MSGBOX_NPC +DewfordTown_House1_EventScript_Man:: @ 81FC3CE + msgbox DewfordTown_House1_Text_LotToBeSaidForLivingOnIsland, MSGBOX_NPC end -DewfordTown_House1_EventScript_1FC3D7:: @ 81FC3D7 - msgbox DewfordTown_House1_Text_1FC45B, MSGBOX_NPC +DewfordTown_House1_EventScript_Woman:: @ 81FC3D7 + msgbox DewfordTown_House1_Text_LifeGoesSlowlyOnIsland, MSGBOX_NPC end -DewfordTown_House1_EventScript_1FC3E0:: @ 81FC3E0 +DewfordTown_House1_EventScript_Zigzagoon:: @ 81FC3E0 lock faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox DewfordTown_House1_Text_1FC510, MSGBOX_DEFAULT + msgbox DewfordTown_House1_Text_Zigzagoon, MSGBOX_DEFAULT waitmoncry release end -DewfordTown_House1_Text_1FC3F3: @ 81FC3F3 +DewfordTown_House1_Text_LotToBeSaidForLivingOnIsland: @ 81FC3F3 .string "There's a lot to be said for living on\n" .string "a small island like this in harmony with\l" .string "POKéMON and the family.$" -DewfordTown_House1_Text_1FC45B: @ 81FC45B +DewfordTown_House1_Text_LifeGoesSlowlyOnIsland: @ 81FC45B .string "I left the major port of SLATEPORT\n" .string "CITY when I married my husband here.\p" .string "Life goes by slowly on this little\n" .string "island. But being surrounded by the\l" .string "beautiful sea--that's happiness, too.$" -DewfordTown_House1_Text_1FC510: @ 81FC510 +DewfordTown_House1_Text_Zigzagoon: @ 81FC510 .string "ZIGZAGOON: Guguuh!$" diff --git a/data/maps/DewfordTown_House2/map.json b/data/maps/DewfordTown_House2/map.json index bc9c008fc..ac1abca36 100644 --- a/data/maps/DewfordTown_House2/map.json +++ b/data/maps/DewfordTown_House2/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_House2_EventScript_1FE22E", + "script": "DewfordTown_House2_EventScript_Man", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_House2_EventScript_1FE271", + "script": "DewfordTown_House2_EventScript_Boy", "flag": "0" } ], diff --git a/data/maps/DewfordTown_House2/scripts.inc b/data/maps/DewfordTown_House2/scripts.inc index eb6beb951..43d2c1b5e 100644 --- a/data/maps/DewfordTown_House2/scripts.inc +++ b/data/maps/DewfordTown_House2/scripts.inc @@ -1,33 +1,33 @@ DewfordTown_House2_MapScripts:: @ 81FE22D .byte 0 -DewfordTown_House2_EventScript_1FE22E:: @ 81FE22E +DewfordTown_House2_EventScript_Man:: @ 81FE22E lock faceplayer - goto_if_set FLAG_RECEIVED_SILK_SCARF, DewfordTown_House2_EventScript_1FE267 - msgbox DewfordTown_House2_Text_1FE27A, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_SILK_SCARF, DewfordTown_House2_EventScript_ExplainSilkScarf + msgbox DewfordTown_House2_Text_WantYouToHaveSilkScarf, MSGBOX_DEFAULT giveitem_std ITEM_SILK_SCARF - compare VAR_RESULT, 0 - goto_if_eq DewfordTown_House2_EventScript_1FE25D + compare VAR_RESULT, FALSE + goto_if_eq DewfordTown_House2_EventScript_NoRoomForScarf setflag FLAG_RECEIVED_SILK_SCARF release end -DewfordTown_House2_EventScript_1FE25D:: @ 81FE25D - msgbox DewfordTown_House2_Text_1FE356, MSGBOX_DEFAULT +DewfordTown_House2_EventScript_NoRoomForScarf:: @ 81FE25D + msgbox DewfordTown_House2_Text_NoRoom, MSGBOX_DEFAULT release end -DewfordTown_House2_EventScript_1FE267:: @ 81FE267 - msgbox DewfordTown_House2_Text_1FE3D1, MSGBOX_DEFAULT +DewfordTown_House2_EventScript_ExplainSilkScarf:: @ 81FE267 + msgbox DewfordTown_House2_Text_ExplainSilkScarf, MSGBOX_DEFAULT release end -DewfordTown_House2_EventScript_1FE271:: @ 81FE271 - msgbox DewfordTown_House2_Text_1FE444, MSGBOX_NPC +DewfordTown_House2_EventScript_Boy:: @ 81FE271 + msgbox DewfordTown_House2_Text_BrawlySoCool, MSGBOX_NPC end -DewfordTown_House2_Text_1FE27A: @ 81FE27A +DewfordTown_House2_Text_WantYouToHaveSilkScarf: @ 81FE27A .string "Gorge your eyes on this!\p" .string "It's a SILK SCARF. It's right at the\n" .string "cutting edge of fashion, yeah!\p" @@ -36,19 +36,19 @@ DewfordTown_House2_Text_1FE27A: @ 81FE27A .string "Oh, you're a delight!\n" .string "Here you go. I want you to have it!$" -DewfordTown_House2_Text_1FE356: @ 81FE356 +DewfordTown_House2_Text_NoRoom: @ 81FE356 .string "Oh, you don't have room?\p" .string "Now, listen tight, this SCARF is a must-\n" .string "have! Why, I would sell all my items\l" .string "in order to get it!$" -DewfordTown_House2_Text_1FE3D1: @ 81FE3D1 +DewfordTown_House2_Text_ExplainSilkScarf: @ 81FE3D1 .string "The SILK SCARF raises the power of\n" .string "NORMAL-type moves.\p" .string "It's a marvelous SCARF that will go\n" .string "with almost all POKéMON!$" -DewfordTown_House2_Text_1FE444: @ 81FE444 +DewfordTown_House2_Text_BrawlySoCool: @ 81FE444 .string "Wow, you bothered to cross the sea\n" .string "to visit DEWFORD?\p" .string "Did you maybe come here because you\n" diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json index 90175db1d..0fd6e9eca 100644 --- a/data/maps/EverGrandeCity/map.json +++ b/data/maps/EverGrandeCity/map.json @@ -58,7 +58,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_1E7D46" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" }, { "type": "trigger", @@ -67,7 +67,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_1E7D46" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" }, { "type": "trigger", @@ -76,7 +76,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_1E7D46" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" }, { "type": "trigger", @@ -85,7 +85,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_1E7D46" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" }, { "type": "trigger", @@ -94,7 +94,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_1E7D46" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" }, { "type": "trigger", @@ -103,7 +103,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_1E7D46" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" }, { "type": "trigger", @@ -112,7 +112,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_1E7D46" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" }, { "type": "trigger", @@ -121,7 +121,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_1E7D46" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" }, { "type": "trigger", @@ -130,7 +130,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_1E7D46" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" }, { "type": "trigger", @@ -139,7 +139,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_1E7D46" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" }, { "type": "trigger", @@ -148,7 +148,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_1E7D46" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" } ], "bg_events": [ @@ -158,7 +158,7 @@ "y": 43, "elevation": 5, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "EverGrandeCity_EventScript_1E7D2B" + "script": "EverGrandeCity_EventScript_VictoryRoadSign" }, { "type": "sign", @@ -174,7 +174,7 @@ "y": 52, "elevation": 5, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "EverGrandeCity_EventScript_1E7D34" + "script": "EverGrandeCity_EventScript_CitySign" }, { "type": "sign", @@ -182,7 +182,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "EverGrandeCity_EventScript_1E7D3D" + "script": "EverGrandeCity_EventScript_PokemonLeagueSign" }, { "type": "sign", diff --git a/data/maps/EverGrandeCity/scripts.inc b/data/maps/EverGrandeCity/scripts.inc index 39e57f563..93e047dd0 100644 --- a/data/maps/EverGrandeCity/scripts.inc +++ b/data/maps/EverGrandeCity/scripts.inc @@ -6,31 +6,31 @@ EverGrandeCity_OnTransition: @ 81E7D21 call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end -EverGrandeCity_EventScript_1E7D2B:: @ 81E7D2B - msgbox EverGrandeCity_Text_1E7D4F, MSGBOX_SIGN +EverGrandeCity_EventScript_VictoryRoadSign:: @ 81E7D2B + msgbox EverGrandeCity_Text_EnteringVictoryRoad, MSGBOX_SIGN end -EverGrandeCity_EventScript_1E7D34:: @ 81E7D34 - msgbox EverGrandeCity_Text_1E7D89, MSGBOX_SIGN +EverGrandeCity_EventScript_CitySign:: @ 81E7D34 + msgbox EverGrandeCity_Text_CitySign, MSGBOX_SIGN end -EverGrandeCity_EventScript_1E7D3D:: @ 81E7D3D - msgbox EverGrandeCity_Text_1E7D65, MSGBOX_SIGN +EverGrandeCity_EventScript_PokemonLeagueSign:: @ 81E7D3D + msgbox EverGrandeCity_Text_EnteringPokemonLeague, MSGBOX_SIGN end -EverGrandeCity_EventScript_1E7D46:: @ 81E7D46 +EverGrandeCity_EventScript_SetVisitedEverGrande:: @ 81E7D46 setflag FLAG_VISITED_EVER_GRANDE_CITY setvar VAR_TEMP_1, 1 end -EverGrandeCity_Text_1E7D4F: @ 81E7D4F +EverGrandeCity_Text_EnteringVictoryRoad: @ 81E7D4F .string "ENTERING VICTORY ROAD$" -EverGrandeCity_Text_1E7D65: @ 81E7D65 +EverGrandeCity_Text_EnteringPokemonLeague: @ 81E7D65 .string "ENTERING POKéMON LEAGUE\n" .string "CENTER GATE$" -EverGrandeCity_Text_1E7D89: @ 81E7D89 +EverGrandeCity_Text_CitySign: @ 81E7D89 .string "EVER GRANDE CITY\p" .string "“The paradise of flowers, the sea,\n" .string "and POKéMON.”$" diff --git a/data/maps/EverGrandeCity_Hall1/scripts.inc b/data/maps/EverGrandeCity_Hall1/scripts.inc index c2ffaca47..cd9bd27c1 100644 --- a/data/maps/EverGrandeCity_Hall1/scripts.inc +++ b/data/maps/EverGrandeCity_Hall1/scripts.inc @@ -1,12 +1,12 @@ EverGrandeCity_Hall1_MapScripts:: @ 8229569 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall1_MapScript2_22956F + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall1_OnWarp .byte 0 -EverGrandeCity_Hall1_MapScript2_22956F: @ 822956F - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall1_EventScript_229579 +EverGrandeCity_Hall1_OnWarp: @ 822956F + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall1_EventScript_TurnPlayerNorth .2byte 0 -EverGrandeCity_Hall1_EventScript_229579:: @ 8229579 +EverGrandeCity_Hall1_EventScript_TurnPlayerNorth:: @ 8229579 turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end diff --git a/data/maps/EverGrandeCity_Hall2/scripts.inc b/data/maps/EverGrandeCity_Hall2/scripts.inc index be19992ef..4591aa111 100644 --- a/data/maps/EverGrandeCity_Hall2/scripts.inc +++ b/data/maps/EverGrandeCity_Hall2/scripts.inc @@ -1,12 +1,12 @@ EverGrandeCity_Hall2_MapScripts:: @ 822957E - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall2_MapScript2_229584 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall2_OnWarp .byte 0 -EverGrandeCity_Hall2_MapScript2_229584: @ 8229584 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall2_EventScript_22958E +EverGrandeCity_Hall2_OnWarp: @ 8229584 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall2_EventScript_TurnPlayerNorth .2byte 0 -EverGrandeCity_Hall2_EventScript_22958E:: @ 822958E +EverGrandeCity_Hall2_EventScript_TurnPlayerNorth:: @ 822958E turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end diff --git a/data/maps/EverGrandeCity_Hall3/scripts.inc b/data/maps/EverGrandeCity_Hall3/scripts.inc index eaf2f4e5a..7bd895fd0 100644 --- a/data/maps/EverGrandeCity_Hall3/scripts.inc +++ b/data/maps/EverGrandeCity_Hall3/scripts.inc @@ -1,12 +1,12 @@ EverGrandeCity_Hall3_MapScripts:: @ 8229593 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall3_MapScript2_229599 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall3_OnWarp .byte 0 -EverGrandeCity_Hall3_MapScript2_229599: @ 8229599 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall3_EventScript_2295A3 +EverGrandeCity_Hall3_OnWarp: @ 8229599 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall3_EventScript_TurnPlayerNorth .2byte 0 -EverGrandeCity_Hall3_EventScript_2295A3:: @ 82295A3 +EverGrandeCity_Hall3_EventScript_TurnPlayerNorth:: @ 82295A3 turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end diff --git a/data/maps/EverGrandeCity_Hall4/scripts.inc b/data/maps/EverGrandeCity_Hall4/scripts.inc index e36890874..54d7adfc3 100644 --- a/data/maps/EverGrandeCity_Hall4/scripts.inc +++ b/data/maps/EverGrandeCity_Hall4/scripts.inc @@ -1,12 +1,12 @@ EverGrandeCity_Hall4_MapScripts:: @ 82295A8 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall4_MapScript2_2295AE + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall4_OnWarp .byte 0 -EverGrandeCity_Hall4_MapScript2_2295AE: @ 82295AE - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall4_EventScript_2295B8 +EverGrandeCity_Hall4_OnWarp: @ 82295AE + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall4_EventScript_TurnPlayerNorth .2byte 0 -EverGrandeCity_Hall4_EventScript_2295B8:: @ 82295B8 +EverGrandeCity_Hall4_EventScript_TurnPlayerNorth:: @ 82295B8 turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end diff --git a/data/maps/EverGrandeCity_Hall5/scripts.inc b/data/maps/EverGrandeCity_Hall5/scripts.inc index 6079bbd42..1ba85b999 100644 --- a/data/maps/EverGrandeCity_Hall5/scripts.inc +++ b/data/maps/EverGrandeCity_Hall5/scripts.inc @@ -1,12 +1,12 @@ EverGrandeCity_Hall5_MapScripts:: @ 82295BD - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall5_MapScript2_2295C3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall5_OnWarp .byte 0 -EverGrandeCity_Hall5_MapScript2_2295C3: @ 82295C3 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall5_EventScript_2295CD +EverGrandeCity_Hall5_OnWarp: @ 82295C3 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall5_EventScript_TurnPlayerNorth .2byte 0 -EverGrandeCity_Hall5_EventScript_2295CD:: @ 82295CD +EverGrandeCity_Hall5_EventScript_TurnPlayerNorth:: @ 82295CD turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index 53b6626a1..3fe146f99 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -1,38 +1,38 @@ EverGrandeCity_HallOfFame_MapScripts:: @ 822982C - map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_HallOfFame_MapScript2_229846 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_HallOfFame_MapScript2_229837 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_HallOfFame_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_HallOfFame_OnWarp .byte 0 -EverGrandeCity_HallOfFame_MapScript2_229837: @ 8229837 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_229841 +EverGrandeCity_HallOfFame_OnWarp: @ 8229837 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_TurnPlayerNorth .2byte 0 -EverGrandeCity_HallOfFame_EventScript_229841:: @ 8229841 +EverGrandeCity_HallOfFame_EventScript_TurnPlayerNorth:: @ 8229841 turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end -EverGrandeCity_HallOfFame_MapScript2_229846: @ 8229846 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_229850 +EverGrandeCity_HallOfFame_OnFrame: @ 8229846 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_EnterHallOfFame .2byte 0 -EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 +EverGrandeCity_HallOfFame_EventScript_EnterHallOfFame:: @ 8229850 lockall - applymovement 1, EverGrandeCity_HallOfFame_Movement_229901 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229901 + applymovement 1, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame1 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame1 waitmovement 0 applymovement 1, Common_Movement_WalkInPlaceFastestRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox EverGrandeCity_HallOfFame_Text_22990E, MSGBOX_DEFAULT + msgbox EverGrandeCity_HallOfFame_Text_HereWeHonorLeagueChampions, MSGBOX_DEFAULT closemessage - applymovement 1, EverGrandeCity_HallOfFame_Movement_229908 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229908 + applymovement 1, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame2 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame2 waitmovement 0 delay 20 applymovement 1, Common_Movement_WalkInPlaceFastestRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox EverGrandeCity_HallOfFame_Text_2299A3, MSGBOX_DEFAULT + msgbox EverGrandeCity_HallOfFame_Text_LetsRecordYouAndYourPartnersNames, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_WalkInPlaceFastestUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp @@ -45,12 +45,12 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 call EverGrandeCity_HallOfFame_EventScript_SetGameClearFlags checkplayergender compare VAR_RESULT, MALE - goto_if_eq EverGrandeCity_HallOfFame_EventScript_2298E9 + goto_if_eq EverGrandeCity_HallOfFame_EventScript_GameClearMale compare VAR_RESULT, FEMALE - goto_if_eq EverGrandeCity_HallOfFame_EventScript_2298F5 + goto_if_eq EverGrandeCity_HallOfFame_EventScript_GameClearFemale end -EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9 +EverGrandeCity_HallOfFame_EventScript_GameClearMale:: @ 82298E9 setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F fadescreenspeed 1, 24 special GameClear @@ -58,7 +58,7 @@ EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9 releaseall end -EverGrandeCity_HallOfFame_EventScript_2298F5:: @ 82298F5 +EverGrandeCity_HallOfFame_EventScript_GameClearFemale:: @ 82298F5 setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F fadescreenspeed 1, 24 special GameClear @@ -66,7 +66,7 @@ EverGrandeCity_HallOfFame_EventScript_2298F5:: @ 82298F5 releaseall end -EverGrandeCity_HallOfFame_Movement_229901: @ 8229901 +EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame1: @ 8229901 walk_up walk_up walk_up @@ -75,7 +75,7 @@ EverGrandeCity_HallOfFame_Movement_229901: @ 8229901 walk_up step_end -EverGrandeCity_HallOfFame_Movement_229908: @ 8229908 +EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame2: @ 8229908 walk_up walk_up walk_up @@ -83,7 +83,7 @@ EverGrandeCity_HallOfFame_Movement_229908: @ 8229908 walk_up step_end -EverGrandeCity_HallOfFame_Text_22990E: @ 822990E +EverGrandeCity_HallOfFame_Text_HereWeHonorLeagueChampions: @ 822990E .string "WALLACE: This room…\p" .string "This is where we keep records of\n" .string "POKéMON that prevailed through\l" @@ -91,7 +91,7 @@ EverGrandeCity_HallOfFame_Text_22990E: @ 822990E .string "It is here that the LEAGUE CHAMPIONS\n" .string "are honored.$" -EverGrandeCity_HallOfFame_Text_2299A3: @ 82299A3 +EverGrandeCity_HallOfFame_Text_LetsRecordYouAndYourPartnersNames: @ 82299A3 .string "WALLACE: Come on, let's record your\n" .string "name as a TRAINER who triumphed over\l" .string "the POKéMON LEAGUE, and the names of\l" diff --git a/data/maps/FallarborTown_BattleTentLobby/map.json b/data/maps/FallarborTown_BattleTentLobby/map.json index aa65e71a0..4c565ff8c 100644 --- a/data/maps/FallarborTown_BattleTentLobby/map.json +++ b/data/maps/FallarborTown_BattleTentLobby/map.json @@ -77,7 +77,7 @@ "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_BattleTentLobby_EventScript_200228", - "flag": "FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT" + "flag": "FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT" } ], "warp_events": [ diff --git a/data/maps/FieryPath/scripts.inc b/data/maps/FieryPath/scripts.inc index 0aa5769a0..ca259993e 100644 --- a/data/maps/FieryPath/scripts.inc +++ b/data/maps/FieryPath/scripts.inc @@ -3,12 +3,12 @@ FieryPath_MapScripts:: @ 8230F24 .byte 0 FieryPath_OnTransition: @ 8230F2A - call_if_unset FLAG_LANDMARK_FIERY_PATH, FieryPath_EventScript_230F37 + call_if_unset FLAG_LANDMARK_FIERY_PATH, FieryPath_EventScript_MoveScottToFallarbor setflag FLAG_LANDMARK_FIERY_PATH end -FieryPath_EventScript_230F37:: @ 8230F37 +FieryPath_EventScript_MoveScottToFallarbor:: @ 8230F37 setflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT - clearflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT + clearflag FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT return diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json index 454fc34d3..ce1dcee3e 100644 --- a/data/maps/FortreeCity/map.json +++ b/data/maps/FortreeCity/map.json @@ -35,7 +35,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_EventScript_1E25B6", + "script": "FortreeCity_EventScript_Man", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_EventScript_1E25DE", + "script": "FortreeCity_EventScript_Girl", "flag": "0" }, { @@ -61,7 +61,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_EventScript_1E25BF", + "script": "FortreeCity_EventScript_Woman", "flag": "0" }, { @@ -74,7 +74,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_EventScript_1E25F0", + "script": "FortreeCity_EventScript_Boy", "flag": "0" }, { @@ -87,7 +87,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_EventScript_1E25E7", + "script": "FortreeCity_EventScript_OldMan", "flag": "0" }, { @@ -100,7 +100,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_EventScript_1E25F9", + "script": "FortreeCity_EventScript_GameboyKid", "flag": "0" }, { @@ -113,7 +113,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_EventScript_1E2614", + "script": "FortreeCity_EventScript_Kecleon", "flag": "FLAG_HIDE_FORTREE_CITY_KECLEON" } ], @@ -190,7 +190,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "FortreeCity_EventScript_1E2602" + "script": "FortreeCity_EventScript_CitySign" }, { "type": "sign", @@ -214,7 +214,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "FortreeCity_EventScript_1E260B" + "script": "FortreeCity_EventScript_GymSign" }, { "type": "sign", diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc index 716a511b0..748ed2558 100644 --- a/data/maps/FortreeCity/scripts.inc +++ b/data/maps/FortreeCity/scripts.inc @@ -1,76 +1,76 @@ FortreeCity_MapScripts:: @ 81E25A4 map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_OnTransition - map_script MAP_SCRIPT_ON_RESUME, FortreeCity_MapScript1_1E25B3 + map_script MAP_SCRIPT_ON_RESUME, FortreeCity_OnResume .byte 0 FortreeCity_OnTransition: @ 81E25AF setflag FLAG_VISITED_FORTREE_CITY end -FortreeCity_MapScript1_1E25B3: @ 81E25B3 +FortreeCity_OnResume: @ 81E25B3 setstepcallback STEP_CB_FORTREE_BRIDGE end -FortreeCity_EventScript_1E25B6:: @ 81E25B6 - msgbox FortreeCity_Text_1E2676, MSGBOX_NPC +FortreeCity_EventScript_Man:: @ 81E25B6 + msgbox FortreeCity_Text_SawGiganticPokemonInSky, MSGBOX_NPC end -FortreeCity_EventScript_1E25BF:: @ 81E25BF +FortreeCity_EventScript_Woman:: @ 81E25BF lock faceplayer - goto_if_set FLAG_KECLEON_FLED_FORTREE, FortreeCity_EventScript_1E25D4 - msgbox FortreeCity_Text_1E2738, MSGBOX_DEFAULT + goto_if_set FLAG_KECLEON_FLED_FORTREE, FortreeCity_EventScript_WomanGymAccessible + msgbox FortreeCity_Text_SomethingBlockingGym, MSGBOX_DEFAULT release end -FortreeCity_EventScript_1E25D4:: @ 81E25D4 - msgbox FortreeCity_Text_1E27B6, MSGBOX_DEFAULT +FortreeCity_EventScript_WomanGymAccessible:: @ 81E25D4 + msgbox FortreeCity_Text_ThisTimeIllBeatWinona, MSGBOX_DEFAULT release end -FortreeCity_EventScript_1E25DE:: @ 81E25DE - msgbox FortreeCity_Text_1E27FE, MSGBOX_NPC +FortreeCity_EventScript_Girl:: @ 81E25DE + msgbox FortreeCity_Text_TreesGrowByDrinkingRainwater, MSGBOX_NPC end -FortreeCity_EventScript_1E25E7:: @ 81E25E7 - msgbox FortreeCity_Text_1E2880, MSGBOX_NPC +FortreeCity_EventScript_OldMan:: @ 81E25E7 + msgbox FortreeCity_Text_EveryoneHealthyAndLively, MSGBOX_NPC end -FortreeCity_EventScript_1E25F0:: @ 81E25F0 - msgbox FortreeCity_Text_1E292E, MSGBOX_NPC +FortreeCity_EventScript_Boy:: @ 81E25F0 + msgbox FortreeCity_Text_BugPokemonComeThroughWindow, MSGBOX_NPC end -FortreeCity_EventScript_1E25F9:: @ 81E25F9 - msgbox FortreeCity_Text_1E299D, MSGBOX_NPC +FortreeCity_EventScript_GameboyKid:: @ 81E25F9 + msgbox FortreeCity_Text_PokemonThatEvolveWhenTraded, MSGBOX_NPC end -FortreeCity_EventScript_1E2602:: @ 81E2602 - msgbox FortreeCity_Text_1E2AAC, MSGBOX_SIGN +FortreeCity_EventScript_CitySign:: @ 81E2602 + msgbox FortreeCity_Text_CitySign, MSGBOX_SIGN end -FortreeCity_EventScript_1E260B:: @ 81E260B - msgbox FortreeCity_Text_1E2AE6, MSGBOX_SIGN +FortreeCity_EventScript_GymSign:: @ 81E260B + msgbox FortreeCity_Text_GymSign, MSGBOX_SIGN end -FortreeCity_EventScript_1E2614:: @ 81E2614 +FortreeCity_EventScript_Kecleon:: @ 81E2614 lock faceplayer checkitem ITEM_DEVON_SCOPE, 1 - compare VAR_RESULT, 1 - goto_if_eq FortreeCity_EventScript_1E2630 - msgbox FortreeCity_Text_1E29E5, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq FortreeCity_EventScript_AskUseDevonScope + msgbox FortreeCity_Text_SomethingUnseeable, MSGBOX_DEFAULT release end -FortreeCity_EventScript_1E2630:: @ 81E2630 - msgbox FortreeCity_Text_1E2A08, MSGBOX_YESNO +FortreeCity_EventScript_AskUseDevonScope:: @ 81E2630 + msgbox FortreeCity_Text_UnseeableUseDevonScope, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq FortreeCity_EventScript_1E2645 + goto_if_eq FortreeCity_EventScript_UseDevonScope release end -FortreeCity_EventScript_1E2645:: @ 81E2645 - msgbox FortreeCity_Text_1E2A48, MSGBOX_DEFAULT +FortreeCity_EventScript_UseDevonScope:: @ 81E2645 + msgbox FortreeCity_Text_UsedDevonScopePokemonFled, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Movement_KecleonAppears waitmovement 0 @@ -78,18 +78,18 @@ FortreeCity_EventScript_1E2645:: @ 81E2645 playmoncry SPECIES_KECLEON, 2 delay 40 waitmoncry - applymovement VAR_LAST_TALKED, FortreeCity_Movement_1E2674 + applymovement VAR_LAST_TALKED, FortreeCity_Movement_KecleonFlee waitmovement 0 removeobject VAR_LAST_TALKED setflag FLAG_KECLEON_FLED_FORTREE release end -FortreeCity_Movement_1E2674: @ 81E2674 +FortreeCity_Movement_KecleonFlee: @ 81E2674 walk_right step_end -FortreeCity_Text_1E2676: @ 81E2676 +FortreeCity_Text_SawGiganticPokemonInSky: @ 81E2676 .string "No one believes me, but I saw this\n" .string "gigantic POKéMON in the sky.\p" .string "It seemed to squirm as it flew toward\n" @@ -98,23 +98,23 @@ FortreeCity_Text_1E2676: @ 81E2676 .string "Um… You, uh…smell singed.\p" .string "Were you at a volcano or something?$" -FortreeCity_Text_1E2738: @ 81E2738 +FortreeCity_Text_SomethingBlockingGym: @ 81E2738 .string "I want to go to the POKéMON GYM,\n" .string "but something's blocking the way.\p" .string "After all the bother I went through\n" .string "training on ROUTE 120…$" -FortreeCity_Text_1E27B6: @ 81E27B6 +FortreeCity_Text_ThisTimeIllBeatWinona: @ 81E27B6 .string "I've got my pride-and-joy POKéMON\n" .string "with me. This time, I'll beat WINONA.$" -FortreeCity_Text_1E27FE: @ 81E27FE +FortreeCity_Text_TreesGrowByDrinkingRainwater: @ 81E27FE .string "The ground absorbs rainwater, and\n" .string "trees grow by drinking that water…\p" .string "Our FORTREE CITY exists because\n" .string "there's both water and soil.$" -FortreeCity_Text_1E2880: @ 81E2880 +FortreeCity_Text_EveryoneHealthyAndLively: @ 81E2880 .string "The CITY consists of homes built on\n" .string "trees.\p" .string "Perhaps because of that lifestyle,\n" @@ -122,35 +122,35 @@ FortreeCity_Text_1E2880: @ 81E2880 .string "Why, even myself--I feel as if I've\n" .string "grown thirty years younger.$" -FortreeCity_Text_1E292E: @ 81E292E +FortreeCity_Text_BugPokemonComeThroughWindow: @ 81E292E .string "Living on top of trees is okay.\p" .string "But sometimes BUG POKéMON come in\n" .string "through windows.\l" .string "It can be really startling.$" -FortreeCity_Text_1E299D: @ 81E299D +FortreeCity_Text_PokemonThatEvolveWhenTraded: @ 81E299D .string "There are POKéMON that evolve when\n" .string "you trade them! That's what I heard.$" -FortreeCity_Text_1E29E5: @ 81E29E5 +FortreeCity_Text_SomethingUnseeable: @ 81E29E5 .string "Something unseeable is in the way.$" -FortreeCity_Text_1E2A08: @ 81E2A08 +FortreeCity_Text_UnseeableUseDevonScope: @ 81E2A08 .string "Something unseeable is in the way.\p" .string "Want to use the DEVON SCOPE?$" -FortreeCity_Text_1E2A48: @ 81E2A48 +FortreeCity_Text_UsedDevonScopePokemonFled: @ 81E2A48 .string "{PLAYER} used the DEVON SCOPE.\p" .string "An invisible POKéMON became completely\n" .string "visible!\p" .string "The startled POKéMON fled!$" -FortreeCity_Text_1E2AAC: @ 81E2AAC +FortreeCity_Text_CitySign: @ 81E2AAC .string "FORTREE CITY\n" .string "“The treetop city that frolics with\l" .string "nature.”$" -FortreeCity_Text_1E2AE6: @ 81E2AE6 +FortreeCity_Text_GymSign: @ 81E2AE6 .string "FORTREE CITY POKéMON GYM\n" .string "LEADER: WINONA\p" .string "“The bird user taking flight into\n" diff --git a/data/maps/FortreeCity_DecorationShop/map.json b/data/maps/FortreeCity_DecorationShop/map.json index a8654e708..ac0ca1f89 100644 --- a/data/maps/FortreeCity_DecorationShop/map.json +++ b/data/maps/FortreeCity_DecorationShop/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_DecorationShop_EventScript_21800E", + "script": "FortreeCity_DecorationShop_EventScript_PokefanM", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_DecorationShop_EventScript_218017", + "script": "FortreeCity_DecorationShop_EventScript_Girl", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_DecorationShop_EventScript_218020", + "script": "FortreeCity_DecorationShop_EventScript_ClerkDesks", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_DecorationShop_EventScript_21804C", + "script": "FortreeCity_DecorationShop_EventScript_ClerkChairs", "flag": "0" } ], diff --git a/data/maps/FortreeCity_DecorationShop/scripts.inc b/data/maps/FortreeCity_DecorationShop/scripts.inc index 14c864ee5..4dd751b0f 100644 --- a/data/maps/FortreeCity_DecorationShop/scripts.inc +++ b/data/maps/FortreeCity_DecorationShop/scripts.inc @@ -1,15 +1,15 @@ FortreeCity_DecorationShop_MapScripts:: @ 821800D .byte 0 -FortreeCity_DecorationShop_EventScript_21800E:: @ 821800E - msgbox FortreeCity_DecorationShop_Text_218078, MSGBOX_NPC +FortreeCity_DecorationShop_EventScript_PokefanM:: @ 821800E + msgbox FortreeCity_DecorationShop_Text_MerchandiseSentToPC, MSGBOX_NPC end -FortreeCity_DecorationShop_EventScript_218017:: @ 8218017 - msgbox FortreeCity_DecorationShop_Text_2180ED, MSGBOX_NPC +FortreeCity_DecorationShop_EventScript_Girl:: @ 8218017 + msgbox FortreeCity_DecorationShop_Text_BuyingDeskForDolls, MSGBOX_NPC end -FortreeCity_DecorationShop_EventScript_218020:: @ 8218020 +FortreeCity_DecorationShop_EventScript_ClerkDesks:: @ 8218020 lock faceplayer message gText_HowMayIServeYou @@ -33,7 +33,7 @@ FortreeCity_DecorationShop_PokemartDecor_Desks: @ 8218038 release end -FortreeCity_DecorationShop_EventScript_21804C:: @ 821804C +FortreeCity_DecorationShop_EventScript_ClerkChairs:: @ 821804C lock faceplayer message gText_HowMayIServeYou @@ -57,13 +57,13 @@ FortreeCity_DecorationShop_PokemartDecor_Chairs: @ 8218064 release end -FortreeCity_DecorationShop_Text_218078: @ 8218078 +FortreeCity_DecorationShop_Text_MerchandiseSentToPC: @ 8218078 .string "Merchandise you buy here is sent to\n" .string "your own PC.\p" .string "That's fantastic! I wish they could\n" .string "also deliver me home like that.$" -FortreeCity_DecorationShop_Text_2180ED: @ 82180ED +FortreeCity_DecorationShop_Text_BuyingDeskForDolls: @ 82180ED .string "I'm buying a pretty desk and I'm\n" .string "putting my cute DOLLS on it.\p" .string "If I don't, when I decorate my\n" diff --git a/data/maps/FortreeCity_House1/map.json b/data/maps/FortreeCity_House1/map.json index 62469515a..f984e2be5 100644 --- a/data/maps/FortreeCity_House1/map.json +++ b/data/maps/FortreeCity_House1/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House1_EventScript_2162BB", + "script": "FortreeCity_House1_EventScript_Trader", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House1_EventScript_216368", + "script": "FortreeCity_House1_EventScript_Zigzagoon", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House1_EventScript_21635F", + "script": "FortreeCity_House1_EventScript_ExpertF", "flag": "0" } ], diff --git a/data/maps/FortreeCity_House1/scripts.inc b/data/maps/FortreeCity_House1/scripts.inc index 9ef94b12b..c7f4a8d5b 100644 --- a/data/maps/FortreeCity_House1/scripts.inc +++ b/data/maps/FortreeCity_House1/scripts.inc @@ -1,69 +1,69 @@ FortreeCity_House1_MapScripts:: @ 82162BA .byte 0 -FortreeCity_House1_EventScript_2162BB:: @ 82162BB +FortreeCity_House1_EventScript_Trader:: @ 82162BB lock faceplayer - goto_if_set FLAG_FORTREE_NPC_TRADE_COMPLETED, FortreeCity_House1_EventScript_216355 + goto_if_set FLAG_FORTREE_NPC_TRADE_COMPLETED, FortreeCity_House1_EventScript_TradeCompleted setvar VAR_0x8008, INGAME_TRADE_PLUSLE copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, GetInGameTradeSpeciesInfo copyvar VAR_0x8009, VAR_RESULT - msgbox FortreeCity_House1_Text_21637B, MSGBOX_YESNO + msgbox FortreeCity_House1_Text_YouWillTradeWontYou, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq FortreeCity_House1_EventScript_21633D + goto_if_eq FortreeCity_House1_EventScript_DeclineTrade special ChoosePartyMon waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, 255 - goto_if_eq FortreeCity_House1_EventScript_21633D + goto_if_eq FortreeCity_House1_EventScript_DeclineTrade copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, GetTradeSpecies copyvar VAR_0x800B, VAR_RESULT compare VAR_RESULT, VAR_0x8009 - goto_if_ne FortreeCity_House1_EventScript_216347 + goto_if_ne FortreeCity_House1_EventScript_NotRequestedMon copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A special CreateInGameTradePokemon special DoInGameTradeScene waitstate bufferspeciesname 0, VAR_0x8009 - msgbox FortreeCity_House1_Text_216440, MSGBOX_DEFAULT + msgbox FortreeCity_House1_Text_MonYouTakeCare, MSGBOX_DEFAULT setflag FLAG_FORTREE_NPC_TRADE_COMPLETED release end -FortreeCity_House1_EventScript_21633D:: @ 821633D - msgbox FortreeCity_House1_Text_21649F, MSGBOX_DEFAULT +FortreeCity_House1_EventScript_DeclineTrade:: @ 821633D + msgbox FortreeCity_House1_Text_YouWontTradeMe, MSGBOX_DEFAULT release end -FortreeCity_House1_EventScript_216347:: @ 8216347 +FortreeCity_House1_EventScript_NotRequestedMon:: @ 8216347 bufferspeciesname 0, VAR_0x8009 - msgbox FortreeCity_House1_Text_216474, MSGBOX_DEFAULT + msgbox FortreeCity_House1_Text_ThisIsntAMon, MSGBOX_DEFAULT release end -FortreeCity_House1_EventScript_216355:: @ 8216355 - msgbox FortreeCity_House1_Text_2164DB, MSGBOX_DEFAULT +FortreeCity_House1_EventScript_TradeCompleted:: @ 8216355 + msgbox FortreeCity_House1_Text_GoingToMakeVolbeatStrong, MSGBOX_DEFAULT release end -FortreeCity_House1_EventScript_21635F:: @ 821635F - msgbox FortreeCity_House1_Text_21653B, MSGBOX_NPC +FortreeCity_House1_EventScript_ExpertF:: @ 821635F + msgbox FortreeCity_House1_Text_TradingMemoriesWithOthers, MSGBOX_NPC end -FortreeCity_House1_EventScript_216368:: @ 8216368 +FortreeCity_House1_EventScript_Zigzagoon:: @ 8216368 lock faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox FortreeCity_House1_Text_216597, MSGBOX_DEFAULT + msgbox FortreeCity_House1_Text_Zigzagoon, MSGBOX_DEFAULT waitmoncry release end -FortreeCity_House1_Text_21637B: @ 821637B +FortreeCity_House1_Text_YouWillTradeWontYou: @ 821637B .string "Wrooooaaar! I need it!\n" .string "I have to get me a {STR_VAR_1}!\l" .string "I'll do anything for it!\p" @@ -73,29 +73,29 @@ FortreeCity_House1_Text_21637B: @ 821637B .string "your {STR_VAR_1} for my {STR_VAR_2},\l" .string "won't you?$" -FortreeCity_House1_Text_216440: @ 8216440 +FortreeCity_House1_Text_MonYouTakeCare: @ 8216440 .string "Oh, yeah, right on!\p" .string "{STR_VAR_1}, welcome!\n" .string "{STR_VAR_2}, you take care!$" -FortreeCity_House1_Text_216474: @ 8216474 +FortreeCity_House1_Text_ThisIsntAMon: @ 8216474 .string "Uh, no, I don't think so.\n" .string "That isn't a {STR_VAR_1}.$" -FortreeCity_House1_Text_21649F: @ 821649F +FortreeCity_House1_Text_YouWontTradeMe: @ 821649F .string "No? You won't trade me?\n" .string "Even after I bared my heart to you?$" -FortreeCity_House1_Text_2164DB: @ 82164DB +FortreeCity_House1_Text_GoingToMakeVolbeatStrong: @ 82164DB .string "I'm going to make VOLBEAT super\n" .string "strong from this moment on!\p" .string "I hope you do the same with PLUSLE!$" -FortreeCity_House1_Text_21653B: @ 821653B +FortreeCity_House1_Text_TradingMemoriesWithOthers: @ 821653B .string "Trading POKéMON with others…\p" .string "It's as if you're trading your own\n" .string "memories with other people.$" -FortreeCity_House1_Text_216597: @ 8216597 +FortreeCity_House1_Text_Zigzagoon: @ 8216597 .string "ZIGZAGOON: Gumomoh?$" diff --git a/data/maps/FortreeCity_House2/map.json b/data/maps/FortreeCity_House2/map.json index 492590c6c..c4988e863 100644 --- a/data/maps/FortreeCity_House2/map.json +++ b/data/maps/FortreeCity_House2/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House2_EventScript_2177CB", + "script": "FortreeCity_House2_EventScript_HiddenPowerGiver", "flag": "0" }, { diff --git a/data/maps/FortreeCity_House2/scripts.inc b/data/maps/FortreeCity_House2/scripts.inc index 14ab157ed..bfbe40ff4 100644 --- a/data/maps/FortreeCity_House2/scripts.inc +++ b/data/maps/FortreeCity_House2/scripts.inc @@ -1,82 +1,82 @@ FortreeCity_House2_MapScripts:: @ 82177CA .byte 0 -FortreeCity_House2_EventScript_2177CB:: @ 82177CB +FortreeCity_House2_EventScript_HiddenPowerGiver:: @ 82177CB lock faceplayer - goto_if_set FLAG_RECEIVED_TM10, FortreeCity_House2_EventScript_21786E - call_if_unset FLAG_MET_HIDDEN_POWER_GIVER, FortreeCity_House2_EventScript_217862 - msgbox FortreeCity_House2_Text_2178D6, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_TM10, FortreeCity_House2_EventScript_ExplainHiddenPower + call_if_unset FLAG_MET_HIDDEN_POWER_GIVER, FortreeCity_House2_EventScript_Greeting + msgbox FortreeCity_House2_Text_CoinInWhichHand, MSGBOX_DEFAULT multichoice 21, 8, MULTI_RIGHTLEFT, 1 switch VAR_RESULT - case 1, FortreeCity_House2_EventScript_217878 - msgbox FortreeCity_House2_Text_21796A, MSGBOX_DEFAULT + case 1, FortreeCity_House2_EventScript_WrongGuess + msgbox FortreeCity_House2_Text_CorrectTryAgainWhichHand, MSGBOX_DEFAULT multichoice 21, 8, MULTI_RIGHTLEFT, 1 switch VAR_RESULT - case 1, FortreeCity_House2_EventScript_217878 - msgbox FortreeCity_House2_Text_2179C9, MSGBOX_DEFAULT + case 1, FortreeCity_House2_EventScript_WrongGuess + msgbox FortreeCity_House2_Text_CorrectTryAgainWhichHand2, MSGBOX_DEFAULT multichoice 21, 8, MULTI_RIGHTLEFT, 1 switch VAR_RESULT - case 0, FortreeCity_House2_EventScript_217878 - msgbox FortreeCity_House2_Text_217A28, MSGBOX_DEFAULT + case 0, FortreeCity_House2_EventScript_WrongGuess + msgbox FortreeCity_House2_Text_YourHiddenPowerHasAwoken, MSGBOX_DEFAULT giveitem_std ITEM_TM10 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM10 - msgbox FortreeCity_House2_Text_217A91, MSGBOX_DEFAULT + msgbox FortreeCity_House2_Text_ExplainHiddenPower, MSGBOX_DEFAULT release end -FortreeCity_House2_EventScript_217862:: @ 8217862 - msgbox FortreeCity_House2_Text_217882, MSGBOX_DEFAULT +FortreeCity_House2_EventScript_Greeting:: @ 8217862 + msgbox FortreeCity_House2_Text_HiddenPowersArousedByNature, MSGBOX_DEFAULT setflag FLAG_MET_HIDDEN_POWER_GIVER return -FortreeCity_House2_EventScript_21786E:: @ 821786E - msgbox FortreeCity_House2_Text_217A91, MSGBOX_DEFAULT +FortreeCity_House2_EventScript_ExplainHiddenPower:: @ 821786E + msgbox FortreeCity_House2_Text_ExplainHiddenPower, MSGBOX_DEFAULT release end -FortreeCity_House2_EventScript_217878:: @ 8217878 - msgbox FortreeCity_House2_Text_217AC7, MSGBOX_DEFAULT +FortreeCity_House2_EventScript_WrongGuess:: @ 8217878 + msgbox FortreeCity_House2_Text_YouGuessedWrong, MSGBOX_DEFAULT release end -FortreeCity_House2_Text_217882: @ 8217882 +FortreeCity_House2_Text_HiddenPowersArousedByNature: @ 8217882 .string "People… POKéMON…\p" .string "Their hidden powers are aroused by\n" .string "living in natural environments…$" -FortreeCity_House2_Text_2178D6: @ 82178D6 +FortreeCity_House2_Text_CoinInWhichHand: @ 82178D6 .string "Let this old woman see if your hidden\n" .string "power has awoken…\p" .string "I hold a coin in my hand.\p" .string "Now, tell me, have I palmed it in\n" .string "the right hand? Or in the left?$" -FortreeCity_House2_Text_21796A: @ 821796A +FortreeCity_House2_Text_CorrectTryAgainWhichHand: @ 821796A .string "Oh! Yes, correct!\p" .string "We shall try again.\p" .string "In which hand have I palmed the coin?\n" .string "The right or left?$" -FortreeCity_House2_Text_2179C9: @ 82179C9 +FortreeCity_House2_Text_CorrectTryAgainWhichHand2: @ 82179C9 .string "Oh! Yes, correct!\p" .string "We shall try again.\p" .string "In which hand have I palmed the coin?\n" .string "The right or left?$" -FortreeCity_House2_Text_217A28: @ 8217A28 +FortreeCity_House2_Text_YourHiddenPowerHasAwoken: @ 8217A28 .string "Oh! Splendid!\n" .string "Your hidden power has awoken!\p" .string "Here, take this and awaken the hidden\n" .string "power of your POKéMON.$" -FortreeCity_House2_Text_217A91: @ 8217A91 +FortreeCity_House2_Text_ExplainHiddenPower: @ 8217A91 .string "HIDDEN POWER is a move that changes\n" .string "with the POKéMON.$" -FortreeCity_House2_Text_217AC7: @ 8217AC7 +FortreeCity_House2_Text_YouGuessedWrong: @ 8217AC7 .string "No, too bad.\n" .string "You guessed wrong.$" diff --git a/data/maps/FortreeCity_House3/map.json b/data/maps/FortreeCity_House3/map.json index 8b7e971c7..ce70f4605 100644 --- a/data/maps/FortreeCity_House3/map.json +++ b/data/maps/FortreeCity_House3/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House3_EventScript_217AE8", + "script": "FortreeCity_House3_EventScript_Maniac", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House3_EventScript_217AF1", + "script": "FortreeCity_House3_EventScript_SchoolKidM", "flag": "0" } ], diff --git a/data/maps/FortreeCity_House3/scripts.inc b/data/maps/FortreeCity_House3/scripts.inc index fe1f6cfee..396bd4b22 100644 --- a/data/maps/FortreeCity_House3/scripts.inc +++ b/data/maps/FortreeCity_House3/scripts.inc @@ -1,15 +1,15 @@ FortreeCity_House3_MapScripts:: @ 8217AE7 .byte 0 -FortreeCity_House3_EventScript_217AE8:: @ 8217AE8 - msgbox FortreeCity_House3_Text_217AFA, MSGBOX_NPC +FortreeCity_House3_EventScript_Maniac:: @ 8217AE8 + msgbox FortreeCity_House3_Text_MetStevenHadAmazingPokemon, MSGBOX_NPC end -FortreeCity_House3_EventScript_217AF1:: @ 8217AF1 - msgbox FortreeCity_House3_Text_217C22, MSGBOX_NPC +FortreeCity_House3_EventScript_SchoolKidM:: @ 8217AF1 + msgbox FortreeCity_House3_Text_OhYouHavePokedex, MSGBOX_NPC end -FortreeCity_House3_Text_217AFA: @ 8217AFA +FortreeCity_House3_Text_MetStevenHadAmazingPokemon: @ 8217AFA .string "While speaking about POKéDEXES,\n" .string "I remembered something.\p" .string "I met this TRAINER, STEVEN, when\n" @@ -21,7 +21,7 @@ FortreeCity_House3_Text_217AFA: @ 8217AFA .string "He might even be stronger than the\n" .string "GYM LEADER in this town…$" -FortreeCity_House3_Text_217C22: @ 8217C22 +FortreeCity_House3_Text_OhYouHavePokedex: @ 8217C22 .string "What's that thing you have there?\p" .string "… … … … … …\p" .string "Oh, it's called a POKéDEX?\n" diff --git a/data/maps/FortreeCity_House4/map.json b/data/maps/FortreeCity_House4/map.json index a9db995ed..01d1a99e8 100644 --- a/data/maps/FortreeCity_House4/map.json +++ b/data/maps/FortreeCity_House4/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House4_EventScript_217C81", + "script": "FortreeCity_House4_EventScript_Woman", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House4_EventScript_217C8A", + "script": "FortreeCity_House4_EventScript_Boy", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House4_EventScript_217D20", + "script": "FortreeCity_House4_EventScript_Wingull", "flag": "FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL" } ], diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc index 5dc9d769a..b050ba3f9 100644 --- a/data/maps/FortreeCity_House4/scripts.inc +++ b/data/maps/FortreeCity_House4/scripts.inc @@ -1,51 +1,51 @@ FortreeCity_House4_MapScripts:: @ 8217C80 .byte 0 -FortreeCity_House4_EventScript_217C81:: @ 8217C81 - msgbox FortreeCity_House4_Text_217D33, MSGBOX_NPC +FortreeCity_House4_EventScript_Woman:: @ 8217C81 + msgbox FortreeCity_House4_Text_BringsWorldCloserTogether, MSGBOX_NPC end -FortreeCity_House4_EventScript_217C8A:: @ 8217C8A +FortreeCity_House4_EventScript_Boy:: @ 8217C8A lockall - goto_if_set FLAG_RECEIVED_MENTAL_HERB, FortreeCity_House4_EventScript_217D06 - goto_if_set FLAG_WINGULL_DELIVERED_MAIL, FortreeCity_House4_EventScript_217CD8 - goto_if_set FLAG_WINGULL_SENT_ON_ERRAND, FortreeCity_House4_EventScript_217CC4 - msgbox FortreeCity_House4_Text_217DB9, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_MENTAL_HERB, FortreeCity_House4_EventScript_ReceivedMentalHerb + goto_if_set FLAG_WINGULL_DELIVERED_MAIL, FortreeCity_House4_EventScript_WingullReturned + goto_if_set FLAG_WINGULL_SENT_ON_ERRAND, FortreeCity_House4_EventScript_WingullOnErrand + msgbox FortreeCity_House4_Text_GoBirdPokemon, MSGBOX_DEFAULT closemessage setflag FLAG_WINGULL_SENT_ON_ERRAND clearflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL - applymovement 3, FortreeCity_House4_Movement_217D1A + applymovement 3, FortreeCity_House4_Movement_WingullExit waitmovement 0 removeobject 3 releaseall end -FortreeCity_House4_EventScript_217CC4:: @ 8217CC4 +FortreeCity_House4_EventScript_WingullOnErrand:: @ 8217CC4 applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 - msgbox FortreeCity_House4_Text_217DD2, MSGBOX_DEFAULT + msgbox FortreeCity_House4_Text_AskedWingullToRunErrand, MSGBOX_DEFAULT releaseall end -FortreeCity_House4_EventScript_217CD8:: @ 8217CD8 +FortreeCity_House4_EventScript_WingullReturned:: @ 8217CD8 applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 - msgbox FortreeCity_House4_Text_217E05, MSGBOX_DEFAULT + msgbox FortreeCity_House4_Text_WelcomeWingullTakeMentalHerb, MSGBOX_DEFAULT giveitem_std ITEM_MENTAL_HERB - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_MENTAL_HERB releaseall end -FortreeCity_House4_EventScript_217D06:: @ 8217D06 +FortreeCity_House4_EventScript_ReceivedMentalHerb:: @ 8217D06 applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 - msgbox FortreeCity_House4_Text_217EA8, MSGBOX_DEFAULT + msgbox FortreeCity_House4_Text_FriendsFarAwayThanksToWingull, MSGBOX_DEFAULT releaseall end -FortreeCity_House4_Movement_217D1A: @ 8217D1A +FortreeCity_House4_Movement_WingullExit: @ 8217D1A walk_fast_down walk_fast_down walk_fast_right @@ -53,31 +53,31 @@ FortreeCity_House4_Movement_217D1A: @ 8217D1A delay_8 step_end -FortreeCity_House4_EventScript_217D20:: @ 8217D20 +FortreeCity_House4_EventScript_Wingull:: @ 8217D20 lock faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox FortreeCity_House4_Text_217EE0, MSGBOX_DEFAULT + msgbox FortreeCity_House4_Text_Wingull, MSGBOX_DEFAULT waitmoncry release end -FortreeCity_House4_Text_217D33: @ 8217D33 +FortreeCity_House4_Text_BringsWorldCloserTogether: @ 8217D33 .string "By being together with POKéMON,\n" .string "people make more and more friends.\p" .string "And that brings the world closer\n" .string "together. I think it's wonderful!$" -FortreeCity_House4_Text_217DB9: @ 8217DB9 +FortreeCity_House4_Text_GoBirdPokemon: @ 8217DB9 .string "There!\n" .string "Go, BIRD POKéMON!$" -FortreeCity_House4_Text_217DD2: @ 8217DD2 +FortreeCity_House4_Text_AskedWingullToRunErrand: @ 8217DD2 .string "Heheh, I asked my WINGULL to run\n" .string "an errand for me.$" -FortreeCity_House4_Text_217E05: @ 8217E05 +FortreeCity_House4_Text_WelcomeWingullTakeMentalHerb: @ 8217E05 .string "Good!\n" .string "Welcome back, WINGULL!\p" .string "Huh? What is this?\n" @@ -87,10 +87,10 @@ FortreeCity_House4_Text_217E05: @ 8217E05 .string "But I'm not a TRAINER, so you can\n" .string "have it.$" -FortreeCity_House4_Text_217EA8: @ 8217EA8 +FortreeCity_House4_Text_FriendsFarAwayThanksToWingull: @ 8217EA8 .string "Thanks to my WINGULL, I have friends\n" .string "who live far away.$" -FortreeCity_House4_Text_217EE0: @ 8217EE0 +FortreeCity_House4_Text_Wingull: @ 8217EE0 .string "WINGULL: Pihyoh!$" diff --git a/data/maps/FortreeCity_House5/map.json b/data/maps/FortreeCity_House5/map.json index a60c02ec3..a53b4e35c 100644 --- a/data/maps/FortreeCity_House5/map.json +++ b/data/maps/FortreeCity_House5/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House5_EventScript_217EF2", + "script": "FortreeCity_House5_EventScript_PokefanF", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House5_EventScript_217F04", + "script": "FortreeCity_House5_EventScript_Zigzagoon", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House5_EventScript_217EFB", + "script": "FortreeCity_House5_EventScript_Man", "flag": "0" } ], diff --git a/data/maps/FortreeCity_House5/scripts.inc b/data/maps/FortreeCity_House5/scripts.inc index a40fe0e83..4d27c2f06 100644 --- a/data/maps/FortreeCity_House5/scripts.inc +++ b/data/maps/FortreeCity_House5/scripts.inc @@ -1,35 +1,35 @@ FortreeCity_House5_MapScripts:: @ 8217EF1 .byte 0 -FortreeCity_House5_EventScript_217EF2:: @ 8217EF2 - msgbox FortreeCity_House5_Text_217F17, MSGBOX_NPC +FortreeCity_House5_EventScript_PokefanF:: @ 8217EF2 + msgbox FortreeCity_House5_Text_TreeHousesAreGreat, MSGBOX_NPC end -FortreeCity_House5_EventScript_217EFB:: @ 8217EFB - msgbox FortreeCity_House5_Text_217F80, MSGBOX_NPC +FortreeCity_House5_EventScript_Man:: @ 8217EFB + msgbox FortreeCity_House5_Text_AdaptedToNature, MSGBOX_NPC end -FortreeCity_House5_EventScript_217F04:: @ 8217F04 +FortreeCity_House5_EventScript_Zigzagoon:: @ 8217F04 lock faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox FortreeCity_House5_Text_217FFB, MSGBOX_DEFAULT + msgbox FortreeCity_House5_Text_Zigzagoon, MSGBOX_DEFAULT waitmoncry release end -FortreeCity_House5_Text_217F17: @ 8217F17 +FortreeCity_House5_Text_TreeHousesAreGreat: @ 8217F17 .string "The tree houses of FORTREE are great!\p" .string "I think it's the number one town for\n" .string "living together with POKéMON.$" -FortreeCity_House5_Text_217F80: @ 8217F80 +FortreeCity_House5_Text_AdaptedToNature: @ 8217F80 .string "POKéMON and people have adapted to\n" .string "nature for survival.\p" .string "There's no need to make nature\n" .string "conform to the way we want to live.$" -FortreeCity_House5_Text_217FFB: @ 8217FFB +FortreeCity_House5_Text_Zigzagoon: @ 8217FFB .string "ZIGZAGOON: Bufuu!$" diff --git a/data/maps/GraniteCave_1F/map.json b/data/maps/GraniteCave_1F/map.json index 2413a023d..1822dd0c9 100644 --- a/data/maps/GraniteCave_1F/map.json +++ b/data/maps/GraniteCave_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "GraniteCave_1F_EventScript_22DA5E", + "script": "GraniteCave_1F_EventScript_Hiker", "flag": "0" }, { diff --git a/data/maps/GraniteCave_1F/scripts.inc b/data/maps/GraniteCave_1F/scripts.inc index b9e68d43c..9aa0332f7 100644 --- a/data/maps/GraniteCave_1F/scripts.inc +++ b/data/maps/GraniteCave_1F/scripts.inc @@ -1,23 +1,23 @@ GraniteCave_1F_MapScripts:: @ 822DA5D .byte 0 -GraniteCave_1F_EventScript_22DA5E:: @ 822DA5E +GraniteCave_1F_EventScript_Hiker:: @ 822DA5E lock faceplayer - goto_if_set FLAG_RECEIVED_HM05, GraniteCave_1F_EventScript_22DA8A - msgbox GraniteCave_1F_Text_22DA94, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_HM05, GraniteCave_1F_EventScript_ReceivedFlash + msgbox GraniteCave_1F_Text_GetsDarkAheadHereYouGo, MSGBOX_DEFAULT giveitem_std ITEM_HM05 setflag FLAG_RECEIVED_HM05 - msgbox GraniteCave_1F_Text_22DBB7, MSGBOX_DEFAULT + msgbox GraniteCave_1F_Text_ExplainFlash, MSGBOX_DEFAULT release end -GraniteCave_1F_EventScript_22DA8A:: @ 822DA8A - msgbox GraniteCave_1F_Text_22DBB7, MSGBOX_DEFAULT +GraniteCave_1F_EventScript_ReceivedFlash:: @ 822DA8A + msgbox GraniteCave_1F_Text_ExplainFlash, MSGBOX_DEFAULT release end -GraniteCave_1F_Text_22DA94: @ 822DA94 +GraniteCave_1F_Text_GetsDarkAheadHereYouGo: @ 822DA94 .string "Hey, you.\n" .string "It gets awfully dark ahead.\l" .string "It'll be tough trying to explore.\p" @@ -29,7 +29,7 @@ GraniteCave_1F_Text_22DA94: @ 822DA94 .string "that we meet is our motto.\p" .string "Here you go, I'll pass this on to you.$" -GraniteCave_1F_Text_22DBB7: @ 822DBB7 +GraniteCave_1F_Text_ExplainFlash: @ 822DBB7 .string "Teach that hidden move FLASH to\n" .string "a POKéMON and use it.\p" .string "It lights up even the inky darkness\n" diff --git a/data/maps/GraniteCave_StevensRoom/map.json b/data/maps/GraniteCave_StevensRoom/map.json index ae5b61a6b..87264cd54 100644 --- a/data/maps/GraniteCave_StevensRoom/map.json +++ b/data/maps/GraniteCave_StevensRoom/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "GraniteCave_StevensRoom_EventScript_22DC7B", + "script": "GraniteCave_StevensRoom_EventScript_Steven", "flag": "FLAG_HIDE_GRANITE_CAVE_STEVEN" } ], diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc index 333f97a66..0456f5eaf 100644 --- a/data/maps/GraniteCave_StevensRoom/scripts.inc +++ b/data/maps/GraniteCave_StevensRoom/scripts.inc @@ -1,63 +1,63 @@ GraniteCave_StevensRoom_MapScripts:: @ 822DC7A .byte 0 -GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B +GraniteCave_StevensRoom_EventScript_Steven:: @ 822DC7B lock faceplayer - msgbox GraniteCave_StevensRoom_Text_22DD5A, MSGBOX_DEFAULT + msgbox GraniteCave_StevensRoom_Text_ImStevenLetterForMe, MSGBOX_DEFAULT setvar VAR_0x8004, ITEM_LETTER call Common_EventScript_PlayerHandedOverTheItem setflag FLAG_DELIVERED_STEVEN_LETTER - msgbox GraniteCave_StevensRoom_Text_22DDBD, MSGBOX_DEFAULT + msgbox GraniteCave_StevensRoom_Text_ThankYouTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_TM47 - compare VAR_RESULT, 0 - call_if_eq GraniteCave_StevensRoom_EventScript_22DD3C - msgbox GraniteCave_StevensRoom_Text_22DE6B, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + call_if_eq GraniteCave_StevensRoom_EventScript_BagFull + msgbox GraniteCave_StevensRoom_Text_CouldBecomeChampionLetsRegister, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox GraniteCave_StevensRoom_Text_22DF6A, MSGBOX_DEFAULT + msgbox GraniteCave_StevensRoom_Text_RegisteredSteven, MSGBOX_DEFAULT waitfanfare closemessage delay 30 setflag FLAG_REGISTERED_STEVEN_POKENAV - msgbox GraniteCave_StevensRoom_Text_22DF8C, MSGBOX_DEFAULT + msgbox GraniteCave_StevensRoom_Text_IveGotToHurryAlong, MSGBOX_DEFAULT closemessage compare VAR_FACING, DIR_NORTH - call_if_eq GraniteCave_StevensRoom_EventScript_22DD0D + call_if_eq GraniteCave_StevensRoom_EventScript_StevenExitNorth compare VAR_FACING, DIR_SOUTH - call_if_eq GraniteCave_StevensRoom_EventScript_22DD2A + call_if_eq GraniteCave_StevensRoom_EventScript_StevenExitSouth compare VAR_FACING, DIR_WEST - call_if_eq GraniteCave_StevensRoom_EventScript_22DD18 + call_if_eq GraniteCave_StevensRoom_EventScript_StevenExitWestEast compare VAR_FACING, DIR_EAST - call_if_eq GraniteCave_StevensRoom_EventScript_22DD18 + call_if_eq GraniteCave_StevensRoom_EventScript_StevenExitWestEast playse SE_KAIDAN removeobject 1 release end -GraniteCave_StevensRoom_EventScript_22DD0D:: @ 822DD0D - applymovement 1, GraniteCave_StevensRoom_Movement_22DD45 +GraniteCave_StevensRoom_EventScript_StevenExitNorth:: @ 822DD0D + applymovement 1, GraniteCave_StevensRoom_Movement_StevenExit waitmovement 0 return -GraniteCave_StevensRoom_EventScript_22DD18:: @ 822DD18 - applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_StevensRoom_Movement_22DD4C - applymovement 1, GraniteCave_StevensRoom_Movement_22DD45 +GraniteCave_StevensRoom_EventScript_StevenExitWestEast:: @ 822DD18 + applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_StevensRoom_Movement_PlayerTurnTowardExit + applymovement 1, GraniteCave_StevensRoom_Movement_StevenExit waitmovement 0 return -GraniteCave_StevensRoom_EventScript_22DD2A:: @ 822DD2A - applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_StevensRoom_Movement_22DD4C - applymovement 1, GraniteCave_StevensRoom_Movement_22DD51 +GraniteCave_StevensRoom_EventScript_StevenExitSouth:: @ 822DD2A + applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_StevensRoom_Movement_PlayerTurnTowardExit + applymovement 1, GraniteCave_StevensRoom_Movement_StevenExitSouth waitmovement 0 return -GraniteCave_StevensRoom_EventScript_22DD3C:: @ 822DD3C - msgbox GraniteCave_StevensRoom_Text_22DFAA, MSGBOX_DEFAULT +GraniteCave_StevensRoom_EventScript_BagFull:: @ 822DD3C + msgbox GraniteCave_StevensRoom_Text_OhBagIsFull, MSGBOX_DEFAULT return -GraniteCave_StevensRoom_Movement_22DD45: @ 822DD45 +GraniteCave_StevensRoom_Movement_StevenExit: @ 822DD45 walk_up walk_up walk_up @@ -66,14 +66,14 @@ GraniteCave_StevensRoom_Movement_22DD45: @ 822DD45 delay_8 step_end -GraniteCave_StevensRoom_Movement_22DD4C: @ 822DD4C +GraniteCave_StevensRoom_Movement_PlayerTurnTowardExit: @ 822DD4C delay_16 delay_16 delay_16 walk_in_place_fastest_up step_end -GraniteCave_StevensRoom_Movement_22DD51: @ 822DD51 +GraniteCave_StevensRoom_Movement_StevenExitSouth: @ 822DD51 walk_left walk_up walk_up @@ -84,14 +84,14 @@ GraniteCave_StevensRoom_Movement_22DD51: @ 822DD51 delay_8 step_end -GraniteCave_StevensRoom_Text_22DD5A: @ 822DD5A +GraniteCave_StevensRoom_Text_ImStevenLetterForMe: @ 822DD5A .string "My name is STEVEN.\p" .string "I'm interested in rare stones,\n" .string "so I travel here and there.\p" .string "Oh?\n" .string "A LETTER for me?$" -GraniteCave_StevensRoom_Text_22DDBD: @ 822DDBD +GraniteCave_StevensRoom_Text_ThankYouTakeThis: @ 822DDBD .string "STEVEN: Okay, thank you.\p" .string "You went through all this trouble to\n" .string "deliver that. I need to thank you.\p" @@ -100,7 +100,7 @@ GraniteCave_StevensRoom_Text_22DDBD: @ 822DDBD .string "It contains my favorite move,\n" .string "STEEL WING.$" -GraniteCave_StevensRoom_Text_22DE6B: @ 822DE6B +GraniteCave_StevensRoom_Text_CouldBecomeChampionLetsRegister: @ 822DE6B .string "STEVEN: Your POKéMON appear quite\n" .string "capable.\p" .string "If you keep training, you could even\n" @@ -111,14 +111,14 @@ GraniteCave_StevensRoom_Text_22DE6B: @ 822DE6B .string "our POKéNAVS.\p" .string "… … … … … …$" -GraniteCave_StevensRoom_Text_22DF6A: @ 822DF6A +GraniteCave_StevensRoom_Text_RegisteredSteven: @ 822DF6A .string "Registered STEVEN\n" .string "in the POKéNAV.$" -GraniteCave_StevensRoom_Text_22DF8C: @ 822DF8C +GraniteCave_StevensRoom_Text_IveGotToHurryAlong: @ 822DF8C .string "Now, I've got to hurry along.$" -GraniteCave_StevensRoom_Text_22DFAA: @ 822DFAA +GraniteCave_StevensRoom_Text_OhBagIsFull: @ 822DFAA .string "Oh, your BAG is full…\n" .string "That's too bad, then.$" diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json index 65a6a25d3..1212f3354 100644 --- a/data/maps/LavaridgeTown/map.json +++ b/data/maps/LavaridgeTown/map.json @@ -30,7 +30,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_EventScript_1EA73B", + "script": "LavaridgeTown_EventScript_ExpertF", "flag": "0" }, { @@ -43,7 +43,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_EventScript_1EA70E", + "script": "LavaridgeTown_EventScript_ExpertM", "flag": "0" }, { @@ -56,7 +56,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_EventScript_1EA717", + "script": "LavaridgeTown_EventScript_OldMan", "flag": "0" }, { @@ -69,7 +69,7 @@ "movement_range_y": 2, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_EventScript_1EA720", + "script": "LavaridgeTown_EventScript_Twin", "flag": "0" }, { @@ -82,7 +82,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_EventScript_1EA729", + "script": "LavaridgeTown_EventScript_HotSpringsOldWoman1", "flag": "0" }, { @@ -95,7 +95,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_EventScript_1EA732", + "script": "LavaridgeTown_EventScript_HotSpringsOldWoman2", "flag": "0" }, { @@ -109,7 +109,7 @@ "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", - "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2" + "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_ON_BIKE" }, { "graphics_id": "EVENT_OBJ_GFX_VAR_0", @@ -122,7 +122,7 @@ "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", - "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1" + "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL" }, { "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", @@ -134,7 +134,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_EventScript_1EA744", + "script": "LavaridgeTown_EventScript_EggWoman", "flag": "0" } ], @@ -190,7 +190,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "LavaridgeTown_EventScript_1EA6FA" + "script": "LavaridgeTown_EventScript_HotSpringsTrigger" } ], "bg_events": [ @@ -200,7 +200,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LavaridgeTown_EventScript_1EA7B7" + "script": "LavaridgeTown_EventScript_HerbShopSign" }, { "type": "sign", @@ -208,7 +208,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LavaridgeTown_EventScript_1EA7AE" + "script": "LavaridgeTown_EventScript_GymSign" }, { "type": "sign", @@ -224,7 +224,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LavaridgeTown_EventScript_1EA7A5" + "script": "LavaridgeTown_EventScript_TownSign" }, { "type": "sign", diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index a964d42e5..dc45f94d4 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -1,98 +1,98 @@ LavaridgeTown_MapScripts:: @ 81EA4D3 map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_MapScript2_1EA547 + map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_OnFrame .byte 0 LavaridgeTown_OnTransition: @ 81EA4DE setflag FLAG_VISITED_LAVARIDGE_TOWN - call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, LavaridgeTown_EventScript_1EA514 - call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_1EA53F + call_if_set FLAG_WHITEOUT_TO_LAVARIDGE, LavaridgeTown_EventScript_ClearLavaridgeWhiteOut + call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_ShowMtChimneyTrainers call Common_EventScript_SetupRivalGfxId call Common_EventScript_SetupRivalOnBikeGfxId compare VAR_LAVARIDGE_TOWN_STATE, 1 - call_if_eq LavaridgeTown_EventScript_1EA518 + call_if_eq LavaridgeTown_EventScript_CheckSetRivalPos compare VAR_LAVARIDGE_TOWN_STATE, 1 - call_if_eq LavaridgeTown_EventScript_1EA543 + call_if_eq LavaridgeTown_EventScript_HideMapNamePopup end -LavaridgeTown_EventScript_1EA514:: @ 81EA514 - clearflag FLAG_FLANNERY_GIVES_BADGE_INFO +LavaridgeTown_EventScript_ClearLavaridgeWhiteOut:: @ 81EA514 + clearflag FLAG_WHITEOUT_TO_LAVARIDGE return -LavaridgeTown_EventScript_1EA518:: @ 81EA518 +LavaridgeTown_EventScript_CheckSetRivalPos:: @ 81EA518 getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 9 - goto_if_eq LavaridgeTown_EventScript_1EA529 + goto_if_eq LavaridgeTown_EventScript_SetRivalPos return -LavaridgeTown_EventScript_1EA529:: @ 81EA529 +LavaridgeTown_EventScript_SetRivalPos:: @ 81EA529 setobjectxyperm 8, 11, 9 setobjectxyperm 7, 9, 8 setobjectmovementtype 7, MOVEMENT_TYPE_FACE_UP - clearflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 + clearflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL return -LavaridgeTown_EventScript_1EA53F:: @ 81EA53F +LavaridgeTown_EventScript_ShowMtChimneyTrainers:: @ 81EA53F clearflag FLAG_HIDE_MT_CHIMNEY_TRAINERS return -LavaridgeTown_EventScript_1EA543:: @ 81EA543 +LavaridgeTown_EventScript_HideMapNamePopup:: @ 81EA543 setflag FLAG_HIDE_MAP_NAME_POPUP return -LavaridgeTown_MapScript2_1EA547: @ 81EA547 - map_script_2 VAR_LAVARIDGE_TOWN_STATE, 1, LavaridgeTown_EventScript_1EA551 +LavaridgeTown_OnFrame: @ 81EA547 + map_script_2 VAR_LAVARIDGE_TOWN_STATE, 1, LavaridgeTown_EventScript_RivalGiveGoGoggles .2byte 0 -LavaridgeTown_EventScript_1EA551:: @ 81EA551 +LavaridgeTown_EventScript_RivalGiveGoGoggles:: @ 81EA551 lockall getplayerxy VAR_0x8008, VAR_0x8009 compare VAR_0x8008, 9 - call_if_eq LavaridgeTown_EventScript_1EA63A + call_if_eq LavaridgeTown_EventScript_RivalNoticePlayer compare VAR_0x8008, 9 - call_if_ne LavaridgeTown_EventScript_1EA65C + call_if_ne LavaridgeTown_EventScript_RivalExitHerbShop delay 20 checkplayergender compare VAR_RESULT, MALE - call_if_eq LavaridgeTown_EventScript_1EA630 + call_if_eq LavaridgeTown_EventScript_PlayMayMusic compare VAR_RESULT, FEMALE - call_if_eq LavaridgeTown_EventScript_1EA635 + call_if_eq LavaridgeTown_EventScript_PlayBrendanMusic compare VAR_0x8008, 9 - call_if_eq LavaridgeTown_EventScript_1EA6A1 + call_if_eq LavaridgeTown_EventScript_RivalApproachPlayer1 compare VAR_0x8008, 9 - call_if_ne LavaridgeTown_EventScript_1EA6AC + call_if_ne LavaridgeTown_EventScript_RivalApproachPlayer2 checkplayergender compare VAR_RESULT, MALE - goto_if_eq LavaridgeTown_EventScript_1EA5B5 + goto_if_eq LavaridgeTown_EventScript_MayGiveGoGoggles compare VAR_RESULT, FEMALE - goto_if_eq LavaridgeTown_EventScript_1EA5DA + goto_if_eq LavaridgeTown_EventScript_BrendanGiveGoGoggles end -LavaridgeTown_EventScript_1EA5B5:: @ 81EA5B5 - msgbox LavaridgeTown_Text_1EA7C0, MSGBOX_DEFAULT +LavaridgeTown_EventScript_MayGiveGoGoggles:: @ 81EA5B5 + msgbox LavaridgeTown_Text_MayNiceBadgesTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_GO_GOGGLES setflag FLAG_RECEIVED_GO_GOGGLES - msgbox LavaridgeTown_Text_1EA897, MSGBOX_DEFAULT - goto LavaridgeTown_EventScript_1EA5FF + msgbox LavaridgeTown_Text_MayExplainGoGogglesChallengeDad, MSGBOX_DEFAULT + goto LavaridgeTown_EventScript_RivalExit end -LavaridgeTown_EventScript_1EA5DA:: @ 81EA5DA - msgbox LavaridgeTown_Text_1EA9A2, MSGBOX_DEFAULT +LavaridgeTown_EventScript_BrendanGiveGoGoggles:: @ 81EA5DA + msgbox LavaridgeTown_Text_BrendanNiceBadgesTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_GO_GOGGLES setflag FLAG_RECEIVED_GO_GOGGLES - msgbox LavaridgeTown_Text_1EAA2E, MSGBOX_DEFAULT - goto LavaridgeTown_EventScript_1EA5FF + msgbox LavaridgeTown_Text_BrendanExplainGoGogglesChallengeDad, MSGBOX_DEFAULT + goto LavaridgeTown_EventScript_RivalExit end -LavaridgeTown_EventScript_1EA5FF:: @ 81EA5FF +LavaridgeTown_EventScript_RivalExit:: @ 81EA5FF closemessage removeobject 8 addobject 7 delay 30 compare VAR_0x8008, 9 - call_if_eq LavaridgeTown_EventScript_1EA6B7 + call_if_eq LavaridgeTown_EventScript_RivalExit1 compare VAR_0x8008, 9 - call_if_ne LavaridgeTown_EventScript_1EA6C9 + call_if_ne LavaridgeTown_EventScript_RivalExit2 removeobject 7 setvar VAR_LAVARIDGE_TOWN_STATE, 2 clearflag FLAG_HIDE_MAP_NAME_POPUP @@ -101,15 +101,15 @@ LavaridgeTown_EventScript_1EA5FF:: @ 81EA5FF releaseall end -LavaridgeTown_EventScript_1EA630:: @ 81EA630 +LavaridgeTown_EventScript_PlayMayMusic:: @ 81EA630 playbgm MUS_GIRL_SUP, 1 return -LavaridgeTown_EventScript_1EA635:: @ 81EA635 +LavaridgeTown_EventScript_PlayBrendanMusic:: @ 81EA635 playbgm MUS_BOY_SUP, 1 return -LavaridgeTown_EventScript_1EA63A:: @ 81EA63A +LavaridgeTown_EventScript_RivalNoticePlayer:: @ 81EA63A applymovement 8, Common_Movement_WalkInPlaceFastestUp waitmovement 0 playse SE_PIN @@ -119,11 +119,11 @@ LavaridgeTown_EventScript_1EA63A:: @ 81EA63A waitmovement 0 return -LavaridgeTown_EventScript_1EA65C:: @ 81EA65C +LavaridgeTown_EventScript_RivalExitHerbShop:: @ 81EA65C opendoor 12, 15 waitdooranim addobject 8 - applymovement 8, LavaridgeTown_Movement_1EA6F8 + applymovement 8, LavaridgeTown_Movement_RivalExitHerbShop waitmovement 0 closedoor 12, 15 waitdooranim @@ -138,28 +138,28 @@ LavaridgeTown_EventScript_1EA65C:: @ 81EA65C waitmovement 0 return -LavaridgeTown_EventScript_1EA6A1:: @ 81EA6A1 - applymovement 8, LavaridgeTown_Movement_1EA6F4 +LavaridgeTown_EventScript_RivalApproachPlayer1:: @ 81EA6A1 + applymovement 8, LavaridgeTown_Movement_RivalApproachPlayer1 waitmovement 0 return -LavaridgeTown_EventScript_1EA6AC:: @ 81EA6AC - applymovement 8, LavaridgeTown_Movement_1EA6ED +LavaridgeTown_EventScript_RivalApproachPlayer2:: @ 81EA6AC + applymovement 8, LavaridgeTown_Movement_RivalApproachPlayer2 waitmovement 0 return -LavaridgeTown_EventScript_1EA6B7:: @ 81EA6B7 - applymovement EVENT_OBJ_ID_PLAYER, LavaridgeTown_Movement_1EA6DF - applymovement 7, LavaridgeTown_Movement_1EA6E3 +LavaridgeTown_EventScript_RivalExit1:: @ 81EA6B7 + applymovement EVENT_OBJ_ID_PLAYER, LavaridgeTown_Movement_PlayerWatchRivalExit + applymovement 7, LavaridgeTown_Movement_RivalExit1 waitmovement 0 return -LavaridgeTown_EventScript_1EA6C9:: @ 81EA6C9 - applymovement 7, LavaridgeTown_Movement_1EA6D4 +LavaridgeTown_EventScript_RivalExit2:: @ 81EA6C9 + applymovement 7, LavaridgeTown_Movement_RivalExit2 waitmovement 0 return -LavaridgeTown_Movement_1EA6D4: @ 81EA6D4 +LavaridgeTown_Movement_RivalExit2: @ 81EA6D4 walk_fast_right walk_fast_right walk_fast_right @@ -172,13 +172,13 @@ LavaridgeTown_Movement_1EA6D4: @ 81EA6D4 walk_fast_up step_end -LavaridgeTown_Movement_1EA6DF: @ 81EA6DF +LavaridgeTown_Movement_PlayerWatchRivalExit: @ 81EA6DF delay_16 delay_8 walk_in_place_fastest_right step_end -LavaridgeTown_Movement_1EA6E3: @ 81EA6E3 +LavaridgeTown_Movement_RivalExit1: @ 81EA6E3 walk_fast_down walk_fast_right walk_fast_right @@ -190,7 +190,7 @@ LavaridgeTown_Movement_1EA6E3: @ 81EA6E3 walk_fast_right step_end -LavaridgeTown_Movement_1EA6ED: @ 81EA6ED +LavaridgeTown_Movement_RivalApproachPlayer2: @ 81EA6ED walk_left walk_left walk_left @@ -199,97 +199,97 @@ LavaridgeTown_Movement_1EA6ED: @ 81EA6ED walk_left step_end -LavaridgeTown_Movement_1EA6F4: @ 81EA6F4 +LavaridgeTown_Movement_RivalApproachPlayer1: @ 81EA6F4 walk_left walk_left walk_up step_end -LavaridgeTown_Movement_1EA6F8: @ 81EA6F8 +LavaridgeTown_Movement_RivalExitHerbShop: @ 81EA6F8 walk_down step_end -LavaridgeTown_EventScript_1EA6FA:: @ 81EA6FA +LavaridgeTown_EventScript_HotSpringsTrigger:: @ 81EA6FA specialvar VAR_RESULT, GetPlayerFacingDirection - compare VAR_RESULT, 1 - goto_if_eq LavaridgeTown_EventScript_1EA70B + compare VAR_RESULT, DIR_SOUTH + goto_if_eq LavaridgeTown_EventScript_EnteredHotSprings end -LavaridgeTown_EventScript_1EA70B:: @ 81EA70B +LavaridgeTown_EventScript_EnteredHotSprings:: @ 81EA70B incrementgamestat GAME_STAT_ENTERED_HOT_SPRINGS end -LavaridgeTown_EventScript_1EA70E:: @ 81EA70E - msgbox LavaridgeTown_Text_1EAE03, MSGBOX_NPC +LavaridgeTown_EventScript_ExpertM:: @ 81EA70E + msgbox LavaridgeTown_Text_HotSpringsNeverRunDry, MSGBOX_NPC end -LavaridgeTown_EventScript_1EA717:: @ 81EA717 - msgbox LavaridgeTown_Text_1EAEE1, MSGBOX_SIGN +LavaridgeTown_EventScript_OldMan:: @ 81EA717 + msgbox LavaridgeTown_Text_PokemonNippedBackside, MSGBOX_SIGN end -LavaridgeTown_EventScript_1EA720:: @ 81EA720 - msgbox LavaridgeTown_Text_1EAF9B, MSGBOX_NPC +LavaridgeTown_EventScript_Twin:: @ 81EA720 + msgbox LavaridgeTown_Text_BatheInHotSpringsEveryDay, MSGBOX_NPC end -LavaridgeTown_EventScript_1EA729:: @ 81EA729 - msgbox LavaridgeTown_Text_1EB003, MSGBOX_NPC +LavaridgeTown_EventScript_HotSpringsOldWoman1:: @ 81EA729 + msgbox LavaridgeTown_Text_IfPokemonInHotSprings, MSGBOX_NPC end -LavaridgeTown_EventScript_1EA732:: @ 81EA732 - msgbox LavaridgeTown_Text_1EB092, MSGBOX_NPC +LavaridgeTown_EventScript_HotSpringsOldWoman2:: @ 81EA732 + msgbox LavaridgeTown_Text_HotSpringsClaims, MSGBOX_NPC end -LavaridgeTown_EventScript_1EA73B:: @ 81EA73B - msgbox LavaridgeTown_Text_1EAF4E, MSGBOX_NPC +LavaridgeTown_EventScript_ExpertF:: @ 81EA73B + msgbox LavaridgeTown_Text_OhYouLikeHotSprings, MSGBOX_NPC end -LavaridgeTown_EventScript_1EA744:: @ 81EA744 +LavaridgeTown_EventScript_EggWoman:: @ 81EA744 lock faceplayer - goto_if_set FLAG_RECEIVED_LAVARIDGE_EGG, LavaridgeTown_EventScript_1EA787 - msgbox LavaridgeTown_Text_1EAB80, MSGBOX_YESNO + goto_if_set FLAG_RECEIVED_LAVARIDGE_EGG, LavaridgeTown_EventScript_ReceivedEgg + msgbox LavaridgeTown_Text_HaveEggWillYouTakeIt, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq LavaridgeTown_EventScript_1EA79B + goto_if_eq LavaridgeTown_EventScript_DeclineEgg getpartysize compare VAR_RESULT, PARTY_SIZE - goto_if_eq LavaridgeTown_EventScript_1EA791 - msgbox LavaridgeTown_Text_1EACC0, MSGBOX_DEFAULT + goto_if_eq LavaridgeTown_EventScript_NoRoomForEgg + msgbox LavaridgeTown_Text_HopeYoullWalkPlentyWithEgg, MSGBOX_DEFAULT setflag FLAG_RECEIVED_LAVARIDGE_EGG playfanfare MUS_FANFA4 - message LavaridgeTown_Text_1EACF4 + message LavaridgeTown_Text_ReceivedTheEgg waitfanfare giveegg SPECIES_WYNAUT release end -LavaridgeTown_EventScript_1EA787:: @ 81EA787 - msgbox LavaridgeTown_Text_1EAD9E, MSGBOX_DEFAULT +LavaridgeTown_EventScript_ReceivedEgg:: @ 81EA787 + msgbox LavaridgeTown_Text_EverySoOftenEggFoundAtDayCare, MSGBOX_DEFAULT release end -LavaridgeTown_EventScript_1EA791:: @ 81EA791 - msgbox LavaridgeTown_Text_1EAD09, MSGBOX_DEFAULT +LavaridgeTown_EventScript_NoRoomForEgg:: @ 81EA791 + msgbox LavaridgeTown_Text_NoRoomForThisEgg, MSGBOX_DEFAULT release end -LavaridgeTown_EventScript_1EA79B:: @ 81EA79B - msgbox LavaridgeTown_Text_1EAD44, MSGBOX_DEFAULT +LavaridgeTown_EventScript_DeclineEgg:: @ 81EA79B + msgbox LavaridgeTown_Text_AsYouWishThen, MSGBOX_DEFAULT release end -LavaridgeTown_EventScript_1EA7A5:: @ 81EA7A5 - msgbox LavaridgeTown_Text_1EB12B, MSGBOX_SIGN +LavaridgeTown_EventScript_TownSign:: @ 81EA7A5 + msgbox LavaridgeTown_Text_TownSign, MSGBOX_SIGN end -LavaridgeTown_EventScript_1EA7AE:: @ 81EA7AE - msgbox LavaridgeTown_Text_1EB178, MSGBOX_SIGN +LavaridgeTown_EventScript_GymSign:: @ 81EA7AE + msgbox LavaridgeTown_Text_GymSign, MSGBOX_SIGN end -LavaridgeTown_EventScript_1EA7B7:: @ 81EA7B7 - msgbox LavaridgeTown_Text_1EB1CB, MSGBOX_SIGN +LavaridgeTown_EventScript_HerbShopSign:: @ 81EA7B7 + msgbox LavaridgeTown_Text_HerbShopSign, MSGBOX_SIGN end -LavaridgeTown_Text_1EA7C0: @ 81EA7C0 +LavaridgeTown_Text_MayNiceBadgesTakeThis: @ 81EA7C0 .string "MAY: {PLAYER}{KUN}! Long time no see!\p" .string "Oh? While I visited the hot springs,\n" .string "you got the LAVARIDGE GYM BADGE.\p" @@ -299,7 +299,7 @@ LavaridgeTown_Text_1EA7C0: @ 81EA7C0 .string "I guess it would be okay for you to\n" .string "have this.$" -LavaridgeTown_Text_1EA897: @ 81EA897 +LavaridgeTown_Text_MayExplainGoGogglesChallengeDad: @ 81EA897 .string "MAY: With those GO-GOGGLES, you'll\n" .string "have no trouble getting through the\l" .string "desert near ROUTE 111.\p" @@ -311,7 +311,7 @@ LavaridgeTown_Text_1EA897: @ 81EA897 .string "your dad in PETALBURG GYM.\p" .string "See you again!$" -LavaridgeTown_Text_1EA9A2: @ 81EA9A2 +LavaridgeTown_Text_BrendanNiceBadgesTakeThis: @ 81EA9A2 .string "BRENDAN: {PLAYER}, hey, it's been a while.\n" .string "How's it going?\p" .string "Hmm…\n" @@ -319,7 +319,7 @@ LavaridgeTown_Text_1EA9A2: @ 81EA9A2 .string "All right, then.\n" .string "You may as well have this.$" -LavaridgeTown_Text_1EAA2E: @ 81EAA2E +LavaridgeTown_Text_BrendanExplainGoGogglesChallengeDad: @ 81EAA2E .string "BRENDAN: Keep those with you if you're\n" .string "planning on going into that desert near\l" .string "ROUTE 111.\p" @@ -333,7 +333,7 @@ LavaridgeTown_Text_1EAA2E: @ 81EAA2E .string "he really is tough.\p" .string "See you around!$" -LavaridgeTown_Text_1EAB80: @ 81EAB80 +LavaridgeTown_Text_HaveEggWillYouTakeIt: @ 81EAB80 .string "I have here an EGG.\p" .string "I'd hoped to hatch it by covering it in\n" .string "hot sand by the hot springs.\l" @@ -346,28 +346,28 @@ LavaridgeTown_Text_1EAB80: @ 81EAB80 .string "So, what say you?\n" .string "Will you take this EGG to hatch?$" -LavaridgeTown_Text_1EACC0: @ 81EACC0 +LavaridgeTown_Text_HopeYoullWalkPlentyWithEgg: @ 81EACC0 .string "Good! I hope you'll walk plenty with\n" .string "this here EGG!$" -LavaridgeTown_Text_1EACF4: @ 81EACF4 +LavaridgeTown_Text_ReceivedTheEgg: @ 81EACF4 .string "{PLAYER} received the EGG.$" -LavaridgeTown_Text_1EAD09: @ 81EAD09 +LavaridgeTown_Text_NoRoomForThisEgg: @ 81EAD09 .string "Oh? You've too many POKéMON.\n" .string "There's no room for this EGG…$" -LavaridgeTown_Text_1EAD44: @ 81EAD44 +LavaridgeTown_Text_AsYouWishThen: @ 81EAD44 .string "As you wish, then…\p" .string "If you have a change of heart about\n" .string "hatching this EGG, I will be here.$" -LavaridgeTown_Text_1EAD9E: @ 81EAD9E +LavaridgeTown_Text_EverySoOftenEggFoundAtDayCare: @ 81EAD9E .string "Every so often, an EGG will be found at\n" .string "the POKéMON DAY CARE.\p" .string "Or at least that's how the rumor goes.$" -LavaridgeTown_Text_1EAE03: @ 81EAE03 +LavaridgeTown_Text_HotSpringsNeverRunDry: @ 81EAE03 .string "We draw as much hot water as we need,\n" .string "and yet the hot springs never run dry.\p" .string "Isn't it magical?\p" @@ -376,47 +376,47 @@ LavaridgeTown_Text_1EAE03: @ 81EAE03 .string "ground are heated by magma to well up\l" .string "as hot springs.$" -LavaridgeTown_Text_1EAEE1: @ 81EAEE1 +LavaridgeTown_Text_PokemonNippedBackside: @ 81EAEE1 .string "Being buried in this hot sand is…\n" .string "Sigh…\p" .string "So warm and heavenly…\p" .string "Eh? Gyaah! Ouch!\p" .string "A POKéMON nipped my backside!$" -LavaridgeTown_Text_1EAF4E: @ 81EAF4E +LavaridgeTown_Text_OhYouLikeHotSprings: @ 81EAF4E .string "Oh, you like hot springs, do you?\p" .string "That's surprising for one as young\n" .string "as you.$" -LavaridgeTown_Text_1EAF9B: @ 81EAF9B +LavaridgeTown_Text_BatheInHotSpringsEveryDay: @ 81EAF9B .string "I bathe in the hot springs every day.\p" .string "I want to become a beautiful and strong\n" .string "GYM LEADER like FLANNERY.$" -LavaridgeTown_Text_1EB003: @ 81EB003 +LavaridgeTown_Text_IfPokemonInHotSprings: @ 81EB003 .string "If people put POKéMON in hot springs,\n" .string "it might be seriously strange.\p" .string "Why, it might be an electric bath, or\n" .string "a bubble bath, or even a lava bath…$" -LavaridgeTown_Text_1EB092: @ 81EB092 +LavaridgeTown_Text_HotSpringsClaims: @ 81EB092 .string "They're claiming that these hot springs\n" .string "are good for calming nervous tension,\l" .string "relieving aching muscles, solving\l" .string "romantic problems, and attracting\l" .string "money…$" -LavaridgeTown_Text_1EB12B: @ 81EB12B +LavaridgeTown_Text_TownSign: @ 81EB12B .string "LAVARIDGE TOWN\p" .string "“POKéMON CENTER HOT SPRINGS\n" .string "An excellent place for relaxing!”$" -LavaridgeTown_Text_1EB178: @ 81EB178 +LavaridgeTown_Text_GymSign: @ 81EB178 .string "LAVARIDGE TOWN POKéMON GYM\n" .string "LEADER: FLANNERY\l" .string "“One with a fiery passion that burns!”$" -LavaridgeTown_Text_1EB1CB: @ 81EB1CB +LavaridgeTown_Text_HerbShopSign: @ 81EB1CB .string "POKéMON HERB SHOP\n" .string "“Bitter taste--better cure!”$" diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index a5dcabf30..b94970e62 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -66,7 +66,7 @@ LavaridgeTown_Gym_1F_EventScript_FlanneryDefeated:: @ 81FE7C1 waitmessage call Common_EventScript_PlayGymBadgeFanfare msgbox LavaridgeTown_Gym_1F_Text_ExplainHeatBadgeTakeThis, MSGBOX_DEFAULT - setflag FLAG_FLANNERY_GIVES_BADGE_INFO + setflag FLAG_WHITEOUT_TO_LAVARIDGE setflag FLAG_DEFEATED_LAVARIDGE_GYM setflag FLAG_BADGE04_GET addvar VAR_PETALBURG_GYM_STATE, 1 diff --git a/data/maps/LavaridgeTown_HerbShop/map.json b/data/maps/LavaridgeTown_HerbShop/map.json index 203812fb2..1e7048b3f 100644 --- a/data/maps/LavaridgeTown_HerbShop/map.json +++ b/data/maps/LavaridgeTown_HerbShop/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_HerbShop_EventScript_1FE4D7", + "script": "LavaridgeTown_HerbShop_EventScript_Clerk", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_HerbShop_EventScript_1FE505", + "script": "LavaridgeTown_HerbShop_EventScript_OldMan", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_HerbShop_EventScript_1FE4FC", + "script": "LavaridgeTown_HerbShop_EventScript_ExpertM", "flag": "0" } ], diff --git a/data/maps/LavaridgeTown_HerbShop/scripts.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc index c7ae5fb9e..c32468589 100644 --- a/data/maps/LavaridgeTown_HerbShop/scripts.inc +++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc @@ -1,18 +1,18 @@ LavaridgeTown_HerbShop_MapScripts:: @ 81FE4D6 .byte 0 -LavaridgeTown_HerbShop_EventScript_1FE4D7:: @ 81FE4D7 +LavaridgeTown_HerbShop_EventScript_Clerk:: @ 81FE4D7 lock faceplayer - message LavaridgeTown_HerbShop_Text_1FE53E + message LavaridgeTown_HerbShop_Text_WelcomeToHerbShop waitmessage - pokemart LavaridgeTown_HerbShop_Pokemart_1FE4F0 + pokemart LavaridgeTown_HerbShop_Pokemart msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -LavaridgeTown_HerbShop_Pokemart_1FE4F0: @ 81FE4F0 +LavaridgeTown_HerbShop_Pokemart: @ 81FE4F0 .2byte ITEM_ENERGY_POWDER .2byte ITEM_ENERGY_ROOT .2byte ITEM_HEAL_POWDER @@ -21,15 +21,15 @@ LavaridgeTown_HerbShop_Pokemart_1FE4F0: @ 81FE4F0 release end -LavaridgeTown_HerbShop_EventScript_1FE4FC:: @ 81FE4FC - msgbox LavaridgeTown_HerbShop_Text_1FE685, MSGBOX_NPC +LavaridgeTown_HerbShop_EventScript_ExpertM:: @ 81FE4FC + msgbox LavaridgeTown_HerbShop_Text_HerbalMedicineWorksButMonWillDislike, MSGBOX_NPC end -LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505 +LavaridgeTown_HerbShop_EventScript_OldMan:: @ 81FE505 lock faceplayer - goto_if_set FLFLAG_RECEIVED_CHARCOAL, LavaridgeTown_HerbShop_EventScript_1FE534 - msgbox LavaridgeTown_HerbShop_Text_1FE584, MSGBOX_DEFAULT + goto_if_set FLFLAG_RECEIVED_CHARCOAL, LavaridgeTown_HerbShop_EventScript_ExplainCharcoal + msgbox LavaridgeTown_HerbShop_Text_YouveComeToLookAtHerbalMedicine, MSGBOX_DEFAULT giveitem_std ITEM_CHARCOAL compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull @@ -37,22 +37,22 @@ LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505 release end -LavaridgeTown_HerbShop_EventScript_1FE534:: @ 81FE534 - msgbox LavaridgeTown_HerbShop_Text_1FE5EB, MSGBOX_DEFAULT +LavaridgeTown_HerbShop_EventScript_ExplainCharcoal:: @ 81FE534 + msgbox LavaridgeTown_HerbShop_Text_ExplainCharcoal, MSGBOX_DEFAULT release end -LavaridgeTown_HerbShop_Text_1FE53E: @ 81FE53E +LavaridgeTown_HerbShop_Text_WelcomeToHerbShop: @ 81FE53E .string "Welcome to the HERB SHOP, home of\n" .string "effective and inexpensive medicine!$" -LavaridgeTown_HerbShop_Text_1FE584: @ 81FE584 +LavaridgeTown_HerbShop_Text_YouveComeToLookAtHerbalMedicine: @ 81FE584 .string "You've come to look at herbal medicine\n" .string "in LAVARIDGE?\p" .string "That's rather commendable.\p" .string "I like you! Take this!$" -LavaridgeTown_HerbShop_Text_1FE5EB: @ 81FE5EB +LavaridgeTown_HerbShop_Text_ExplainCharcoal: @ 81FE5EB .string "That CHARCOAL I gave you, it's used\n" .string "for making herbal medicine.\p" .string "It also does wonders when held by\n" @@ -60,7 +60,7 @@ LavaridgeTown_HerbShop_Text_1FE5EB: @ 81FE5EB .string "It intensifies the power of FIRE-type\n" .string "moves.$" -LavaridgeTown_HerbShop_Text_1FE685: @ 81FE685 +LavaridgeTown_HerbShop_Text_HerbalMedicineWorksButMonWillDislike: @ 81FE685 .string "Herbal medicine works impressively well.\n" .string "But your POKéMON will dislike you for it.\l" .string "It must be horribly bitter!$" diff --git a/data/maps/LavaridgeTown_House/map.json b/data/maps/LavaridgeTown_House/map.json index 83416a7c0..77ebb268e 100644 --- a/data/maps/LavaridgeTown_House/map.json +++ b/data/maps/LavaridgeTown_House/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_House_EventScript_1FF912", + "script": "LavaridgeTown_House_EventScript_OldMan", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_House_EventScript_1FF91B", + "script": "LavaridgeTown_House_EventScript_Zigzagoon", "flag": "0" }, { diff --git a/data/maps/LavaridgeTown_House/scripts.inc b/data/maps/LavaridgeTown_House/scripts.inc index 2dc6bc76e..6db5f9ee5 100644 --- a/data/maps/LavaridgeTown_House/scripts.inc +++ b/data/maps/LavaridgeTown_House/scripts.inc @@ -1,26 +1,26 @@ LavaridgeTown_House_MapScripts:: @ 81FF911 .byte 0 -LavaridgeTown_House_EventScript_1FF912:: @ 81FF912 - msgbox LavaridgeTown_House_Text_1FF92E, MSGBOX_NPC +LavaridgeTown_House_EventScript_OldMan:: @ 81FF912 + msgbox LavaridgeTown_House_Text_WifeWarmingEggInHotSprings, MSGBOX_NPC end -LavaridgeTown_House_EventScript_1FF91B:: @ 81FF91B +LavaridgeTown_House_EventScript_Zigzagoon:: @ 81FF91B lock faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox LavaridgeTown_House_Text_1FF9BB, MSGBOX_DEFAULT + msgbox LavaridgeTown_House_Text_Zigzagoon, MSGBOX_DEFAULT waitmoncry release end -LavaridgeTown_House_Text_1FF92E: @ 81FF92E +LavaridgeTown_House_Text_WifeWarmingEggInHotSprings: @ 81FF92E .string "My wife's warming an EGG in the hot\n" .string "springs. This is what she told me.\p" .string "She left two POKéMON with the DAY CARE.\n" .string "And they discovered that EGG!$" -LavaridgeTown_House_Text_1FF9BB: @ 81FF9BB +LavaridgeTown_House_Text_Zigzagoon: @ 81FF9BB .string "ZIGZAGOON: Pshoo!$" diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index 0cb3e79fe..906286bc7 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -196,8 +196,6 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink:: @ 8220450 LilycoveCity_DepartmentStoreRooftop_EventScript_ExitVendingMachine:: @ 822045E hidemoneybox - nop - nop releaseall end diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json index d5dc8ae99..1708008bd 100644 --- a/data/maps/MauvilleCity/map.json +++ b/data/maps/MauvilleCity/map.json @@ -45,7 +45,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_EventScript_1DF3B3", + "script": "MauvilleCity_EventScript_Boy", "flag": "0" }, { @@ -58,7 +58,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_EventScript_1DF3CE", + "script": "MauvilleCity_EventScript_RichBoy", "flag": "0" }, { @@ -71,7 +71,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_EventScript_1DF3BC", + "script": "MauvilleCity_EventScript_Maniac", "flag": "0" }, { @@ -84,7 +84,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_EventScript_1DF3C5", + "script": "MauvilleCity_EventScript_Woman", "flag": "0" }, { @@ -97,7 +97,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_EventScript_1DF3FB", + "script": "MauvilleCity_EventScript_SchoolKidM", "flag": "0" }, { @@ -110,7 +110,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_EventScript_1DF452", + "script": "MauvilleCity_EventScript_Wally", "flag": "FLAG_HIDE_MAUVILLE_CITY_WALLY" }, { @@ -123,7 +123,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_EventScript_1DF41D", + "script": "MauvilleCity_EventScript_WallysUncle", "flag": "FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE" }, { @@ -136,7 +136,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_EventScript_1DF73A", + "script": "MauvilleCity_EventScript_Wattson", "flag": "FLAG_HIDE_MAUVILLE_CITY_WATTSON" }, { @@ -246,7 +246,7 @@ "y": 6, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_EventScript_1DF3E0" + "script": "MauvilleCity_EventScript_GymSign" }, { "type": "sign", @@ -278,7 +278,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_EventScript_1DF3D7" + "script": "MauvilleCity_EventScript_CitySign" }, { "type": "sign", @@ -286,7 +286,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_EventScript_1DF3E9" + "script": "MauvilleCity_EventScript_BikeShopSign" }, { "type": "sign", @@ -294,7 +294,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_EventScript_1DF3F2" + "script": "MauvilleCity_EventScript_GameCornerSign" } ] }
\ No newline at end of file diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 7b853d596..3410664a1 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -9,88 +9,88 @@ MauvilleCity_OnTransition: @ 81DF38B setflag FLAG_SYS_TV_START clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE setvar VAR_MAUVILLE_GYM_STATE, 0 - call_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_1DF3A9 + call_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_MoveWattsonBackToGym end -MauvilleCity_EventScript_1DF3A9:: @ 81DF3A9 +MauvilleCity_EventScript_MoveWattsonBackToGym:: @ 81DF3A9 clearflag FLAG_HIDE_MAUVILLE_GYM_WATTSON setflag FLAG_HIDE_MAUVILLE_CITY_WATTSON setflag FLAG_WATTSON_REMATCH_AVAILABLE return -MauvilleCity_EventScript_1DF3B3:: @ 81DF3B3 - msgbox MauvilleCity_Text_1E0301, MSGBOX_NPC +MauvilleCity_EventScript_Boy:: @ 81DF3B3 + msgbox MauvilleCity_Text_NurseHurtMonBackToHealth, MSGBOX_NPC end -MauvilleCity_EventScript_1DF3BC:: @ 81DF3BC - msgbox MauvilleCity_Text_1E037C, MSGBOX_NPC +MauvilleCity_EventScript_Maniac:: @ 81DF3BC + msgbox MauvilleCity_Text_AllSortsOfPeopleComeThrough, MSGBOX_NPC end -MauvilleCity_EventScript_1DF3C5:: @ 81DF3C5 - msgbox MauvilleCity_Text_1E03FB, MSGBOX_NPC +MauvilleCity_EventScript_Woman:: @ 81DF3C5 + msgbox MauvilleCity_Text_RydelVeryGenerous, MSGBOX_NPC end -MauvilleCity_EventScript_1DF3CE:: @ 81DF3CE - msgbox MauvilleCity_Text_1E044A, MSGBOX_NPC +MauvilleCity_EventScript_RichBoy:: @ 81DF3CE + msgbox MauvilleCity_Text_PokemonCanJumpYouOnBike, MSGBOX_NPC end -MauvilleCity_EventScript_1DF3D7:: @ 81DF3D7 - msgbox MauvilleCity_Text_1E0485, MSGBOX_SIGN +MauvilleCity_EventScript_CitySign:: @ 81DF3D7 + msgbox MauvilleCity_Text_CitySign, MSGBOX_SIGN end -MauvilleCity_EventScript_1DF3E0:: @ 81DF3E0 - msgbox MauvilleCity_Text_1E04B7, MSGBOX_SIGN +MauvilleCity_EventScript_GymSign:: @ 81DF3E0 + msgbox MauvilleCity_Text_GymSign, MSGBOX_SIGN end -MauvilleCity_EventScript_1DF3E9:: @ 81DF3E9 - msgbox MauvilleCity_Text_1E0504, MSGBOX_SIGN +MauvilleCity_EventScript_BikeShopSign:: @ 81DF3E9 + msgbox MauvilleCity_Text_BikeShopSign, MSGBOX_SIGN end -MauvilleCity_EventScript_1DF3F2:: @ 81DF3F2 - msgbox MauvilleCity_Text_1E053C, MSGBOX_SIGN +MauvilleCity_EventScript_GameCornerSign:: @ 81DF3F2 + msgbox MauvilleCity_Text_GameCornerSign, MSGBOX_SIGN end -MauvilleCity_EventScript_1DF3FB:: @ 81DF3FB +MauvilleCity_EventScript_SchoolKidM:: @ 81DF3FB lock faceplayer - goto_if_set FLAG_TV_EXPLAINED, MauvilleCity_EventScript_1DF413 - msgbox MauvilleCity_Text_1E056A, MSGBOX_DEFAULT + goto_if_set FLAG_TV_EXPLAINED, MauvilleCity_EventScript_TVExplained + msgbox MauvilleCity_Text_ExplainTV, MSGBOX_DEFAULT setflag FLAG_TV_EXPLAINED release end -MauvilleCity_EventScript_1DF413:: @ 81DF413 - msgbox MauvilleCity_Text_1E0699, MSGBOX_DEFAULT +MauvilleCity_EventScript_TVExplained:: @ 81DF413 + msgbox MauvilleCity_Text_BeenCheckingOutTV, MSGBOX_DEFAULT release end -MauvilleCity_EventScript_1DF41D:: @ 81DF41D +MauvilleCity_EventScript_WallysUncle:: @ 81DF41D lock faceplayer - goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF43D - msgbox MauvilleCity_Text_1DF7DC, MSGBOX_DEFAULT + goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_UncleAskPlayerToBattleWally + msgbox MauvilleCity_Text_UncleHesTooPeppy, MSGBOX_DEFAULT closemessage applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end -MauvilleCity_EventScript_1DF43D:: @ 81DF43D - msgbox MauvilleCity_Text_1DFAA5, MSGBOX_DEFAULT +MauvilleCity_EventScript_UncleAskPlayerToBattleWally:: @ 81DF43D + msgbox MauvilleCity_Text_UncleCanYouBattleWally, MSGBOX_DEFAULT closemessage applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end -MauvilleCity_EventScript_1DF452:: @ 81DF452 +MauvilleCity_EventScript_Wally:: @ 81DF452 lockall - goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF690 + goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_WallyRequestBattleAgain applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox MauvilleCity_Text_1DF845, MSGBOX_DEFAULT - msgbox MauvilleCity_Text_1DF8B9, MSGBOX_DEFAULT - msgbox MauvilleCity_Text_1DF963, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_WallyWantToChallengeGym, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_UncleYourePushingIt, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_WallyWeCanBeatAnyone, MSGBOX_DEFAULT applymovement 6, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN @@ -98,61 +98,61 @@ MauvilleCity_EventScript_1DF452:: @ 81DF452 waitmovement 0 applymovement 6, Common_Movement_Delay48 waitmovement 0 - msgbox MauvilleCity_Text_1DF9B2, MSGBOX_YESNO - goto MauvilleCity_EventScript_1DF4AD + msgbox MauvilleCity_Text_WallyWillYouBattleMe, MSGBOX_YESNO + goto MauvilleCity_EventScript_BattleWallyPrompt end -MauvilleCity_EventScript_1DF4AD:: @ 81DF4AD +MauvilleCity_EventScript_BattleWallyPrompt:: @ 81DF4AD compare VAR_RESULT, YES - call_if_eq MauvilleCity_EventScript_1DF63A + call_if_eq MauvilleCity_EventScript_BattleWally compare VAR_RESULT, NO - goto_if_eq MauvilleCity_EventScript_1DF683 + goto_if_eq MauvilleCity_EventScript_DeclineWallyBattle closemessage switch VAR_FACING - case DIR_NORTH, MauvilleCity_EventScript_1DF4E0 - case DIR_EAST, MauvilleCity_EventScript_1DF53D + case DIR_NORTH, MauvilleCity_EventScript_WallyAndUncleExitNorth + case DIR_EAST, MauvilleCity_EventScript_WallyAndUncleExitEast end -MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0 - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6DF - applymovement 6, MauvilleCity_Movement_1DF6A8 - applymovement 7, MauvilleCity_Movement_1DF6E2 +MauvilleCity_EventScript_WallyAndUncleExitNorth:: @ 81DF4E0 + applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitNorth1 + applymovement 6, MauvilleCity_Movement_WallyExitNorth1 + applymovement 7, MauvilleCity_Movement_WallysUncleExitNorth1 waitmovement 0 applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 30 - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6EE - applymovement 7, MauvilleCity_Movement_1DF6F3 + applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerFaceUncleNorth + applymovement 7, MauvilleCity_Movement_WallysUncleApproachPlayerNorth waitmovement 0 - msgbox MauvilleCity_Text_1DFD34, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_UncleVisitUsSometime, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6CC - applymovement 7, MauvilleCity_Movement_1DF6FA - applymovement 6, MauvilleCity_Movement_1DF6B4 + applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitNorth2 + applymovement 7, MauvilleCity_Movement_WallysUncleExitNorth2 + applymovement 6, MauvilleCity_Movement_WallyExitNorth2 waitmovement 0 - goto MauvilleCity_EventScript_1DF593 + goto MauvilleCity_EventScript_DefeatedWally end -MauvilleCity_EventScript_1DF53D:: @ 81DF53D - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6DC - applymovement 6, MauvilleCity_Movement_1DF6AE - applymovement 7, MauvilleCity_Movement_1DF6E8 +MauvilleCity_EventScript_WallyAndUncleExitEast:: @ 81DF53D + applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitEast1 + applymovement 6, MauvilleCity_Movement_WallyExitEast1 + applymovement 7, MauvilleCity_Movement_WallysUncleExitEast1 waitmovement 0 applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 30 - applymovement 7, MauvilleCity_Movement_1DF6F7 + applymovement 7, MauvilleCity_Movement_WallysUncleApproachPlayerEast waitmovement 0 - msgbox MauvilleCity_Text_1DFD34, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_UncleVisitUsSometime, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6D0 - applymovement 7, MauvilleCity_Movement_1DF703 - applymovement 6, MauvilleCity_Movement_1DF6C0 + applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitEast2 + applymovement 7, MauvilleCity_Movement_WallysUncleExitEast2 + applymovement 6, MauvilleCity_Movement_WallyExitEast2 waitmovement 0 - goto MauvilleCity_EventScript_1DF593 + goto MauvilleCity_EventScript_DefeatedWally end -MauvilleCity_EventScript_1DF593:: @ 81DF593 +MauvilleCity_EventScript_DefeatedWally:: @ 81DF593 removeobject 6 removeobject 7 clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY @@ -161,75 +161,75 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593 setvar VAR_WALLY_CALL_STEP_COUNTER, 0 setflag FLAG_ENABLE_FIRST_WALLY_POKENAV_CALL compare VAR_FACING, DIR_NORTH - call_if_eq MauvilleCity_EventScript_1DF5F3 + call_if_eq MauvilleCity_EventScript_ScottApproachPlayerNorth compare VAR_FACING, DIR_EAST - call_if_eq MauvilleCity_EventScript_1DF601 + call_if_eq MauvilleCity_EventScript_ScottApproachPlayerEast applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_ScottYouDidntHoldBack, MSGBOX_DEFAULT closemessage addvar VAR_SCOTT_STATE, 1 compare VAR_FACING, DIR_NORTH - call_if_eq MauvilleCity_EventScript_1DF616 + call_if_eq MauvilleCity_EventScript_ScottExitNorth compare VAR_FACING, DIR_EAST - call_if_eq MauvilleCity_EventScript_1DF628 + call_if_eq MauvilleCity_EventScript_ScottExitEast removeobject 11 releaseall end -MauvilleCity_EventScript_1DF5F3:: @ 81DF5F3 +MauvilleCity_EventScript_ScottApproachPlayerNorth:: @ 81DF5F3 addobject 11 - applymovement 11, MauvilleCity_Movement_1DF70D + applymovement 11, MauvilleCity_Movement_ScottApproachPlayerNorth waitmovement 0 return -MauvilleCity_EventScript_1DF601:: @ 81DF601 +MauvilleCity_EventScript_ScottApproachPlayerEast:: @ 81DF601 setobjectxyperm 11, 12, 13 addobject 11 - applymovement 11, MauvilleCity_Movement_1DF719 + applymovement 11, MauvilleCity_Movement_ScottApproachPlayerEast waitmovement 0 return -MauvilleCity_EventScript_1DF616:: @ 81DF616 - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6D5 - applymovement 11, MauvilleCity_Movement_1DF725 +MauvilleCity_EventScript_ScottExitNorth:: @ 81DF616 + applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchScottExitNorth + applymovement 11, MauvilleCity_Movement_ScottExitNorth waitmovement 0 return -MauvilleCity_EventScript_1DF628:: @ 81DF628 - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6D8 - applymovement 11, MauvilleCity_Movement_1DF72F +MauvilleCity_EventScript_ScottExitEast:: @ 81DF628 + applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchScottExitEast + applymovement 11, MauvilleCity_Movement_ScottExitEast waitmovement 0 return -MauvilleCity_EventScript_1DF63A:: @ 81DF63A - msgbox MauvilleCity_Text_1DFB6D, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_1DFB96 +MauvilleCity_EventScript_BattleWally:: @ 81DF63A + msgbox MauvilleCity_Text_WallyHereICome, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_WallyDefeat applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox MauvilleCity_Text_1DFBC3, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_WallyIllGoBackToVerdanturf, MSGBOX_DEFAULT applymovement 6, Common_Movement_FacePlayer waitmovement 0 - msgbox MauvilleCity_Text_1DFBED, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_ThankYouNotEnoughToBattle, MSGBOX_DEFAULT applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox MauvilleCity_Text_1DFC8A, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_UncleNoNeedToBeDown, MSGBOX_DEFAULT return -MauvilleCity_EventScript_1DF683:: @ 81DF683 +MauvilleCity_EventScript_DeclineWallyBattle:: @ 81DF683 setflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE - msgbox MauvilleCity_Text_1DFA4A, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_WallyMyUncleWontKnowImStrong, MSGBOX_DEFAULT release end -MauvilleCity_EventScript_1DF690:: @ 81DF690 +MauvilleCity_EventScript_WallyRequestBattleAgain:: @ 81DF690 applymovement 6, Common_Movement_FacePlayer waitmovement 0 - msgbox MauvilleCity_Text_1DFB42, MSGBOX_YESNO - goto MauvilleCity_EventScript_1DF4AD + msgbox MauvilleCity_Text_WallyPleaseBattleMe, MSGBOX_YESNO + goto MauvilleCity_EventScript_BattleWallyPrompt end -MauvilleCity_Movement_1DF6A8: @ 81DF6A8 +MauvilleCity_Movement_WallyExitNorth1: @ 81DF6A8 walk_left walk_left walk_down @@ -237,7 +237,7 @@ MauvilleCity_Movement_1DF6A8: @ 81DF6A8 walk_left step_end -MauvilleCity_Movement_1DF6AE: @ 81DF6AE +MauvilleCity_Movement_WallyExitEast1: @ 81DF6AE walk_down walk_down walk_left @@ -245,7 +245,7 @@ MauvilleCity_Movement_1DF6AE: @ 81DF6AE walk_left step_end -MauvilleCity_Movement_1DF6B4: @ 81DF6B4 +MauvilleCity_Movement_WallyExitNorth2: @ 81DF6B4 delay_16 delay_16 walk_left @@ -259,7 +259,7 @@ MauvilleCity_Movement_1DF6B4: @ 81DF6B4 delay_8 step_end -MauvilleCity_Movement_1DF6C0: @ 81DF6C0 +MauvilleCity_Movement_WallyExitEast2: @ 81DF6C0 delay_16 delay_16 walk_left @@ -273,41 +273,41 @@ MauvilleCity_Movement_1DF6C0: @ 81DF6C0 delay_8 step_end -MauvilleCity_Movement_1DF6CC: @ 81DF6CC +MauvilleCity_Movement_PlayerWatchWallyExitNorth2: @ 81DF6CC delay_16 delay_8 walk_in_place_fastest_left step_end -MauvilleCity_Movement_1DF6D0: @ 81DF6D0 +MauvilleCity_Movement_PlayerWatchWallyExitEast2: @ 81DF6D0 delay_16 delay_16 delay_16 walk_in_place_fastest_left step_end -MauvilleCity_Movement_1DF6D5: @ 81DF6D5 +MauvilleCity_Movement_PlayerWatchScottExitNorth: @ 81DF6D5 delay_16 walk_in_place_fastest_left step_end -MauvilleCity_Movement_1DF6D8: @ 81DF6D8 +MauvilleCity_Movement_PlayerWatchScottExitEast: @ 81DF6D8 delay_16 delay_16 walk_in_place_fastest_left step_end -MauvilleCity_Movement_1DF6DC: @ 81DF6DC +MauvilleCity_Movement_PlayerWatchWallyExitEast1: @ 81DF6DC delay_16 walk_in_place_fastest_down step_end -MauvilleCity_Movement_1DF6DF: @ 81DF6DF +MauvilleCity_Movement_PlayerWatchWallyExitNorth1: @ 81DF6DF delay_16 walk_in_place_fastest_left step_end -MauvilleCity_Movement_1DF6E2: @ 81DF6E2 +MauvilleCity_Movement_WallysUncleExitNorth1: @ 81DF6E2 walk_left walk_left walk_left @@ -315,7 +315,7 @@ MauvilleCity_Movement_1DF6E2: @ 81DF6E2 walk_down step_end -MauvilleCity_Movement_1DF6E8: @ 81DF6E8 +MauvilleCity_Movement_WallysUncleExitEast1: @ 81DF6E8 walk_left walk_down walk_down @@ -323,25 +323,25 @@ MauvilleCity_Movement_1DF6E8: @ 81DF6E8 walk_left step_end -MauvilleCity_Movement_1DF6EE: @ 81DF6EE +MauvilleCity_Movement_PlayerFaceUncleNorth: @ 81DF6EE delay_16 delay_8 delay_4 walk_in_place_fastest_down step_end -MauvilleCity_Movement_1DF6F3: @ 81DF6F3 +MauvilleCity_Movement_WallysUncleApproachPlayerNorth: @ 81DF6F3 walk_right walk_right walk_in_place_fastest_up step_end -MauvilleCity_Movement_1DF6F7: @ 81DF6F7 +MauvilleCity_Movement_WallysUncleApproachPlayerEast: @ 81DF6F7 walk_right walk_up step_end -MauvilleCity_Movement_1DF6FA: @ 81DF6FA +MauvilleCity_Movement_WallysUncleExitNorth2: @ 81DF6FA walk_left walk_left walk_left @@ -352,7 +352,7 @@ MauvilleCity_Movement_1DF6FA: @ 81DF6FA walk_left step_end -MauvilleCity_Movement_1DF703: @ 81DF703 +MauvilleCity_Movement_WallysUncleExitEast2: @ 81DF703 walk_down walk_left walk_left @@ -364,7 +364,7 @@ MauvilleCity_Movement_1DF703: @ 81DF703 walk_left step_end -MauvilleCity_Movement_1DF70D: @ 81DF70D +MauvilleCity_Movement_ScottApproachPlayerNorth: @ 81DF70D walk_up walk_up walk_up @@ -378,7 +378,7 @@ MauvilleCity_Movement_1DF70D: @ 81DF70D walk_in_place_fastest_up step_end -MauvilleCity_Movement_1DF719: @ 81DF719 +MauvilleCity_Movement_ScottApproachPlayerEast: @ 81DF719 walk_up walk_up walk_up @@ -392,7 +392,7 @@ MauvilleCity_Movement_1DF719: @ 81DF719 walk_up step_end -MauvilleCity_Movement_1DF725: @ 81DF725 +MauvilleCity_Movement_ScottExitNorth: @ 81DF725 walk_left walk_left walk_left @@ -404,7 +404,7 @@ MauvilleCity_Movement_1DF725: @ 81DF725 walk_left step_end -MauvilleCity_Movement_1DF72F: @ 81DF72F +MauvilleCity_Movement_ScottExitEast: @ 81DF72F walk_down walk_left walk_left @@ -417,47 +417,47 @@ MauvilleCity_Movement_1DF72F: @ 81DF72F walk_left step_end -MauvilleCity_EventScript_1DF73A:: @ 81DF73A +MauvilleCity_EventScript_Wattson:: @ 81DF73A lock faceplayer - goto_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_1DF7B0 + goto_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_ReceivedThunderbolt compare VAR_NEW_MAUVILLE_STATE, 2 - goto_if_eq MauvilleCity_EventScript_1DF784 - goto_if_set FLAG_GOT_BASEMENT_KEY_FROM_WATTSON, MauvilleCity_EventScript_1DF77A - msgbox MauvilleCity_Text_1DFFE4, MSGBOX_DEFAULT + goto_if_eq MauvilleCity_EventScript_CompletedNewMauville + goto_if_set FLAG_GOT_BASEMENT_KEY_FROM_WATTSON, MauvilleCity_EventScript_BegunNewMauville + msgbox MauvilleCity_Text_WattsonNeedFavorTakeKey, MSGBOX_DEFAULT giveitem_std ITEM_BASEMENT_KEY setflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON - msgbox MauvilleCity_Text_1E0154, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_WattsonWontBeChallenge, MSGBOX_DEFAULT release end -MauvilleCity_EventScript_1DF77A:: @ 81DF77A - msgbox MauvilleCity_Text_1E0154, MSGBOX_DEFAULT +MauvilleCity_EventScript_BegunNewMauville:: @ 81DF77A + msgbox MauvilleCity_Text_WattsonWontBeChallenge, MSGBOX_DEFAULT release end -MauvilleCity_EventScript_1DF784:: @ 81DF784 - msgbox MauvilleCity_Text_1E020E, MSGBOX_DEFAULT +MauvilleCity_EventScript_CompletedNewMauville:: @ 81DF784 + msgbox MauvilleCity_Text_WattsonThanksTakeTM, MSGBOX_DEFAULT giveitem_std ITEM_TM24 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_GOT_TM24_FROM_WATTSON - msgbox MauvilleCity_Text_1E02AA, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_WattsonYoungTakeCharge, MSGBOX_DEFAULT release end -MauvilleCity_EventScript_1DF7B0:: @ 81DF7B0 - msgbox MauvilleCity_Text_1E02AA, MSGBOX_DEFAULT +MauvilleCity_EventScript_ReceivedThunderbolt:: @ 81DF7B0 + msgbox MauvilleCity_Text_WattsonYoungTakeCharge, MSGBOX_DEFAULT release end -MauvilleCity_EventScript_1DF7BA:: @ 81DF7BA +MauvilleCity_EventScript_RegisterWallyCall:: @ 81DF7BA lockall - pokenavcall MauvilleCity_Text_1DFDFB + pokenavcall MauvilleCity_Text_WallyPokenavCall waitmessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox MauvilleCity_Text_1DFEB4, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_RegisteredWally, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -466,30 +466,30 @@ MauvilleCity_EventScript_1DF7BA:: @ 81DF7BA releaseall end -MauvilleCity_Text_1DF7DC: @ 81DF7DC +MauvilleCity_Text_UncleHesTooPeppy: @ 81DF7DC .string "UNCLE: It's because of POKéMON that\n" .string "this boy's got more pep, I suppose…\l" .string "But he's become a bit too peppy…$" -MauvilleCity_Text_1DF845: @ 81DF845 +MauvilleCity_Text_WallyWantToChallengeGym: @ 81DF845 .string "WALLY: Aww, UNCLE, please?\p" .string "I want to challenge this GYM and see\n" .string "how much better I've become.\p" .string "Please? May I, please?$" -MauvilleCity_Text_1DF8B9: @ 81DF8B9 +MauvilleCity_Text_UncleYourePushingIt: @ 81DF8B9 .string "UNCLE: Now hold on, WALLY.\p" .string "Since you started living with POKéMON,\n" .string "you have grown quite a lot stronger.\p" .string "But don't you think you're pushing it\n" .string "to suddenly challenge a GYM?$" -MauvilleCity_Text_1DF963: @ 81DF963 +MauvilleCity_Text_WallyWeCanBeatAnyone: @ 81DF963 .string "WALLY: I'm not pushing it.\p" .string "If I combine forces with RALTS,\n" .string "we can beat anyone!$" -MauvilleCity_Text_1DF9B2: @ 81DF9B2 +MauvilleCity_Text_WallyWillYouBattleMe: @ 81DF9B2 .string "WALLY: Oh! Hi, {PLAYER}!\p" .string "I've gotten a lot stronger since\n" .string "we met.\p" @@ -498,43 +498,43 @@ MauvilleCity_Text_1DF9B2: @ 81DF9B2 .string "{PLAYER}, please, will you have\n" .string "a battle with me?$" -MauvilleCity_Text_1DFA4A: @ 81DFA4A +MauvilleCity_Text_WallyMyUncleWontKnowImStrong: @ 81DFA4A .string "WALLY: Oh… If you won't battle me,\n" .string "{PLAYER}, my UNCLE won't know that I've\l" .string "become really strong.$" -MauvilleCity_Text_1DFAA5: @ 81DFAA5 +MauvilleCity_Text_UncleCanYouBattleWally: @ 81DFAA5 .string "UNCLE: {PLAYER}{KUN}, was it?\n" .string "On WALLY's behalf, can I ask you to\l" .string "battle with him just this once?\p" .string "I don't think he's going to listen to\n" .string "any reason the way he is now.$" -MauvilleCity_Text_1DFB42: @ 81DFB42 +MauvilleCity_Text_WallyPleaseBattleMe: @ 81DFB42 .string "WALLY: {PLAYER}, please!\n" .string "Battle with me, please.$" -MauvilleCity_Text_1DFB6D: @ 81DFB6D +MauvilleCity_Text_WallyHereICome: @ 81DFB6D .string "WALLY: {PLAYER}, thank you.\p" .string "Okay… Here I come!$" -MauvilleCity_Text_1DFB96: @ 81DFB96 +MauvilleCity_Text_WallyDefeat: @ 81DFB96 .string "WALLY: … … … … … … …\p" .string "… … … … … … … …\p" .string "I lost…$" -MauvilleCity_Text_1DFBC3: @ 81DFBC3 +MauvilleCity_Text_WallyIllGoBackToVerdanturf: @ 81DFBC3 .string "WALLY: UNCLE…\n" .string "I'll go back to VERDANTURF…$" -MauvilleCity_Text_1DFBED: @ 81DFBED +MauvilleCity_Text_ThankYouNotEnoughToBattle: @ 81DFBED .string "{PLAYER}, thank you.\n" .string "Being a TRAINER is tough, isn't it?\p" .string "It's not enough just to have POKéMON\n" .string "and make them battle. That isn't what\l" .string "being a real TRAINER is about.$" -MauvilleCity_Text_1DFC8A: @ 81DFC8A +MauvilleCity_Text_UncleNoNeedToBeDown: @ 81DFC8A .string "UNCLE: WALLY, there's no need to be so\n" .string "down on yourself.\p" .string "Why, what's keeping you from becoming\n" @@ -542,7 +542,7 @@ MauvilleCity_Text_1DFC8A: @ 81DFC8A .string "Come on, let's go home.\n" .string "Everyone's waiting for you.$" -MauvilleCity_Text_1DFD34: @ 81DFD34 +MauvilleCity_Text_UncleVisitUsSometime: @ 81DFD34 .string "UNCLE: {PLAYER}{KUN}, it just dawned on me\n" .string "that you must be the TRAINER who kept\l" .string "an eye out for WALLY when he caught\l" @@ -552,7 +552,7 @@ MauvilleCity_Text_1DFD34: @ 81DFD34 .string "I'm sure WALLY would enjoy it.$" -MauvilleCity_Text_1DFDFB: @ 81DFDFB +MauvilleCity_Text_WallyPokenavCall: @ 81DFDFB .string "… … … … … …\n" .string "… … … … … Beep!\p" .string "WALLY: Oh, hello, {PLAYER}!\p" @@ -563,11 +563,11 @@ MauvilleCity_Text_1DFDFB: @ 81DFDFB .string "… … … … … …\n" .string "… … … … … Click!$" -MauvilleCity_Text_1DFEB4: @ 81DFEB4 +MauvilleCity_Text_RegisteredWally: @ 81DFEB4 .string "Registered WALLY\n" .string "in the POKéNAV.$" -MauvilleCity_Text_1DFED5: @ 81DFED5 +MauvilleCity_Text_ScottYouDidntHoldBack: @ 81DFED5 .string "SCOTT: Hehe…\n" .string "I was watching that match!\p" .string "You're friends with that boy WALLY,\n" @@ -580,7 +580,7 @@ MauvilleCity_Text_1DFED5: @ 81DFED5 .string "… … … … … …\n" .string "I'll be cheering for you!$" -MauvilleCity_Text_1DFFE4: @ 81DFFE4 +MauvilleCity_Text_WattsonNeedFavorTakeKey: @ 81DFFE4 .string "WATTSON: Oh, {PLAYER}{KUN}!\n" .string "You look like you have a lot of zip!\l" .string "That's a good thing, wahahahaha!\p" @@ -595,7 +595,7 @@ MauvilleCity_Text_1DFFE4: @ 81DFFE4 .string "Here, this is the KEY to get into\n" .string "NEW MAUVILLE.$" -MauvilleCity_Text_1E0154: @ 81E0154 +MauvilleCity_Text_WattsonWontBeChallenge: @ 81E0154 .string "WATTSON: Don't you worry about it.\n" .string "It won't be a challenge to you.\p" .string "The entrance to NEW MAUVILLE is just\n" @@ -603,7 +603,7 @@ MauvilleCity_Text_1E0154: @ 81E0154 .string "That's it, then, you have my trust!\n" .string "Wahahahaha!$" -MauvilleCity_Text_1E020E: @ 81E020E +MauvilleCity_Text_WattsonThanksTakeTM: @ 81E020E .string "WATTSON: Wahahahaha!\p" .string "I knew it, {PLAYER}{KUN}! I knew I'd made\n" .string "the right choice asking you!\p" @@ -611,51 +611,51 @@ MauvilleCity_Text_1E020E: @ 81E020E .string "THUNDERBOLT!\p" .string "Go on, you've earned it!$" -MauvilleCity_Text_1E02AA: @ 81E02AA +MauvilleCity_Text_WattsonYoungTakeCharge: @ 81E02AA .string "WATTSON: Wahahahaha!\p" .string "It pleases me to no end to see\n" .string "the young step up and take charge!$" -MauvilleCity_Text_1E0301: @ 81E0301 +MauvilleCity_Text_NurseHurtMonBackToHealth: @ 81E0301 .string "You know, it's cool to have POKéMON\n" .string "battles and stuff…\p" .string "But if your POKéMON gets hurt,\n" .string "you have to nurse it back to health.$" -MauvilleCity_Text_1E037C: @ 81E037C +MauvilleCity_Text_AllSortsOfPeopleComeThrough: @ 81E037C .string "The roads of this town stretch north\n" .string "and south, and east and west.\p" .string "Because of that, we get all sorts of\n" .string "people coming through.$" -MauvilleCity_Text_1E03FB: @ 81E03FB +MauvilleCity_Text_RydelVeryGenerous: @ 81E03FB .string "Have you been to RYDEL'S CYCLES yet?\p" .string "RYDEL, the owner, is a very generous\n" .string "man.$" -MauvilleCity_Text_1E044A: @ 81E044A +MauvilleCity_Text_PokemonCanJumpYouOnBike: @ 81E044A .string "Even if you're riding a BIKE,\n" .string "wild POKéMON could jump you.$" -MauvilleCity_Text_1E0485: @ 81E0485 +MauvilleCity_Text_CitySign: @ 81E0485 .string "MAUVILLE CITY\n" .string "“The bright and shiny city of fun!”$" -MauvilleCity_Text_1E04B7: @ 81E04B7 +MauvilleCity_Text_GymSign: @ 81E04B7 .string "MAUVILLE CITY POKéMON GYM\n" .string "LEADER: WATTSON\l" .string "“The cheerfully electrifying man!”$" -MauvilleCity_Text_1E0504: @ 81E0504 +MauvilleCity_Text_BikeShopSign: @ 81E0504 .string "“Ride in gravel and shake up your\n" .string "soul!”\l" .string "RYDEL'S CYCLES$" -MauvilleCity_Text_1E053C: @ 81E053C +MauvilleCity_Text_GameCornerSign: @ 81E053C .string "“The play spot for all!”\n" .string "MAUVILLE GAME CORNER$" -MauvilleCity_Text_1E056A: @ 81E056A +MauvilleCity_Text_ExplainTV: @ 81E056A .string "Hi, do you check out TV at all?\p" .string "They've added a bunch of cool new\n" .string "shows recently.\p" @@ -667,5 +667,5 @@ MauvilleCity_Text_1E056A: @ 81E056A .string "That's why I think you should check\n" .string "out TVs whenever you can.$" -MauvilleCity_Text_1E0699: @ 81E0699 +MauvilleCity_Text_BeenCheckingOutTV: @ 81E0699 .string "Hi, have you been checking out TVs?$" diff --git a/data/maps/MauvilleCity_GameCorner/map.json b/data/maps/MauvilleCity_GameCorner/map.json index c811cd7fd..efebc685a 100644 --- a/data/maps/MauvilleCity_GameCorner/map.json +++ b/data/maps/MauvilleCity_GameCorner/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_210125", + "script": "MauvilleCity_GameCorner_EventScript_Woman2", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_21012E", + "script": "MauvilleCity_GameCorner_EventScript_Gentleman", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_20FBB9", + "script": "MauvilleCity_GameCorner_EventScript_CoinsClerk", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_20FCF1", + "script": "MauvilleCity_GameCorner_EventScript_PrizeCornerDolls", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_210137", + "script": "MauvilleCity_GameCorner_EventScript_Girl", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_21021D", + "script": "MauvilleCity_GameCorner_EventScript_PokefanM", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_210279", + "script": "MauvilleCity_GameCorner_EventScript_OldMan", "flag": "0" }, { @@ -115,7 +115,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_210289", + "script": "MauvilleCity_GameCorner_EventScript_Cook", "flag": "0" }, { @@ -128,7 +128,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_20FE9F", + "script": "MauvilleCity_GameCorner_EventScript_PrizeCornerTMs", "flag": "0" }, { @@ -141,7 +141,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_210299", + "script": "MauvilleCity_GameCorner_EventScript_Man", "flag": "0" }, { @@ -154,7 +154,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_2102B6", + "script": "MauvilleCity_GameCorner_EventScript_Maniac", "flag": "0" }, { @@ -167,7 +167,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_2102C6", + "script": "MauvilleCity_GameCorner_EventScript_Woman", "flag": "0" } ], @@ -195,7 +195,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", - "script": "MauvilleCity_GameCorner_EventScript_2102D6" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine0" }, { "type": "sign", @@ -203,7 +203,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", - "script": "MauvilleCity_GameCorner_EventScript_2102F6" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine1" }, { "type": "sign", @@ -211,7 +211,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", - "script": "MauvilleCity_GameCorner_EventScript_210316" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine2" }, { "type": "sign", @@ -219,7 +219,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", - "script": "MauvilleCity_GameCorner_EventScript_210336" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine3" }, { "type": "sign", @@ -227,7 +227,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", - "script": "MauvilleCity_GameCorner_EventScript_210356" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine4" }, { "type": "sign", @@ -235,7 +235,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", - "script": "MauvilleCity_GameCorner_EventScript_210376" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine5" }, { "type": "sign", @@ -243,7 +243,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", - "script": "MauvilleCity_GameCorner_EventScript_210396" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine6" }, { "type": "sign", @@ -251,7 +251,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", - "script": "MauvilleCity_GameCorner_EventScript_2103B6" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine7" }, { "type": "sign", @@ -259,7 +259,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", - "script": "MauvilleCity_GameCorner_EventScript_2103D6" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine8" }, { "type": "sign", @@ -267,7 +267,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", - "script": "MauvilleCity_GameCorner_EventScript_2103F6" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine9" }, { "type": "sign", @@ -275,7 +275,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", - "script": "MauvilleCity_GameCorner_EventScript_210416" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine10" }, { "type": "sign", @@ -283,7 +283,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", - "script": "MauvilleCity_GameCorner_EventScript_210436" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine11" }, { "type": "sign", diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index 7e4180b92..2bafd056e 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -1,539 +1,541 @@ MauvilleCity_GameCorner_MapScripts:: @ 820FBB8 .byte 0 -MauvilleCity_GameCorner_EventScript_20FBB9:: @ 820FBB9 + @ Game Corner prices + .set TM32_COINS, 1500 + .set TM29_COINS, 3500 + .set TM35_COINS, 4000 + .set TM24_COINS, 4000 + .set TM13_COINS, 4000 + .set DOLL_COINS, 1000 + + .set COINS_PRICE_50, 1000 + .set COINS_PRICE_500, 10000 + +MauvilleCity_GameCorner_EventScript_CoinsClerk:: @ 820FBB9 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_210460, MSGBOX_DEFAULT + msgbox MauvilleCity_GameCorner_Text_ThisIsMauvilleGameCorner, MSGBOX_DEFAULT checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_20FCB7 - message MauvilleCity_GameCorner_Text_2104DF + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_GameCorner_EventScript_NeedCoinCase + message MauvilleCity_GameCorner_Text_WereYouLookingForCoins waitmessage showmoneybox 0, 0, 0 showcoinsbox 1, 6 - goto MauvilleCity_GameCorner_EventScript_20FBE5 + goto MauvilleCity_GameCorner_EventScript_ChooseCoinsDefault50 -MauvilleCity_GameCorner_EventScript_20FBE5:: @ 820FBE5 +MauvilleCity_GameCorner_EventScript_ChooseCoinsDefault50:: @ 820FBE5 multichoicedefault 15, 0, MULTI_GAME_CORNER_COINS, 0, 0 switch VAR_RESULT - case 0, MauvilleCity_GameCorner_EventScript_20FC33 - case 1, MauvilleCity_GameCorner_EventScript_20FC75 - goto MauvilleCity_GameCorner_EventScript_20FCD1 + case 0, MauvilleCity_GameCorner_EventScript_Buy50Coins + case 1, MauvilleCity_GameCorner_EventScript_Buy500Coins + goto MauvilleCity_GameCorner_EventScript_CancelBuyCoins end -MauvilleCity_GameCorner_EventScript_20FC0C:: @ 820FC0C +@ Unused +MauvilleCity_GameCorner_EventScript_ChooseCoinsDefault500:: @ 820FC0C multichoicedefault 15, 0, MULTI_GAME_CORNER_COINS, 1, 0 switch VAR_RESULT - case 0, MauvilleCity_GameCorner_EventScript_20FC33 - case 1, MauvilleCity_GameCorner_EventScript_20FC75 - goto MauvilleCity_GameCorner_EventScript_20FCD1 + case 0, MauvilleCity_GameCorner_EventScript_Buy50Coins + case 1, MauvilleCity_GameCorner_EventScript_Buy500Coins + goto MauvilleCity_GameCorner_EventScript_CancelBuyCoins end -MauvilleCity_GameCorner_EventScript_20FC33:: @ 820FC33 +MauvilleCity_GameCorner_EventScript_Buy50Coins:: @ 820FC33 checkcoins VAR_TEMP_1 - compare VAR_TEMP_1, 9950 - goto_if_ge MauvilleCity_GameCorner_EventScript_20FCE1 - checkmoney 1000, 0 - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_20FCC1 + compare VAR_TEMP_1, MAX_COINS + 1 - 50 + goto_if_ge MauvilleCity_GameCorner_EventScript_NoRoomForCoins + checkmoney COINS_PRICE_50, 0 + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_GameCorner_EventScript_NotEnoughMoney givecoins 50 - takemoney 1000, 0 + takemoney COINS_PRICE_50, 0 updatemoneybox 0, 0 updatecoinsbox 1, 6 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_210529, MSGBOX_DEFAULT + msgbox MauvilleCity_GameCorner_Text_ThankYouHereAreYourCoins, MSGBOX_DEFAULT hidemoneybox - nop - nop hidecoinsbox 0, 5 release end -MauvilleCity_GameCorner_EventScript_20FC75:: @ 820FC75 +MauvilleCity_GameCorner_EventScript_Buy500Coins:: @ 820FC75 checkcoins VAR_TEMP_1 - compare VAR_TEMP_1, 9500 - goto_if_ge MauvilleCity_GameCorner_EventScript_20FCE1 - checkmoney 10000, 0 - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_20FCC1 + compare VAR_TEMP_1, MAX_COINS + 1 - 500 + goto_if_ge MauvilleCity_GameCorner_EventScript_NoRoomForCoins + checkmoney COINS_PRICE_500, 0 + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_GameCorner_EventScript_NotEnoughMoney givecoins 500 - takemoney 10000, 0 + takemoney COINS_PRICE_500, 0 updatemoneybox 0, 0 updatecoinsbox 1, 6 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_210529, MSGBOX_DEFAULT + msgbox MauvilleCity_GameCorner_Text_ThankYouHereAreYourCoins, MSGBOX_DEFAULT hidemoneybox - nop - nop hidecoinsbox 0, 5 release end -MauvilleCity_GameCorner_EventScript_20FCB7:: @ 820FCB7 - msgbox MauvilleCity_GameCorner_Text_21047E, MSGBOX_DEFAULT +MauvilleCity_GameCorner_EventScript_NeedCoinCase:: @ 820FCB7 + msgbox MauvilleCity_GameCorner_Text_NeedCoinCaseForCoins, MSGBOX_DEFAULT release end -MauvilleCity_GameCorner_EventScript_20FCC1:: @ 820FCC1 - msgbox MauvilleCity_GameCorner_Text_210553, MSGBOX_DEFAULT +MauvilleCity_GameCorner_EventScript_NotEnoughMoney:: @ 820FCC1 + msgbox MauvilleCity_GameCorner_Text_DontHaveEnoughMoney, MSGBOX_DEFAULT hidemoneybox - nop - nop hidecoinsbox 0, 5 release end -MauvilleCity_GameCorner_EventScript_20FCD1:: @ 820FCD1 - msgbox MauvilleCity_GameCorner_Text_21059A, MSGBOX_DEFAULT +MauvilleCity_GameCorner_EventScript_CancelBuyCoins:: @ 820FCD1 + msgbox MauvilleCity_GameCorner_Text_DontNeedCoinsThen, MSGBOX_DEFAULT hidemoneybox - nop - nop hidecoinsbox 0, 5 release end -MauvilleCity_GameCorner_EventScript_20FCE1:: @ 820FCE1 - msgbox MauvilleCity_GameCorner_Text_21057E, MSGBOX_DEFAULT +MauvilleCity_GameCorner_EventScript_NoRoomForCoins:: @ 820FCE1 + msgbox MauvilleCity_GameCorner_Text_CoinCaseIsFull, MSGBOX_DEFAULT hidemoneybox - nop - nop hidecoinsbox 0, 5 release end -MauvilleCity_GameCorner_EventScript_20FCF1:: @ 820FCF1 +MauvilleCity_GameCorner_EventScript_PrizeCornerDolls:: @ 820FCF1 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_2105D7, MSGBOX_DEFAULT + msgbox MauvilleCity_GameCorner_Text_ExchangeCoinsForPrizes, MSGBOX_DEFAULT checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_GameCorner_EventScript_20FD0D + compare VAR_RESULT, TRUE + goto_if_eq MauvilleCity_GameCorner_EventScript_ChooseDollPrizeMessage release end -MauvilleCity_GameCorner_EventScript_20FD0D:: @ 820FD0D - message MauvilleCity_GameCorner_Text_21060D +MauvilleCity_GameCorner_EventScript_ChooseDollPrizeMessage:: @ 820FD0D + message MauvilleCity_GameCorner_Text_WhichPrize waitmessage setvar VAR_TEMP_1, 0 showcoinsbox 1, 1 - goto MauvilleCity_GameCorner_EventScript_20FD2B + goto MauvilleCity_GameCorner_EventScript_ChooseDollPrize -MauvilleCity_GameCorner_EventScript_20FD20:: @ 820FD20 - message MauvilleCity_GameCorner_Text_21060D +MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize:: @ 820FD20 + message MauvilleCity_GameCorner_Text_WhichPrize waitmessage - goto MauvilleCity_GameCorner_EventScript_20FD2B + goto MauvilleCity_GameCorner_EventScript_ChooseDollPrize -MauvilleCity_GameCorner_EventScript_20FD2B:: @ 820FD2B +MauvilleCity_GameCorner_EventScript_ChooseDollPrize:: @ 820FD2B multichoice 12, 0, MULTI_GAME_CORNER_DOLLS, 0 switch VAR_RESULT - case 0, MauvilleCity_GameCorner_EventScript_20FD67 - case 1, MauvilleCity_GameCorner_EventScript_20FD75 - case 2, MauvilleCity_GameCorner_EventScript_20FD83 - case 3, MauvilleCity_GameCorner_EventScript_20FE92 - goto MauvilleCity_GameCorner_EventScript_20FE92 + case 0, MauvilleCity_GameCorner_EventScript_TreeckoDoll + case 1, MauvilleCity_GameCorner_EventScript_TorchicDoll + case 2, MauvilleCity_GameCorner_EventScript_MudkipDoll + case 3, MauvilleCity_GameCorner_EventScript_CancelDollSelect + goto MauvilleCity_GameCorner_EventScript_CancelDollSelect end -MauvilleCity_GameCorner_EventScript_20FD67:: @ 820FD67 +MauvilleCity_GameCorner_EventScript_TreeckoDoll:: @ 820FD67 setvar VAR_TEMP_1, 1 bufferdecorationname 0, DECOR_TREECKO_DOLL - goto MauvilleCity_GameCorner_EventScript_20FD91 + goto MauvilleCity_GameCorner_EventScript_ConfirmDollPrize -MauvilleCity_GameCorner_EventScript_20FD75:: @ 820FD75 +MauvilleCity_GameCorner_EventScript_TorchicDoll:: @ 820FD75 setvar VAR_TEMP_1, 2 bufferdecorationname 0, DECOR_TORCHIC_DOLL - goto MauvilleCity_GameCorner_EventScript_20FD91 + goto MauvilleCity_GameCorner_EventScript_ConfirmDollPrize -MauvilleCity_GameCorner_EventScript_20FD83:: @ 820FD83 +MauvilleCity_GameCorner_EventScript_MudkipDoll:: @ 820FD83 setvar VAR_TEMP_1, 3 bufferdecorationname 0, DECOR_MUDKIP_DOLL - goto MauvilleCity_GameCorner_EventScript_20FD91 + goto MauvilleCity_GameCorner_EventScript_ConfirmDollPrize -MauvilleCity_GameCorner_EventScript_20FD91:: @ 820FD91 - msgbox MauvilleCity_GameCorner_Text_210705, MSGBOX_YESNO +MauvilleCity_GameCorner_EventScript_ConfirmDollPrize:: @ 820FD91 + msgbox MauvilleCity_GameCorner_Text_SoYourChoiceIsX, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq MauvilleCity_GameCorner_EventScript_20FE92 + goto_if_eq MauvilleCity_GameCorner_EventScript_CancelDollSelect switch VAR_TEMP_1 - case 1, MauvilleCity_GameCorner_EventScript_20FDCB - case 2, MauvilleCity_GameCorner_EventScript_20FE05 - case 3, MauvilleCity_GameCorner_EventScript_20FE3F + case 1, MauvilleCity_GameCorner_EventScript_BuyTreeckoDoll + case 2, MauvilleCity_GameCorner_EventScript_BuyTorchicDoll + case 3, MauvilleCity_GameCorner_EventScript_BuyMudkipDoll end -MauvilleCity_GameCorner_EventScript_20FDCB:: @ 820FDCB +MauvilleCity_GameCorner_EventScript_BuyTreeckoDoll:: @ 820FDCB checkcoins VAR_TEMP_2 - compare VAR_TEMP_2, 1000 - goto_if_lt MauvilleCity_GameCorner_EventScript_20FE79 + compare VAR_TEMP_2, DOLL_COINS + goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForDoll bufferdecorationname 1, DECOR_TREECKO_DOLL checkdecorspace DECOR_TREECKO_DOLL - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_20FE87 - takecoins 1000 + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForDoll + takecoins DOLL_COINS givedecoration DECOR_TREECKO_DOLL updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_210646, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_20FD20 + msgbox MauvilleCity_GameCorner_Text_SendToYourHomePC, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize end -MauvilleCity_GameCorner_EventScript_20FE05:: @ 820FE05 +MauvilleCity_GameCorner_EventScript_BuyTorchicDoll:: @ 820FE05 checkcoins VAR_TEMP_2 - compare VAR_TEMP_2, 1000 - goto_if_lt MauvilleCity_GameCorner_EventScript_20FE79 + compare VAR_TEMP_2, DOLL_COINS + goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForDoll bufferdecorationname 1, DECOR_TORCHIC_DOLL checkdecorspace DECOR_TORCHIC_DOLL - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_20FE87 - takecoins 1000 + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForDoll + takecoins DOLL_COINS givedecoration DECOR_TORCHIC_DOLL updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_210646, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_20FD20 + msgbox MauvilleCity_GameCorner_Text_SendToYourHomePC, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize end -MauvilleCity_GameCorner_EventScript_20FE3F:: @ 820FE3F +MauvilleCity_GameCorner_EventScript_BuyMudkipDoll:: @ 820FE3F checkcoins VAR_TEMP_2 - compare VAR_TEMP_2, 1000 - goto_if_lt MauvilleCity_GameCorner_EventScript_20FE79 + compare VAR_TEMP_2, DOLL_COINS + goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForDoll bufferdecorationname 1, DECOR_MUDKIP_DOLL checkdecorspace DECOR_MUDKIP_DOLL - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_20FE87 - takecoins 1000 + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForDoll + takecoins DOLL_COINS givedecoration DECOR_MUDKIP_DOLL updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_210646, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_20FD20 + msgbox MauvilleCity_GameCorner_Text_SendToYourHomePC, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize end -MauvilleCity_GameCorner_EventScript_20FE79:: @ 820FE79 - msgbox MauvilleCity_GameCorner_Text_210673, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_20FD20 +MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForDoll:: @ 820FE79 + msgbox MauvilleCity_GameCorner_Text_NotEnoughCoins, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize end -MauvilleCity_GameCorner_EventScript_20FE87:: @ 820FE87 +MauvilleCity_GameCorner_EventScript_NoRoomForDoll:: @ 820FE87 call Common_EventScript_NoRoomForDecor - goto MauvilleCity_GameCorner_EventScript_20FD20 + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize end -MauvilleCity_GameCorner_EventScript_20FE92:: @ 820FE92 - msgbox MauvilleCity_GameCorner_Text_2106BF, MSGBOX_DEFAULT +MauvilleCity_GameCorner_EventScript_CancelDollSelect:: @ 820FE92 + msgbox MauvilleCity_GameCorner_Text_OhIsThatSo, MSGBOX_DEFAULT hidecoinsbox 0, 0 release end -MauvilleCity_GameCorner_EventScript_20FE9F:: @ 820FE9F +MauvilleCity_GameCorner_EventScript_PrizeCornerTMs:: @ 820FE9F lock faceplayer - msgbox MauvilleCity_GameCorner_Text_2105D7, MSGBOX_DEFAULT + msgbox MauvilleCity_GameCorner_Text_ExchangeCoinsForPrizes, MSGBOX_DEFAULT checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_GameCorner_EventScript_20FEBB + compare VAR_RESULT, TRUE + goto_if_eq MauvilleCity_GameCorner_EventScript_ChooseTMPrizeMessage release end -MauvilleCity_GameCorner_EventScript_20FEBB:: @ 820FEBB - message MauvilleCity_GameCorner_Text_21060D +MauvilleCity_GameCorner_EventScript_ChooseTMPrizeMessage:: @ 820FEBB + message MauvilleCity_GameCorner_Text_WhichPrize waitmessage setvar VAR_TEMP_1, 0 showcoinsbox 1, 1 - goto MauvilleCity_GameCorner_EventScript_20FED9 + goto MauvilleCity_GameCorner_EventScript_ChooseTMPrize -MauvilleCity_GameCorner_EventScript_20FECE:: @ 820FECE - message MauvilleCity_GameCorner_Text_21060D +MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize:: @ 820FECE + message MauvilleCity_GameCorner_Text_WhichPrize waitmessage - goto MauvilleCity_GameCorner_EventScript_20FED9 + goto MauvilleCity_GameCorner_EventScript_ChooseTMPrize -MauvilleCity_GameCorner_EventScript_20FED9:: @ 820FED9 +MauvilleCity_GameCorner_EventScript_ChooseTMPrize:: @ 820FED9 multichoice 12, 0, MULTI_GAME_CORNER_TMS, 0 switch VAR_RESULT - case 0, MauvilleCity_GameCorner_EventScript_20FF2B - case 1, MauvilleCity_GameCorner_EventScript_20FF3E - case 2, MauvilleCity_GameCorner_EventScript_20FF51 - case 3, MauvilleCity_GameCorner_EventScript_20FF64 - case 4, MauvilleCity_GameCorner_EventScript_20FF77 - case 5, MauvilleCity_GameCorner_EventScript_210118 - goto MauvilleCity_GameCorner_EventScript_210118 + case 0, MauvilleCity_GameCorner_EventScript_TM32 + case 1, MauvilleCity_GameCorner_EventScript_TM29 + case 2, MauvilleCity_GameCorner_EventScript_TM35 + case 3, MauvilleCity_GameCorner_EventScript_TM24 + case 4, MauvilleCity_GameCorner_EventScript_TM13 + case 5, MauvilleCity_GameCorner_EventScript_CancelTMSelect + goto MauvilleCity_GameCorner_EventScript_CancelTMSelect end -MauvilleCity_GameCorner_EventScript_20FF2B:: @ 820FF2B +MauvilleCity_GameCorner_EventScript_TM32:: @ 820FF2B setvar VAR_TEMP_1, 1 bufferitemname 0, ITEM_TM32 - setvar VAR_0x8004, 320 - goto MauvilleCity_GameCorner_EventScript_20FF8A + setvar VAR_0x8004, ITEM_TM32 + goto MauvilleCity_GameCorner_EventScript_ConfirmTMPrize -MauvilleCity_GameCorner_EventScript_20FF3E:: @ 820FF3E +MauvilleCity_GameCorner_EventScript_TM29:: @ 820FF3E setvar VAR_TEMP_1, 2 bufferitemname 0, ITEM_TM29 - setvar VAR_0x8004, 317 - goto MauvilleCity_GameCorner_EventScript_20FF8A + setvar VAR_0x8004, ITEM_TM29 + goto MauvilleCity_GameCorner_EventScript_ConfirmTMPrize -MauvilleCity_GameCorner_EventScript_20FF51:: @ 820FF51 +MauvilleCity_GameCorner_EventScript_TM35:: @ 820FF51 setvar VAR_TEMP_1, 3 bufferitemname 0, ITEM_TM35 - setvar VAR_0x8004, 323 - goto MauvilleCity_GameCorner_EventScript_20FF8A + setvar VAR_0x8004, ITEM_TM35 + goto MauvilleCity_GameCorner_EventScript_ConfirmTMPrize -MauvilleCity_GameCorner_EventScript_20FF64:: @ 820FF64 +MauvilleCity_GameCorner_EventScript_TM24:: @ 820FF64 setvar VAR_TEMP_1, 4 bufferitemname 0, ITEM_TM24 - setvar VAR_0x8004, 312 - goto MauvilleCity_GameCorner_EventScript_20FF8A + setvar VAR_0x8004, ITEM_TM24 + goto MauvilleCity_GameCorner_EventScript_ConfirmTMPrize -MauvilleCity_GameCorner_EventScript_20FF77:: @ 820FF77 +MauvilleCity_GameCorner_EventScript_TM13:: @ 820FF77 setvar VAR_TEMP_1, 5 bufferitemname 0, ITEM_TM13 - setvar VAR_0x8004, 301 - goto MauvilleCity_GameCorner_EventScript_20FF8A + setvar VAR_0x8004, ITEM_TM13 + goto MauvilleCity_GameCorner_EventScript_ConfirmTMPrize -MauvilleCity_GameCorner_EventScript_20FF8A:: @ 820FF8A +MauvilleCity_GameCorner_EventScript_ConfirmTMPrize:: @ 820FF8A special BufferTMHMMoveName - msgbox MauvilleCity_GameCorner_Text_210629, MSGBOX_YESNO + msgbox MauvilleCity_GameCorner_Text_SoYourChoiceIsTheTMX, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq MauvilleCity_GameCorner_EventScript_210118 + goto_if_eq MauvilleCity_GameCorner_EventScript_CancelTMSelect switch VAR_TEMP_1 - case 1, MauvilleCity_GameCorner_EventScript_20FFDD - case 2, MauvilleCity_GameCorner_EventScript_210017 - case 3, MauvilleCity_GameCorner_EventScript_210051 - case 4, MauvilleCity_GameCorner_EventScript_21008B - case 5, MauvilleCity_GameCorner_EventScript_2100C5 + case 1, MauvilleCity_GameCorner_EventScript_BuyTM32 + case 2, MauvilleCity_GameCorner_EventScript_BuyTM29 + case 3, MauvilleCity_GameCorner_EventScript_BuyTM35 + case 4, MauvilleCity_GameCorner_EventScript_BuyTM24 + case 5, MauvilleCity_GameCorner_EventScript_BuyTM13 end -MauvilleCity_GameCorner_EventScript_20FFDD:: @ 820FFDD +MauvilleCity_GameCorner_EventScript_BuyTM32:: @ 820FFDD checkcoins VAR_TEMP_2 - compare VAR_TEMP_2, 1500 - goto_if_lt MauvilleCity_GameCorner_EventScript_2100FF + compare VAR_TEMP_2, TM32_COINS + goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM checkitemspace ITEM_TM32, 1 - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_21010D - takecoins 1500 + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForTM + takecoins TM32_COINS giveitem ITEM_TM32, 1 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_21071B, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_20FECE + msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize end -MauvilleCity_GameCorner_EventScript_210017:: @ 8210017 +MauvilleCity_GameCorner_EventScript_BuyTM29:: @ 8210017 checkcoins VAR_TEMP_2 - compare VAR_TEMP_2, 3500 - goto_if_lt MauvilleCity_GameCorner_EventScript_2100FF + compare VAR_TEMP_2, TM29_COINS + goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM checkitemspace ITEM_TM29, 1 - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_21010D - takecoins 3500 + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForTM + takecoins TM29_COINS giveitem ITEM_TM29, 1 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_21071B, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_20FECE + msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize end -MauvilleCity_GameCorner_EventScript_210051:: @ 8210051 +MauvilleCity_GameCorner_EventScript_BuyTM35:: @ 8210051 checkcoins VAR_TEMP_2 - compare VAR_TEMP_2, 4000 - goto_if_lt MauvilleCity_GameCorner_EventScript_2100FF + compare VAR_TEMP_2, TM35_COINS + goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM checkitemspace ITEM_TM35, 1 - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_21010D - takecoins 4000 + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForTM + takecoins TM35_COINS giveitem ITEM_TM35, 1 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_21071B, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_20FECE + msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize end -MauvilleCity_GameCorner_EventScript_21008B:: @ 821008B +MauvilleCity_GameCorner_EventScript_BuyTM24:: @ 821008B checkcoins VAR_TEMP_2 - compare VAR_TEMP_2, 4000 - goto_if_lt MauvilleCity_GameCorner_EventScript_2100FF + compare VAR_TEMP_2, TM24_COINS + goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM checkitemspace ITEM_TM24, 1 - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_21010D - takecoins 4000 + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForTM + takecoins TM24_COINS giveitem ITEM_TM24, 1 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_21071B, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_20FECE + msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize end -MauvilleCity_GameCorner_EventScript_2100C5:: @ 82100C5 +MauvilleCity_GameCorner_EventScript_BuyTM13:: @ 82100C5 checkcoins VAR_TEMP_2 - compare VAR_TEMP_2, 4000 - goto_if_lt MauvilleCity_GameCorner_EventScript_2100FF + compare VAR_TEMP_2, TM13_COINS + goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM checkitemspace ITEM_TM13, 1 - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_21010D - takecoins 4000 + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForTM + takecoins TM13_COINS giveitem ITEM_TM13, 1 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_21071B, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_20FECE + msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize end -MauvilleCity_GameCorner_EventScript_2100FF:: @ 82100FF - msgbox MauvilleCity_GameCorner_Text_210673, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_20FECE +MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM:: @ 82100FF + msgbox MauvilleCity_GameCorner_Text_NotEnoughCoins, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize end -MauvilleCity_GameCorner_EventScript_21010D:: @ 821010D +MauvilleCity_GameCorner_EventScript_NoRoomForTM:: @ 821010D call Common_EventScript_BagIsFull - goto MauvilleCity_GameCorner_EventScript_20FECE + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize end -MauvilleCity_GameCorner_EventScript_210118:: @ 8210118 - msgbox MauvilleCity_GameCorner_Text_2106BF, MSGBOX_DEFAULT +MauvilleCity_GameCorner_EventScript_CancelTMSelect:: @ 8210118 + msgbox MauvilleCity_GameCorner_Text_OhIsThatSo, MSGBOX_DEFAULT hidecoinsbox 0, 0 release end -MauvilleCity_GameCorner_EventScript_210125:: @ 8210125 - msgbox MauvilleCity_GameCorner_Text_2109D3, MSGBOX_NPC +MauvilleCity_GameCorner_EventScript_Woman2:: @ 8210125 + msgbox MauvilleCity_GameCorner_Text_CoinsAreNeededToPlay, MSGBOX_NPC end -MauvilleCity_GameCorner_EventScript_21012E:: @ 821012E - msgbox MauvilleCity_GameCorner_Text_210A05, MSGBOX_NPC +MauvilleCity_GameCorner_EventScript_Gentleman:: @ 821012E + msgbox MauvilleCity_GameCorner_Text_RouletteOnlyLuck, MSGBOX_NPC end -MauvilleCity_GameCorner_EventScript_210137:: @ 8210137 +MauvilleCity_GameCorner_EventScript_Girl:: @ 8210137 lock faceplayer - goto_if_set FLAG_RECEIVED_STARTER_DOLL, MauvilleCity_GameCorner_EventScript_210213 - msgbox MauvilleCity_GameCorner_Text_210750, MSGBOX_YESNO + goto_if_set FLAG_RECEIVED_STARTER_DOLL, MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll + msgbox MauvilleCity_GameCorner_Text_GotTwoOfSameDollWantOne, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq MauvilleCity_GameCorner_EventScript_210209 + goto_if_eq MauvilleCity_GameCorner_EventScript_DeclineStarterDoll switch VAR_STARTER_MON - case 0, MauvilleCity_GameCorner_EventScript_21017C - case 1, MauvilleCity_GameCorner_EventScript_2101A6 - case 2, MauvilleCity_GameCorner_EventScript_2101D0 + case 0, MauvilleCity_GameCorner_EventScript_GiveTreeckoDoll + case 1, MauvilleCity_GameCorner_EventScript_GiveTorchicDoll + case 2, MauvilleCity_GameCorner_EventScript_GiveMudkipDoll end -MauvilleCity_GameCorner_EventScript_21017C:: @ 821017C +MauvilleCity_GameCorner_EventScript_GiveTreeckoDoll:: @ 821017C bufferdecorationname 1, DECOR_TREECKO_DOLL checkdecorspace DECOR_TREECKO_DOLL - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_2101FA - msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForStarterDoll + msgbox MauvilleCity_GameCorner_Text_HereYouGo2, MSGBOX_DEFAULT givedecoration_std DECOR_TREECKO_DOLL setflag FLAG_RECEIVED_STARTER_DOLL - goto MauvilleCity_GameCorner_EventScript_210213 + goto MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll end -MauvilleCity_GameCorner_EventScript_2101A6:: @ 82101A6 +MauvilleCity_GameCorner_EventScript_GiveTorchicDoll:: @ 82101A6 bufferdecorationname 1, DECOR_TORCHIC_DOLL checkdecorspace DECOR_TORCHIC_DOLL - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_2101FA - msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForStarterDoll + msgbox MauvilleCity_GameCorner_Text_HereYouGo2, MSGBOX_DEFAULT givedecoration_std DECOR_TORCHIC_DOLL setflag FLAG_RECEIVED_STARTER_DOLL - goto MauvilleCity_GameCorner_EventScript_210213 + goto MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll end -MauvilleCity_GameCorner_EventScript_2101D0:: @ 82101D0 +MauvilleCity_GameCorner_EventScript_GiveMudkipDoll:: @ 82101D0 bufferdecorationname 1, DECOR_MUDKIP_DOLL checkdecorspace DECOR_MUDKIP_DOLL - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_2101FA - msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForStarterDoll + msgbox MauvilleCity_GameCorner_Text_HereYouGo2, MSGBOX_DEFAULT givedecoration_std DECOR_MUDKIP_DOLL setflag FLAG_RECEIVED_STARTER_DOLL - goto MauvilleCity_GameCorner_EventScript_210213 + goto MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll end -MauvilleCity_GameCorner_EventScript_2101FA:: @ 82101FA +MauvilleCity_GameCorner_EventScript_NoRoomForStarterDoll:: @ 82101FA call Common_EventScript_NoRoomForDecor - msgbox MauvilleCity_GameCorner_Text_2107A9, MSGBOX_DEFAULT + msgbox MauvilleCity_GameCorner_Text_YouWantItButNotNow, MSGBOX_DEFAULT release end -MauvilleCity_GameCorner_EventScript_210209:: @ 8210209 - msgbox MauvilleCity_GameCorner_Text_2107CE, MSGBOX_DEFAULT +MauvilleCity_GameCorner_EventScript_DeclineStarterDoll:: @ 8210209 + msgbox MauvilleCity_GameCorner_Text_DontBeNegative, MSGBOX_DEFAULT release end -MauvilleCity_GameCorner_EventScript_210213:: @ 8210213 - msgbox MauvilleCity_GameCorner_Text_2107FB, MSGBOX_DEFAULT +MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll:: @ 8210213 + msgbox MauvilleCity_GameCorner_Text_CantWinJackpot, MSGBOX_DEFAULT release end -MauvilleCity_GameCorner_EventScript_21021D:: @ 821021D +MauvilleCity_GameCorner_EventScript_PokefanM:: @ 821021D lock faceplayer checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_GameCorner_EventScript_21023D - msgbox MauvilleCity_GameCorner_Text_210830, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_2102A9 + compare VAR_RESULT, TRUE + goto_if_eq MauvilleCity_GameCorner_EventScript_TryGive20Coins + msgbox MauvilleCity_GameCorner_Text_NeedCoinCaseGoNextDoor, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots end -MauvilleCity_GameCorner_EventScript_21023D:: @ 821023D - goto_if_set FLAG_RECEIVED_20_COINS, MauvilleCity_GameCorner_EventScript_21026B +MauvilleCity_GameCorner_EventScript_TryGive20Coins:: @ 821023D + goto_if_set FLAG_RECEIVED_20_COINS, MauvilleCity_GameCorner_EventScript_PokefanMNormal checkcoins VAR_TEMP_1 - compare VAR_TEMP_1, 1 - goto_if_ge MauvilleCity_GameCorner_EventScript_21026B + compare VAR_TEMP_1, 1 @ Only give 20 coins if player has no coins + goto_if_ge MauvilleCity_GameCorner_EventScript_PokefanMNormal setflag FLAG_RECEIVED_20_COINS givecoins 20 - msgbox MauvilleCity_GameCorner_Text_2108A0, MSGBOX_DEFAULT + msgbox MauvilleCity_GameCorner_Text_LuckOnlyLastSoLongTakeCoins, MSGBOX_DEFAULT playse SE_REGI - goto MauvilleCity_GameCorner_EventScript_21026B + goto MauvilleCity_GameCorner_EventScript_PokefanMNormal end -MauvilleCity_GameCorner_EventScript_21026B:: @ 821026B - msgbox MauvilleCity_GameCorner_Text_2108EF, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_2102A9 +MauvilleCity_GameCorner_EventScript_PokefanMNormal:: @ 821026B + msgbox MauvilleCity_GameCorner_Text_MauvilleSomethingForEveryone, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots end -MauvilleCity_GameCorner_EventScript_210279:: @ 8210279 +MauvilleCity_GameCorner_EventScript_OldMan:: @ 8210279 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_210932, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_2102A9 + msgbox MauvilleCity_GameCorner_Text_RouletteTablesDifferentRates, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots end -MauvilleCity_GameCorner_EventScript_210289:: @ 8210289 +MauvilleCity_GameCorner_EventScript_Cook:: @ 8210289 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_21098E, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_2102A9 + msgbox MauvilleCity_GameCorner_Text_EasyToLoseTrackOfTime, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots end -MauvilleCity_GameCorner_EventScript_210299:: @ 8210299 +MauvilleCity_GameCorner_EventScript_Man:: @ 8210299 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_210A51, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_2102A9 + msgbox MauvilleCity_GameCorner_Text_UpTo3CoinsCanBeUsed, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots end -MauvilleCity_GameCorner_EventScript_2102A9:: @ 82102A9 +MauvilleCity_GameCorner_EventScript_NPCReturnToSlots:: @ 82102A9 closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -MauvilleCity_GameCorner_EventScript_2102B6:: @ 82102B6 +MauvilleCity_GameCorner_EventScript_Maniac:: @ 82102B6 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_210A82, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_2102A9 + msgbox MauvilleCity_GameCorner_Text_DifficultToStopOn7, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots end -MauvilleCity_GameCorner_EventScript_2102C6:: @ 82102C6 +MauvilleCity_GameCorner_EventScript_Woman:: @ 82102C6 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_210B04, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_2102A9 + msgbox MauvilleCity_GameCorner_Text_HeresSomeSlotsInfo, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots end -MauvilleCity_GameCorner_EventScript_2102D6:: @ 82102D6 +MauvilleCity_GameCorner_EventScript_SlotMachine0:: @ 82102D6 lockall checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 0 specialvar VAR_RESULT, GetSlotMachineId @@ -541,10 +543,10 @@ MauvilleCity_GameCorner_EventScript_2102D6:: @ 82102D6 releaseall end -MauvilleCity_GameCorner_EventScript_2102F6:: @ 82102F6 +MauvilleCity_GameCorner_EventScript_SlotMachine1:: @ 82102F6 lockall checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 1 specialvar VAR_RESULT, GetSlotMachineId @@ -552,10 +554,10 @@ MauvilleCity_GameCorner_EventScript_2102F6:: @ 82102F6 releaseall end -MauvilleCity_GameCorner_EventScript_210316:: @ 8210316 +MauvilleCity_GameCorner_EventScript_SlotMachine2:: @ 8210316 lockall checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 2 specialvar VAR_RESULT, GetSlotMachineId @@ -563,10 +565,10 @@ MauvilleCity_GameCorner_EventScript_210316:: @ 8210316 releaseall end -MauvilleCity_GameCorner_EventScript_210336:: @ 8210336 +MauvilleCity_GameCorner_EventScript_SlotMachine3:: @ 8210336 lockall checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 3 specialvar VAR_RESULT, GetSlotMachineId @@ -574,10 +576,10 @@ MauvilleCity_GameCorner_EventScript_210336:: @ 8210336 releaseall end -MauvilleCity_GameCorner_EventScript_210356:: @ 8210356 +MauvilleCity_GameCorner_EventScript_SlotMachine4:: @ 8210356 lockall checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 4 specialvar VAR_RESULT, GetSlotMachineId @@ -585,10 +587,10 @@ MauvilleCity_GameCorner_EventScript_210356:: @ 8210356 releaseall end -MauvilleCity_GameCorner_EventScript_210376:: @ 8210376 +MauvilleCity_GameCorner_EventScript_SlotMachine5:: @ 8210376 lockall checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 5 specialvar VAR_RESULT, GetSlotMachineId @@ -596,10 +598,10 @@ MauvilleCity_GameCorner_EventScript_210376:: @ 8210376 releaseall end -MauvilleCity_GameCorner_EventScript_210396:: @ 8210396 +MauvilleCity_GameCorner_EventScript_SlotMachine6:: @ 8210396 lockall checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 6 specialvar VAR_RESULT, GetSlotMachineId @@ -607,10 +609,10 @@ MauvilleCity_GameCorner_EventScript_210396:: @ 8210396 releaseall end -MauvilleCity_GameCorner_EventScript_2103B6:: @ 82103B6 +MauvilleCity_GameCorner_EventScript_SlotMachine7:: @ 82103B6 lockall checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 7 specialvar VAR_RESULT, GetSlotMachineId @@ -618,10 +620,10 @@ MauvilleCity_GameCorner_EventScript_2103B6:: @ 82103B6 releaseall end -MauvilleCity_GameCorner_EventScript_2103D6:: @ 82103D6 +MauvilleCity_GameCorner_EventScript_SlotMachine8:: @ 82103D6 lockall checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 8 specialvar VAR_RESULT, GetSlotMachineId @@ -629,10 +631,10 @@ MauvilleCity_GameCorner_EventScript_2103D6:: @ 82103D6 releaseall end -MauvilleCity_GameCorner_EventScript_2103F6:: @ 82103F6 +MauvilleCity_GameCorner_EventScript_SlotMachine9:: @ 82103F6 lockall checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 9 specialvar VAR_RESULT, GetSlotMachineId @@ -640,10 +642,10 @@ MauvilleCity_GameCorner_EventScript_2103F6:: @ 82103F6 releaseall end -MauvilleCity_GameCorner_EventScript_210416:: @ 8210416 +MauvilleCity_GameCorner_EventScript_SlotMachine10:: @ 8210416 lockall checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 10 specialvar VAR_RESULT, GetSlotMachineId @@ -651,10 +653,10 @@ MauvilleCity_GameCorner_EventScript_210416:: @ 8210416 releaseall end -MauvilleCity_GameCorner_EventScript_210436:: @ 8210436 +MauvilleCity_GameCorner_EventScript_SlotMachine11:: @ 8210436 lockall checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 11 specialvar VAR_RESULT, GetSlotMachineId @@ -667,139 +669,141 @@ MauvilleCity_GameCorner_EventScript_NoCoinCase:: @ 8210456 releaseall end -MauvilleCity_GameCorner_Text_210460: @ 8210460 +MauvilleCity_GameCorner_Text_ThisIsMauvilleGameCorner: @ 8210460 .string "This is MAUVILLE GAME CORNER.$" -MauvilleCity_GameCorner_Text_21047E: @ 821047E +MauvilleCity_GameCorner_Text_NeedCoinCaseForCoins: @ 821047E .string "Okay, you wanted some COINS for\n" .string "the games?\p" .string "But you don't have a COIN CASE for\n" .string "stowing the COINS.$" -MauvilleCity_GameCorner_Text_2104DF: @ 82104DF +MauvilleCity_GameCorner_Text_WereYouLookingForCoins: @ 82104DF .string "Were you looking for COINS?\p" .string "It's ¥1000 for 50 COINS.\n" .string "Would you like some?$" -MauvilleCity_GameCorner_Text_210529: @ 8210529 +MauvilleCity_GameCorner_Text_ThankYouHereAreYourCoins: @ 8210529 .string "Thank you very much!\n" .string "Here are your COINS!$" -MauvilleCity_GameCorner_Text_210553: @ 8210553 +MauvilleCity_GameCorner_Text_DontHaveEnoughMoney: @ 8210553 .string "Um… You don't appear to have\n" .string "enough money…$" -MauvilleCity_GameCorner_Text_21057E: @ 821057E +MauvilleCity_GameCorner_Text_CoinCaseIsFull: @ 821057E .string "Oh?\n" .string "Your COIN CASE is full.$" -MauvilleCity_GameCorner_Text_21059A: @ 821059A +MauvilleCity_GameCorner_Text_DontNeedCoinsThen: @ 821059A .string "Oh… You don't need COINS, then?\n" .string "Good luck on your adventure!$" -MauvilleCity_GameCorner_Text_2105D7: @ 82105D7 +MauvilleCity_GameCorner_Text_ExchangeCoinsForPrizes: @ 82105D7 .string "Welcome.\p" .string "You can exchange your COINS for\n" .string "prizes here.$" -MauvilleCity_GameCorner_Text_21060D: @ 821060D +MauvilleCity_GameCorner_Text_WhichPrize: @ 821060D .string "Which prize would you like?$" -MauvilleCity_GameCorner_Text_210629: @ 8210629 +MauvilleCity_GameCorner_Text_SoYourChoiceIsTheTMX: @ 8210629 .string "So your choice is\n" .string "the {STR_VAR_1} {STR_VAR_2}?$" -MauvilleCity_GameCorner_Text_210646: @ 8210646 +MauvilleCity_GameCorner_Text_SendToYourHomePC: @ 8210646 .string "Thank you!\n" .string "We'll send it to your PC at home.$" -MauvilleCity_GameCorner_Text_210673: @ 8210673 +MauvilleCity_GameCorner_Text_NotEnoughCoins: @ 8210673 .string "You don't have enough COINS.$" -MauvilleCity_GameCorner_Text_210690: @ 8210690 +@ Unused +MauvilleCity_GameCorner_Text_NoRoomForPlacingDecor: @ 8210690 .string "There isn't any room available for\n" .string "placing {STR_VAR_1}.$" -MauvilleCity_GameCorner_Text_2106BF: @ 82106BF +MauvilleCity_GameCorner_Text_OhIsThatSo: @ 82106BF .string "Oh, is that so? \n" .string "You need to save some COINS before\l" .string "coming back here.$" -MauvilleCity_GameCorner_Text_210705: @ 8210705 +MauvilleCity_GameCorner_Text_SoYourChoiceIsX: @ 8210705 .string "So your choice is {STR_VAR_1}?$" -MauvilleCity_GameCorner_Text_21071B: @ 821071B +MauvilleCity_GameCorner_Text_HereYouGo: @ 821071B .string "Here you go!$" -MauvilleCity_GameCorner_Text_210728: @ 8210728 +@ Unused +MauvilleCity_GameCorner_Text_CantCarryAnyMore: @ 8210728 .string "Oh, you can't carry any more than that.$" -MauvilleCity_GameCorner_Text_210750: @ 8210750 +MauvilleCity_GameCorner_Text_GotTwoOfSameDollWantOne: @ 8210750 .string "I made a mistake and got two of\n" .string "the same DOLLS.\p" .string "Would you like one of them?$" -MauvilleCity_GameCorner_Text_21079C: @ 821079C +MauvilleCity_GameCorner_Text_HereYouGo2: @ 821079C .string "Here you go!$" -MauvilleCity_GameCorner_Text_2107A9: @ 82107A9 +MauvilleCity_GameCorner_Text_YouWantItButNotNow: @ 82107A9 .string "Huh?\n" .string "You want it, but not right now?$" -MauvilleCity_GameCorner_Text_2107CE: @ 82107CE +MauvilleCity_GameCorner_Text_DontBeNegative: @ 82107CE .string "Oh, don't be so negative!\n" .string "You can have this!$" -MauvilleCity_GameCorner_Text_2107FB: @ 82107FB +MauvilleCity_GameCorner_Text_CantWinJackpot: @ 82107FB .string "There's a prize I want, but I can't win\n" .string "the jackpot.$" -MauvilleCity_GameCorner_Text_210830: @ 8210830 +MauvilleCity_GameCorner_Text_NeedCoinCaseGoNextDoor: @ 8210830 .string "Hey, kid, if you want to play here,\n" .string "you need a COIN CASE.\p" .string "I think the young lady next door\n" .string "had one. Go see her!$" -MauvilleCity_GameCorner_Text_2108A0: @ 82108A0 +MauvilleCity_GameCorner_Text_LuckOnlyLastSoLongTakeCoins: @ 82108A0 .string "My luck can only last so long.\n" .string "This is too much for me.\l" .string "Here, take some COINS!$" -MauvilleCity_GameCorner_Text_2108EF: @ 82108EF +MauvilleCity_GameCorner_Text_MauvilleSomethingForEveryone: @ 82108EF .string "MAUVILLE has something for\n" .string "everyone.\p" .string "For me, it's the GAME CORNER.$" -MauvilleCity_GameCorner_Text_210932: @ 8210932 +MauvilleCity_GameCorner_Text_RouletteTablesDifferentRates: @ 8210932 .string "The ROULETTE tables have different\n" .string "rates.\p" .string "Check your COINS if you're going to\n" .string "pick a table.$" -MauvilleCity_GameCorner_Text_21098E: @ 821098E +MauvilleCity_GameCorner_Text_EasyToLoseTrackOfTime: @ 821098E .string "It's easy to lose track of time in here. \n" .string "I should get back to work.$" -MauvilleCity_GameCorner_Text_2109D3: @ 82109D3 +MauvilleCity_GameCorner_Text_CoinsAreNeededToPlay: @ 82109D3 .string "COINS are needed to play here\n" .string "in the GAME CORNER.$" -MauvilleCity_GameCorner_Text_210A05: @ 8210A05 +MauvilleCity_GameCorner_Text_RouletteOnlyLuck: @ 8210A05 .string "This ROULETTE thing…\n" .string "It's rather demanding.\p" .string "Win or lose, it's only by luck.$" -MauvilleCity_GameCorner_Text_210A51: @ 8210A51 +MauvilleCity_GameCorner_Text_UpTo3CoinsCanBeUsed: @ 8210A51 .string "Up to three COINS can be used to play\n" .string "the SLOTS.$" -MauvilleCity_GameCorner_Text_210A82: @ 8210A82 +MauvilleCity_GameCorner_Text_DifficultToStopOn7: @ 8210A82 .string "It's very difficult to make it stop\n" .string "right on “7.”\p" .string "If it stops on “7” during the REEL TIME\n" .string "bonus game, you'll receive extra COINS.$" -MauvilleCity_GameCorner_Text_210B04: @ 8210B04 +MauvilleCity_GameCorner_Text_HeresSomeSlotsInfo: @ 8210B04 .string "Here's some information for you\n" .string "about the SLOTS.\p" .string "The more lightning bolts you stock,\n" diff --git a/data/maps/MauvilleCity_House1/map.json b/data/maps/MauvilleCity_House1/map.json index d7e148b31..9df540885 100644 --- a/data/maps/MauvilleCity_House1/map.json +++ b/data/maps/MauvilleCity_House1/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_House1_EventScript_20F976", + "script": "MauvilleCity_House1_EventScript_RockSmashDude", "flag": "0" } ], diff --git a/data/maps/MauvilleCity_House1/scripts.inc b/data/maps/MauvilleCity_House1/scripts.inc index 50f84d87c..eff01eb94 100644 --- a/data/maps/MauvilleCity_House1/scripts.inc +++ b/data/maps/MauvilleCity_House1/scripts.inc @@ -1,24 +1,24 @@ MauvilleCity_House1_MapScripts:: @ 820F975 .byte 0 -MauvilleCity_House1_EventScript_20F976:: @ 820F976 +MauvilleCity_House1_EventScript_RockSmashDude:: @ 820F976 lock faceplayer - goto_if_set FLAG_RECEIVED_HM06, MauvilleCity_House1_EventScript_20F9A5 - msgbox MauvilleCity_House1_Text_20F9AF, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_HM06, MauvilleCity_House1_EventScript_ReceivedRockSmash + msgbox MauvilleCity_House1_Text_ImRockSmashDudeTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_HM06 setflag FLAG_RECEIVED_HM06 setflag FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY - msgbox MauvilleCity_House1_Text_20FAA9, MSGBOX_DEFAULT + msgbox MauvilleCity_House1_Text_ExplainRockSmash, MSGBOX_DEFAULT release end -MauvilleCity_House1_EventScript_20F9A5:: @ 820F9A5 - msgbox MauvilleCity_House1_Text_20FB67, MSGBOX_DEFAULT +MauvilleCity_House1_EventScript_ReceivedRockSmash:: @ 820F9A5 + msgbox MauvilleCity_House1_Text_MonCanFlyOutOfSmashedRock, MSGBOX_DEFAULT release end -MauvilleCity_House1_Text_20F9AF: @ 820F9AF +MauvilleCity_House1_Text_ImRockSmashDudeTakeThis: @ 820F9AF .string "Woohoo!\p" .string "I hear people call me the ROCK SMASH\n" .string "GUY, but I find that sort of degrading.\p" @@ -30,7 +30,7 @@ MauvilleCity_House1_Text_20F9AF: @ 820F9AF .string "I like that!\n" .string "Here, take this HIDDEN MACHINE!$" -MauvilleCity_House1_Text_20FAA9: @ 820FAA9 +MauvilleCity_House1_Text_ExplainRockSmash: @ 820FAA9 .string "That HM contains ROCK SMASH.\p" .string "If you come across large boulders\n" .string "that block your path…\p" @@ -39,7 +39,7 @@ MauvilleCity_House1_Text_20FAA9: @ 820FAA9 .string "Yes, sir! Smash rocks aside, I say!\n" .string "Woohoo!$" -MauvilleCity_House1_Text_20FB67: @ 820FB67 +MauvilleCity_House1_Text_MonCanFlyOutOfSmashedRock: @ 820FB67 .string "Oh, yes, if you smash a rock, a POKéMON\n" .string "could come flying out of hiding.\p" .string "Woohoo!$" diff --git a/data/maps/MauvilleCity_House2/map.json b/data/maps/MauvilleCity_House2/map.json index 272b60f0f..acdb4f504 100644 --- a/data/maps/MauvilleCity_House2/map.json +++ b/data/maps/MauvilleCity_House2/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_House2_EventScript_210C5D", + "script": "MauvilleCity_House2_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/MauvilleCity_House2/scripts.inc b/data/maps/MauvilleCity_House2/scripts.inc index e0b6a404f..5dbf5d411 100644 --- a/data/maps/MauvilleCity_House2/scripts.inc +++ b/data/maps/MauvilleCity_House2/scripts.inc @@ -1,67 +1,67 @@ MauvilleCity_House2_MapScripts:: @ 8210C5C .byte 0 -MauvilleCity_House2_EventScript_210C5D:: @ 8210C5D +MauvilleCity_House2_EventScript_Woman:: @ 8210C5D lock faceplayer - goto_if_set FLAG_RECEIVED_COIN_CASE, MauvilleCity_House2_EventScript_210CDA - msgbox MauvilleCity_House2_Text_210CEE, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_COIN_CASE, MauvilleCity_House2_EventScript_ReceivedCoinCase + msgbox MauvilleCity_House2_Text_BuyHarborMailAtSlateport, MSGBOX_DEFAULT checkitem ITEM_HARBOR_MAIL, 1 - compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_House2_EventScript_210C82 + compare VAR_RESULT, TRUE + goto_if_eq MauvilleCity_House2_EventScript_AskToTradeForHarborMail release end -MauvilleCity_House2_EventScript_210C82:: @ 8210C82 +MauvilleCity_House2_EventScript_AskToTradeForHarborMail:: @ 8210C82 playse SE_PIN applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark waitmovement 0 applymovement VAR_LAST_TALKED, Common_Movement_Delay48 waitmovement 0 - msgbox MauvilleCity_House2_Text_210D76, MSGBOX_YESNO + msgbox MauvilleCity_House2_Text_TradeHarborMailForCoinCase, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq MauvilleCity_House2_EventScript_210CB8 + goto_if_eq MauvilleCity_House2_EventScript_AcceptTrade compare VAR_RESULT, NO - goto_if_eq MauvilleCity_House2_EventScript_210CE4 + goto_if_eq MauvilleCity_House2_EventScript_DeclineTrade end -MauvilleCity_House2_EventScript_210CB8:: @ 8210CB8 - msgbox MauvilleCity_House2_Text_210DB3, MSGBOX_DEFAULT +MauvilleCity_House2_EventScript_AcceptTrade:: @ 8210CB8 + msgbox MauvilleCity_House2_Text_IllTradeYouCoinCase, MSGBOX_DEFAULT takeitem ITEM_HARBOR_MAIL, 1 giveitem_std ITEM_COIN_CASE setflag FLAG_RECEIVED_COIN_CASE - goto MauvilleCity_House2_EventScript_210CDA + goto MauvilleCity_House2_EventScript_ReceivedCoinCase end -MauvilleCity_House2_EventScript_210CDA:: @ 8210CDA - msgbox MauvilleCity_House2_Text_210DE7, MSGBOX_DEFAULT +MauvilleCity_House2_EventScript_ReceivedCoinCase:: @ 8210CDA + msgbox MauvilleCity_House2_Text_UseCoinCaseAtGameCorner, MSGBOX_DEFAULT release end -MauvilleCity_House2_EventScript_210CE4:: @ 8210CE4 - msgbox MauvilleCity_House2_Text_210E16, MSGBOX_DEFAULT +MauvilleCity_House2_EventScript_DeclineTrade:: @ 8210CE4 + msgbox MauvilleCity_House2_Text_ThatsDisappointing, MSGBOX_DEFAULT release end -MauvilleCity_House2_Text_210CEE: @ 8210CEE +MauvilleCity_House2_Text_BuyHarborMailAtSlateport: @ 8210CEE .string "If I had a BIKE, it'd be easy to cycle to\n" .string "SLATEPORT for some shopping.\p" .string "I'd be able to buy HARBOR MAIL at the\n" .string "POKéMON MART in SLATEPORT…$" -MauvilleCity_House2_Text_210D76: @ 8210D76 +MauvilleCity_House2_Text_TradeHarborMailForCoinCase: @ 8210D76 .string "Oh! You have HARBOR MAIL?\n" .string "Will you trade it for a COIN CASE?$" -MauvilleCity_House2_Text_210DB3: @ 8210DB3 +MauvilleCity_House2_Text_IllTradeYouCoinCase: @ 8210DB3 .string "Oh, I'm so happy!\n" .string "Okay, I'll trade you a COIN CASE!$" -MauvilleCity_House2_Text_210DE7: @ 8210DE7 +MauvilleCity_House2_Text_UseCoinCaseAtGameCorner: @ 8210DE7 .string "That COIN CASE can be used\n" .string "at the GAME CORNER.$" -MauvilleCity_House2_Text_210E16: @ 8210E16 +MauvilleCity_House2_Text_ThatsDisappointing: @ 8210E16 .string "Oh, that's disappointing.\p" .string "A COIN CASE is needed for the\n" .string "GAME CORNER.$" diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json index 200c03e86..46e031857 100644 --- a/data/maps/MeteorFalls_1F_1R/map.json +++ b/data/maps/MeteorFalls_1F_1R/map.json @@ -141,7 +141,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MeteorFalls_1F_1R_EventScript_22BF25", + "script": "MeteorFalls_1F_1R_EventScript_ProfCozmo", "flag": "FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO" } ], @@ -197,7 +197,7 @@ "elevation": 4, "var": "VAR_METEOR_FALLS_STATE", "var_value": "0", - "script": "MeteorFalls_1F_1R_EventScript_22BD5F" + "script": "MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene" } ], "bg_events": [ diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index dc81427bc..ad3eb3eb8 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -1,19 +1,19 @@ MeteorFalls_1F_1R_MapScripts:: @ 822BD2A - map_script MAP_SCRIPT_ON_LOAD, MeteorFalls_1F_1R_MapScript1_22BD30 + map_script MAP_SCRIPT_ON_LOAD, MeteorFalls_1F_1R_OnLoad .byte 0 -MeteorFalls_1F_1R_MapScript1_22BD30: @ 822BD30 - call_if_set FLAG_SYS_GAME_CLEAR, MeteorFalls_1F_1R_EventScript_22BD3A +MeteorFalls_1F_1R_OnLoad: @ 822BD30 + call_if_set FLAG_SYS_GAME_CLEAR, MeteorFalls_1F_1R_EventScript_OpenStevensCave end -MeteorFalls_1F_1R_EventScript_22BD3A:: @ 822BD3A +MeteorFalls_1F_1R_EventScript_OpenStevensCave:: @ 822BD3A setmetatile 4, 1, METATILE_MeteorFalls_CaveEntrance_Top, 1 setmetatile 3, 2, METATILE_MeteorFalls_CaveEntrance_Left, 1 setmetatile 4, 2, METATILE_MeteorFalls_CaveEntrance_Bottom, 0 setmetatile 5, 2, METATILE_MeteorFalls_CaveEntrance_Right, 1 return -MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F +MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene:: @ 822BD5F lockall playbgm MUS_MGM0, 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceDown @@ -21,7 +21,7 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F delay 30 applymovement 5, Common_Movement_WalkInPlaceDown waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22BF47, MSGBOX_DEFAULT + msgbox MeteorFalls_1F_1R_Text_WithThisMeteorite, MSGBOX_DEFAULT closemessage applymovement 5, Common_Movement_WalkInPlaceFastestUp applymovement 6, Common_Movement_WalkInPlaceFastestUp @@ -31,11 +31,11 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F waitmovement 0 applymovement 5, Common_Movement_Delay48 waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22BF84, MSGBOX_DEFAULT + msgbox MeteorFalls_1F_1R_Text_DontExpectMercyFromMagma, MSGBOX_DEFAULT closemessage - applymovement 5, MeteorFalls_1F_1R_Movement_22BEC0 + applymovement 5, MeteorFalls_1F_1R_Movement_MagmaGruntApproachPlayer waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22BFE4, MSGBOX_DEFAULT + msgbox MeteorFalls_1F_1R_Text_HoldItRightThereMagma, MSGBOX_DEFAULT closemessage applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement 5, Common_Movement_WalkInPlaceFastestLeft @@ -45,39 +45,39 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F addobject 8 addobject 9 playbgm MUS_AQA_0, 0 - applymovement 7, MeteorFalls_1F_1R_Movement_22BED9 - applymovement 8, MeteorFalls_1F_1R_Movement_22BEE0 - applymovement 9, MeteorFalls_1F_1R_Movement_22BEE8 + applymovement 7, MeteorFalls_1F_1R_Movement_ArchieArrive + applymovement 8, MeteorFalls_1F_1R_Movement_AquaGrunt1Arrive + applymovement 9, MeteorFalls_1F_1R_Movement_AquaGrunt2Arrive waitmovement 0 applymovement 5, Common_Movement_WalkInPlaceFastestLeft applymovement 6, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22C04E, MSGBOX_DEFAULT + msgbox MeteorFalls_1F_1R_Text_BeSeeingYouTeamAqua, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_22BF1D - applymovement 5, MeteorFalls_1F_1R_Movement_22BEC4 - applymovement 6, MeteorFalls_1F_1R_Movement_22BECE + applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_PushPlayerOutOfWay + applymovement 5, MeteorFalls_1F_1R_Movement_MagmaGrunt1Exit + applymovement 6, MeteorFalls_1F_1R_Movement_MagmaGrunt2Exit waitmovement 0 removeobject 5 removeobject 6 - applymovement 7, MeteorFalls_1F_1R_Movement_22BEF8 + applymovement 7, MeteorFalls_1F_1R_Movement_ArchieApproachPlayer waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22C11C, MSGBOX_DEFAULT + msgbox MeteorFalls_1F_1R_Text_ArchieSeenYouBefore, MSGBOX_DEFAULT closemessage - applymovement 8, MeteorFalls_1F_1R_Movement_22BF08 - applymovement 9, MeteorFalls_1F_1R_Movement_22BF18 + applymovement 8, MeteorFalls_1F_1R_Movement_AquaGrunt1ApproachArchie + applymovement 9, MeteorFalls_1F_1R_Movement_AquaGrunt2ApproachArchie waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22C268, MSGBOX_DEFAULT + msgbox MeteorFalls_1F_1R_Text_BossWeShouldChaseMagma, MSGBOX_DEFAULT applymovement 7, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22C292, MSGBOX_DEFAULT + msgbox MeteorFalls_1F_1R_Text_ArchieYesNoTellingWhatMagmaWillDo, MSGBOX_DEFAULT applymovement 7, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22C2FC, MSGBOX_DEFAULT + msgbox MeteorFalls_1F_1R_Text_ArchieFarewell, MSGBOX_DEFAULT closemessage - applymovement 7, MeteorFalls_1F_1R_Movement_22BEF0 - applymovement 8, MeteorFalls_1F_1R_Movement_22BEFE - applymovement 9, MeteorFalls_1F_1R_Movement_22BF0D + applymovement 7, MeteorFalls_1F_1R_Movement_ArchieExit + applymovement 8, MeteorFalls_1F_1R_Movement_AquaGrunt1Exit + applymovement 9, MeteorFalls_1F_1R_Movement_AquaGrunt2Exit waitmovement 0 fadedefaultbgm removeobject 7 @@ -85,18 +85,18 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F removeobject 9 setflag FLAG_HIDE_ROUTE_112_TEAM_MAGMA setflag FLAG_MET_ARCHIE_METEOR_FALLS - setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT + setflag FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT setvar VAR_METEOR_FALLS_STATE, 1 releaseall end -MeteorFalls_1F_1R_Movement_22BEC0: @ 822BEC0 +MeteorFalls_1F_1R_Movement_MagmaGruntApproachPlayer: @ 822BEC0 walk_right walk_right walk_in_place_fastest_up step_end -MeteorFalls_1F_1R_Movement_22BEC4: @ 822BEC4 +MeteorFalls_1F_1R_Movement_MagmaGrunt1Exit: @ 822BEC4 walk_fast_up walk_fast_up walk_fast_right @@ -108,7 +108,7 @@ MeteorFalls_1F_1R_Movement_22BEC4: @ 822BEC4 walk_fast_right step_end -MeteorFalls_1F_1R_Movement_22BECE: @ 822BECE +MeteorFalls_1F_1R_Movement_MagmaGrunt2Exit: @ 822BECE walk_fast_up walk_fast_up walk_fast_up @@ -121,7 +121,7 @@ MeteorFalls_1F_1R_Movement_22BECE: @ 822BECE walk_fast_right step_end -MeteorFalls_1F_1R_Movement_22BED9: @ 822BED9 +MeteorFalls_1F_1R_Movement_ArchieArrive: @ 822BED9 walk_right walk_right walk_right @@ -130,7 +130,7 @@ MeteorFalls_1F_1R_Movement_22BED9: @ 822BED9 walk_right step_end -MeteorFalls_1F_1R_Movement_22BEE0: @ 822BEE0 +MeteorFalls_1F_1R_Movement_AquaGrunt1Arrive: @ 822BEE0 delay_16 delay_16 walk_right @@ -140,7 +140,7 @@ MeteorFalls_1F_1R_Movement_22BEE0: @ 822BEE0 walk_right step_end -MeteorFalls_1F_1R_Movement_22BEE8: @ 822BEE8 +MeteorFalls_1F_1R_Movement_AquaGrunt2Arrive: @ 822BEE8 delay_16 delay_16 walk_right @@ -150,7 +150,7 @@ MeteorFalls_1F_1R_Movement_22BEE8: @ 822BEE8 walk_right step_end -MeteorFalls_1F_1R_Movement_22BEF0: @ 822BEF0 +MeteorFalls_1F_1R_Movement_ArchieExit: @ 822BEF0 walk_right walk_right walk_right @@ -160,7 +160,7 @@ MeteorFalls_1F_1R_Movement_22BEF0: @ 822BEF0 walk_right step_end -MeteorFalls_1F_1R_Movement_22BEF8: @ 822BEF8 +MeteorFalls_1F_1R_Movement_ArchieApproachPlayer: @ 822BEF8 walk_right walk_right walk_up @@ -168,7 +168,7 @@ MeteorFalls_1F_1R_Movement_22BEF8: @ 822BEF8 walk_in_place_fastest_left step_end -MeteorFalls_1F_1R_Movement_22BEFE: @ 822BEFE +MeteorFalls_1F_1R_Movement_AquaGrunt1Exit: @ 822BEFE walk_up walk_up walk_right @@ -180,14 +180,14 @@ MeteorFalls_1F_1R_Movement_22BEFE: @ 822BEFE walk_right step_end -MeteorFalls_1F_1R_Movement_22BF08: @ 822BF08 +MeteorFalls_1F_1R_Movement_AquaGrunt1ApproachArchie: @ 822BF08 walk_right walk_right walk_right walk_in_place_fastest_up step_end -MeteorFalls_1F_1R_Movement_22BF0D: @ 822BF0D +MeteorFalls_1F_1R_Movement_AquaGrunt2Exit: @ 822BF0D walk_up walk_up walk_up @@ -200,14 +200,14 @@ MeteorFalls_1F_1R_Movement_22BF0D: @ 822BF0D walk_right step_end -MeteorFalls_1F_1R_Movement_22BF18: @ 822BF18 +MeteorFalls_1F_1R_Movement_AquaGrunt2ApproachArchie: @ 822BF18 walk_right walk_right walk_right walk_in_place_fastest_up step_end -MeteorFalls_1F_1R_Movement_22BF1D: @ 822BF1D +MeteorFalls_1F_1R_Movement_PushPlayerOutOfWay: @ 822BF1D walk_in_place_fastest_down delay_4 walk_in_place_fastest_right @@ -217,37 +217,37 @@ MeteorFalls_1F_1R_Movement_22BF1D: @ 822BF1D face_right step_end -MeteorFalls_1F_1R_EventScript_22BF25:: @ 822BF25 +MeteorFalls_1F_1R_EventScript_ProfCozmo:: @ 822BF25 lock faceplayer - goto_if_set FLAG_MET_PROF_COSMO, MeteorFalls_1F_1R_EventScript_22BF3D - setflag FLAG_MET_PROF_COSMO - msgbox MeteorFalls_1F_1R_Text_22C342, MSGBOX_DEFAULT + goto_if_set FLAG_MET_PROF_COZMO, MeteorFalls_1F_1R_EventScript_MetCozmo + setflag FLAG_MET_PROF_COZMO + msgbox MeteorFalls_1F_1R_Text_MeetProfCozmo, MSGBOX_DEFAULT release end -MeteorFalls_1F_1R_EventScript_22BF3D:: @ 822BF3D - msgbox MeteorFalls_1F_1R_Text_22C47D, MSGBOX_DEFAULT +MeteorFalls_1F_1R_EventScript_MetCozmo:: @ 822BF3D + msgbox MeteorFalls_1F_1R_Text_WhatsTeamMagmaDoingAtMtChimney, MSGBOX_DEFAULT release end -MeteorFalls_1F_1R_Text_22BF47: @ 822BF47 +MeteorFalls_1F_1R_Text_WithThisMeteorite: @ 822BF47 .string "Hehehe!\p" .string "With this METEORITE, that thing in\n" .string "MT. CHIMNEY will…$" -MeteorFalls_1F_1R_Text_22BF84: @ 822BF84 +MeteorFalls_1F_1R_Text_DontExpectMercyFromMagma: @ 822BF84 .string "Heh?\p" .string "I don't know who you are, but if you get\n" .string "in the way of TEAM MAGMA, don't\l" .string "expect any mercy!$" -MeteorFalls_1F_1R_Text_22BFE4: @ 822BFE4 +MeteorFalls_1F_1R_Text_HoldItRightThereMagma: @ 822BFE4 .string "Hold it right there, TEAM MAGMA!\p" .string "You're badly mistaken if you think you\n" .string "can have your way with the world!$" -MeteorFalls_1F_1R_Text_22C04E: @ 822C04E +MeteorFalls_1F_1R_Text_BeSeeingYouTeamAqua: @ 822C04E .string "Hehehe!\n" .string "Even TEAM AQUA joins us!\p" .string "But it's too much trouble to deal with\n" @@ -258,7 +258,7 @@ MeteorFalls_1F_1R_Text_22C04E: @ 822C04E .string "Hehehe! Be seeing you, you TEAM\n" .string "AQUA dingbats!$" -MeteorFalls_1F_1R_Text_22C11C: @ 822C11C +MeteorFalls_1F_1R_Text_ArchieSeenYouBefore: @ 822C11C .string "ARCHIE: Didn't I see you before?\n" .string "At SLATEPORT's MUSEUM?\p" .string "Ah, so your name is {PLAYER}.\p" @@ -273,22 +273,22 @@ MeteorFalls_1F_1R_Text_22C11C: @ 822C11C .string "They are the rivals to us,\n" .string "the sea-loving TEAM AQUA!$" -MeteorFalls_1F_1R_Text_22C268: @ 822C268 +MeteorFalls_1F_1R_Text_BossWeShouldChaseMagma: @ 822C268 .string "BOSS, we should give chase to\n" .string "TEAM MAGMA…$" -MeteorFalls_1F_1R_Text_22C292: @ 822C292 +MeteorFalls_1F_1R_Text_ArchieYesNoTellingWhatMagmaWillDo: @ 822C292 .string "ARCHIE: Yes, yes, we must!\n" .string "We've got to hurry.\p" .string "There's no telling what TEAM MAGMA\n" .string "will do at MT. CHIMNEY!$" -MeteorFalls_1F_1R_Text_22C2FC: @ 822C2FC +MeteorFalls_1F_1R_Text_ArchieFarewell: @ 822C2FC .string "ARCHIE: {PLAYER}, you should keep\n" .string "an eye out for TEAM MAGMA, too.\p" .string "Farewell!$" -MeteorFalls_1F_1R_Text_22C342: @ 822C342 +MeteorFalls_1F_1R_Text_MeetProfCozmo: @ 822C342 .string "I… I'm COZMO…\n" .string "I'm a PROFESSOR…\p" .string "TEAM MAGMA asked me to guide them\n" @@ -303,7 +303,7 @@ MeteorFalls_1F_1R_Text_22C342: @ 822C342 .string "What are they going to do with that\n" .string "METEORITE at MT. CHIMNEY?$" -MeteorFalls_1F_1R_Text_22C47D: @ 822C47D +MeteorFalls_1F_1R_Text_WhatsTeamMagmaDoingAtMtChimney: @ 822C47D .string "PROF. COZMO: But that TEAM MAGMA…\p" .string "What are they going to do with that\n" .string "METEORITE at MT. CHIMNEY?$" diff --git a/data/maps/MeteorFalls_1F_2R/map.json b/data/maps/MeteorFalls_1F_2R/map.json index be52085cd..1b27e859e 100644 --- a/data/maps/MeteorFalls_1F_2R/map.json +++ b/data/maps/MeteorFalls_1F_2R/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MeteorFalls_1F_2R_EventScript_22C4DE", + "script": "MeteorFalls_1F_2R_EventScript_Nicolas", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MeteorFalls_1F_2R_EventScript_22C540", + "script": "MeteorFalls_1F_2R_EventScript_John", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MeteorFalls_1F_2R_EventScript_22C5A4", + "script": "MeteorFalls_1F_2R_EventScript_Jay", "flag": "0" } ], diff --git a/data/maps/MeteorFalls_1F_2R/scripts.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc index 9ed8053c6..0fa73212e 100644 --- a/data/maps/MeteorFalls_1F_2R/scripts.inc +++ b/data/maps/MeteorFalls_1F_2R/scripts.inc @@ -1,184 +1,184 @@ MeteorFalls_1F_2R_MapScripts:: @ 822C4DD .byte 0 -MeteorFalls_1F_2R_EventScript_22C4DE:: @ 822C4DE - trainerbattle_single TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_22C608, MeteorFalls_1F_2R_Text_22C678, MeteorFalls_1F_2R_EventScript_22C50A +MeteorFalls_1F_2R_EventScript_Nicolas:: @ 822C4DE + trainerbattle_single TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_NicolasIntro, MeteorFalls_1F_2R_Text_NicolasDefeat, MeteorFalls_1F_2R_EventScript_RegisterNicolas specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq MeteorFalls_1F_2R_EventScript_22C529 - msgbox MeteorFalls_1F_2R_Text_22C6A3, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq MeteorFalls_1F_2R_EventScript_RematchNicolas + msgbox MeteorFalls_1F_2R_Text_NicolasPostBattle, MSGBOX_DEFAULT release end -MeteorFalls_1F_2R_EventScript_22C50A:: @ 822C50A +MeteorFalls_1F_2R_EventScript_RegisterNicolas:: @ 822C50A special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox MeteorFalls_1F_2R_Text_22C6F6, MSGBOX_DEFAULT + msgbox MeteorFalls_1F_2R_Text_NicolasRegister, MSGBOX_DEFAULT register_matchcall TRAINER_NICOLAS_1 release end -MeteorFalls_1F_2R_EventScript_22C529:: @ 822C529 - trainerbattle_rematch TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_22C73F, MeteorFalls_1F_2R_Text_22C7AD - msgbox MeteorFalls_1F_2R_Text_22C7D8, MSGBOX_AUTOCLOSE +MeteorFalls_1F_2R_EventScript_RematchNicolas:: @ 822C529 + trainerbattle_rematch TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_NicolasRematchIntro, MeteorFalls_1F_2R_Text_NicolasRematchDefeat + msgbox MeteorFalls_1F_2R_Text_NicolasPostRematch, MSGBOX_AUTOCLOSE end -MeteorFalls_1F_2R_EventScript_22C540:: @ 822C540 - trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22C843, MeteorFalls_1F_2R_Text_22C89C, MeteorFalls_1F_2R_Text_22C92B, MeteorFalls_1F_2R_EventScript_22C570 +MeteorFalls_1F_2R_EventScript_John:: @ 822C540 + trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_JohnIntro, MeteorFalls_1F_2R_Text_JohnDefeat, MeteorFalls_1F_2R_Text_JohnNotEnoughMons, MeteorFalls_1F_2R_EventScript_RegisterJohn specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq MeteorFalls_1F_2R_EventScript_22C589 - msgbox MeteorFalls_1F_2R_Text_22C8C1, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq MeteorFalls_1F_2R_EventScript_RematchJohn + msgbox MeteorFalls_1F_2R_Text_JohnPostBattle, MSGBOX_DEFAULT release end -MeteorFalls_1F_2R_EventScript_22C570:: @ 822C570 - msgbox MeteorFalls_1F_2R_Text_22C99C, MSGBOX_DEFAULT +MeteorFalls_1F_2R_EventScript_RegisterJohn:: @ 822C570 + msgbox MeteorFalls_1F_2R_Text_JohnRegister, MSGBOX_DEFAULT register_matchcall TRAINER_JOHN_AND_JAY_1 release end -MeteorFalls_1F_2R_EventScript_22C589:: @ 822C589 - trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22CB47, MeteorFalls_1F_2R_Text_22CBA0, MeteorFalls_1F_2R_Text_22CC27 - msgbox MeteorFalls_1F_2R_Text_22CBC5, MSGBOX_AUTOCLOSE +MeteorFalls_1F_2R_EventScript_RematchJohn:: @ 822C589 + trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_JohnRematchIntro, MeteorFalls_1F_2R_Text_JohnRematchDefeat, MeteorFalls_1F_2R_Text_JohnRematchNotEnoughMons + msgbox MeteorFalls_1F_2R_Text_JohnPostRematch, MSGBOX_AUTOCLOSE end -MeteorFalls_1F_2R_EventScript_22C5A4:: @ 822C5A4 - trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22C9E6, MeteorFalls_1F_2R_Text_22CA44, MeteorFalls_1F_2R_Text_22CACD, MeteorFalls_1F_2R_EventScript_22C5D4 +MeteorFalls_1F_2R_EventScript_Jay:: @ 822C5A4 + trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_JayIntro, MeteorFalls_1F_2R_Text_JayDefeat, MeteorFalls_1F_2R_Text_JayNotEnoughMons, MeteorFalls_1F_2R_EventScript_RegisterJay specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq MeteorFalls_1F_2R_EventScript_22C5ED - msgbox MeteorFalls_1F_2R_Text_22CA70, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq MeteorFalls_1F_2R_EventScript_RematchJay + msgbox MeteorFalls_1F_2R_Text_JayPostBattle, MSGBOX_DEFAULT release end -MeteorFalls_1F_2R_EventScript_22C5D4:: @ 822C5D4 - msgbox MeteorFalls_1F_2R_Text_22C99C, MSGBOX_DEFAULT +MeteorFalls_1F_2R_EventScript_RegisterJay:: @ 822C5D4 + msgbox MeteorFalls_1F_2R_Text_JohnRegister, MSGBOX_DEFAULT @ John speaks for both during register register_matchcall TRAINER_JOHN_AND_JAY_1 release end -MeteorFalls_1F_2R_EventScript_22C5ED:: @ 822C5ED - trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22CC98, MeteorFalls_1F_2R_Text_22CD08, MeteorFalls_1F_2R_Text_22CDAB - msgbox MeteorFalls_1F_2R_Text_22CD34, MSGBOX_AUTOCLOSE +MeteorFalls_1F_2R_EventScript_RematchJay:: @ 822C5ED + trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_JayRematchIntro, MeteorFalls_1F_2R_Text_JayRematchDefeat, MeteorFalls_1F_2R_Text_JayRematchNotEnoughMons + msgbox MeteorFalls_1F_2R_Text_JayPostRematch, MSGBOX_AUTOCLOSE end -MeteorFalls_1F_2R_Text_22C608: @ 822C608 +MeteorFalls_1F_2R_Text_NicolasIntro: @ 822C608 .string "This is where we DRAGON users do our\n" .string "training.\p" .string "The CHAMPION even visits.\n" .string "Now do you see how special it is here?$" -MeteorFalls_1F_2R_Text_22C678: @ 822C678 +MeteorFalls_1F_2R_Text_NicolasDefeat: @ 822C678 .string "Urgh!\n" .string "I didn't expect you to be so strong!$" -MeteorFalls_1F_2R_Text_22C6A3: @ 822C6A3 +MeteorFalls_1F_2R_Text_NicolasPostBattle: @ 822C6A3 .string "The road ahead remains long and harsh.\p" .string "When will my POKéMON and I become\n" .string "the best?$" -MeteorFalls_1F_2R_Text_22C6F6: @ 822C6F6 +MeteorFalls_1F_2R_Text_NicolasRegister: @ 822C6F6 .string "I want to know more about your power.\n" .string "Let me register you in my POKéNAV.$" -MeteorFalls_1F_2R_Text_22C73F: @ 822C73F +MeteorFalls_1F_2R_Text_NicolasRematchIntro: @ 822C73F .string "Since we met, we have trained hard\n" .string "with our sights on number one.\p" .string "Help us see how much stronger we've\n" .string "become!$" -MeteorFalls_1F_2R_Text_22C7AD: @ 822C7AD +MeteorFalls_1F_2R_Text_NicolasRematchDefeat: @ 822C7AD .string "Urgh!\n" .string "I didn't expect you to be so strong!$" -MeteorFalls_1F_2R_Text_22C7D8: @ 822C7D8 +MeteorFalls_1F_2R_Text_NicolasPostRematch: @ 822C7D8 .string "You've obviously kept up your\n" .string "POKéMON training.\p" .string "So long as you remain strong, I, too,\n" .string "can become stronger!$" -MeteorFalls_1F_2R_Text_22C843: @ 822C843 +MeteorFalls_1F_2R_Text_JohnIntro: @ 822C843 .string "JOHN: We've always battled POKéMON\n" .string "together as a twosome.\l" .string "We've confidence in ourselves.$" -MeteorFalls_1F_2R_Text_22C89C: @ 822C89C +MeteorFalls_1F_2R_Text_JohnDefeat: @ 822C89C .string "JOHN: Oh, my.\n" .string "We've lost, dear wife.$" -MeteorFalls_1F_2R_Text_22C8C1: @ 822C8C1 +MeteorFalls_1F_2R_Text_JohnPostBattle: @ 822C8C1 .string "JOHN: We've been married for\n" .string "fifty years.\p" .string "Come to think of it, I've yet to beat\n" .string "my dear wife in a battle.$" -MeteorFalls_1F_2R_Text_22C92B: @ 822C92B +MeteorFalls_1F_2R_Text_JohnNotEnoughMons: @ 822C92B .string "JOHN: Well, well, what a young TRAINER!\p" .string "Will you battle with us? If so, you'll\n" .string "have to return with more POKéMON.$" -MeteorFalls_1F_2R_Text_22C99C: @ 822C99C +MeteorFalls_1F_2R_Text_JohnRegister: @ 822C99C .string "JOHN: Young TRAINER, if the chance\n" .string "arises, will you battle with us again?$" -MeteorFalls_1F_2R_Text_22C9E6: @ 822C9E6 +MeteorFalls_1F_2R_Text_JayIntro: @ 822C9E6 .string "JAY: We've been married for\n" .string "fifty years.\p" .string "The bond we share as a couple could\n" .string "never be broken.$" -MeteorFalls_1F_2R_Text_22CA44: @ 822CA44 +MeteorFalls_1F_2R_Text_JayDefeat: @ 822CA44 .string "JAY: Oh, dear.\n" .string "We've lost, my dear husband.$" -MeteorFalls_1F_2R_Text_22CA70: @ 822CA70 +MeteorFalls_1F_2R_Text_JayPostBattle: @ 822CA70 .string "JAY: Fifty years of marriage…\p" .string "If we ever argued, we always settled\n" .string "it with a POKéMON battle…$" -MeteorFalls_1F_2R_Text_22CACD: @ 822CACD +MeteorFalls_1F_2R_Text_JayNotEnoughMons: @ 822CACD .string "JAY: Well, well, aren't you a young\n" .string "TRAINER?\p" .string "If you'd care to battle with us, you'll\n" .string "have to come back with more POKéMON.$" -MeteorFalls_1F_2R_Text_22CB47: @ 822CB47 +MeteorFalls_1F_2R_Text_JohnRematchIntro: @ 822CB47 .string "JOHN: We've always battled POKéMON\n" .string "together as a twosome.\l" .string "We've confidence in ourselves.$" -MeteorFalls_1F_2R_Text_22CBA0: @ 822CBA0 +MeteorFalls_1F_2R_Text_JohnRematchDefeat: @ 822CBA0 .string "JOHN: Oh, my.\n" .string "We've lost, dear wife.$" -MeteorFalls_1F_2R_Text_22CBC5: @ 822CBC5 +MeteorFalls_1F_2R_Text_JohnPostRematch: @ 822CBC5 .string "JOHN: Married for fifty years…\p" .string "On reflection, the dear wife and I,\n" .string "we battled day in and day out…$" -MeteorFalls_1F_2R_Text_22CC27: @ 822CC27 +MeteorFalls_1F_2R_Text_JohnRematchNotEnoughMons: @ 822CC27 .string "JOHN: Well, well, what a young TRAINER!\p" .string "Will you battle with us? If so, you'll\n" .string "have to return with more POKéMON.$" -MeteorFalls_1F_2R_Text_22CC98: @ 822CC98 +MeteorFalls_1F_2R_Text_JayRematchIntro: @ 822CC98 .string "JAY: We've been married for\n" .string "fifty years.\p" .string "We've supported each other all that\n" .string "time. We've made ourselves strong.$" -MeteorFalls_1F_2R_Text_22CD08: @ 822CD08 +MeteorFalls_1F_2R_Text_JayRematchDefeat: @ 822CD08 .string "JAY: Oh, dear.\n" .string "We've lost, my dear husband.$" -MeteorFalls_1F_2R_Text_22CD34: @ 822CD34 +MeteorFalls_1F_2R_Text_JayPostRematch: @ 822CD34 .string "JAY: Fifty years of marriage…\n" .string "Many things have happened.\p" .string "I hope that we will continue to make\n" .string "happy memories together.$" -MeteorFalls_1F_2R_Text_22CDAB: @ 822CDAB +MeteorFalls_1F_2R_Text_JayRematchNotEnoughMons: @ 822CDAB .string "JAY: Well, well, aren't you a young\n" .string "TRAINER?\p" .string "If you'd care to battle with us, you'll\n" diff --git a/data/maps/MeteorFalls_StevensCave/map.json b/data/maps/MeteorFalls_StevensCave/map.json index b23c3f952..c5ad26805 100644 --- a/data/maps/MeteorFalls_StevensCave/map.json +++ b/data/maps/MeteorFalls_StevensCave/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MeteorFalls_StevensCave_EventScript_23B182", + "script": "MeteorFalls_StevensCave_EventScript_Steven", "flag": "0" } ], diff --git a/data/maps/MeteorFalls_StevensCave/scripts.inc b/data/maps/MeteorFalls_StevensCave/scripts.inc index 31baad43c..71313be67 100644 --- a/data/maps/MeteorFalls_StevensCave/scripts.inc +++ b/data/maps/MeteorFalls_StevensCave/scripts.inc @@ -1,9 +1,9 @@ MeteorFalls_StevensCave_MapScripts:: @ 823B181 .byte 0 -MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182 +MeteorFalls_StevensCave_EventScript_Steven:: @ 823B182 lock - goto_if_set FLAG_DEFEATED_METEOR_FALLS_STEVEN, MeteorFalls_StevensCave_EventScript_23B1CD + goto_if_set FLAG_DEFEATED_METEOR_FALLS_STEVEN, MeteorFalls_StevensCave_EventScript_Defeated waitse playse SE_PIN applymovement 1, Common_Movement_ExclamationMark @@ -12,21 +12,21 @@ MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182 waitmovement 0 applymovement 1, Common_Movement_FacePlayer waitmovement 0 - msgbox MeteorFalls_StevensCave_Text_23B1E1, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_STEVEN, MeteorFalls_StevensCave_Text_23B32D - msgbox MeteorFalls_StevensCave_Text_23B358, MSGBOX_DEFAULT + msgbox MeteorFalls_StevensCave_Text_ShouldKnowHowGoodIAmExpectWorst, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_STEVEN, MeteorFalls_StevensCave_Text_StevenDefeat + msgbox MeteorFalls_StevensCave_Text_MyPredictionCameTrue, MSGBOX_DEFAULT setflag FLAG_DEFEATED_METEOR_FALLS_STEVEN release end -MeteorFalls_StevensCave_EventScript_23B1CD:: @ 823B1CD +MeteorFalls_StevensCave_EventScript_Defeated:: @ 823B1CD applymovement 1, Common_Movement_FacePlayer waitmovement 0 - msgbox MeteorFalls_StevensCave_Text_23B358, MSGBOX_DEFAULT + msgbox MeteorFalls_StevensCave_Text_MyPredictionCameTrue, MSGBOX_DEFAULT release end -MeteorFalls_StevensCave_Text_23B1E1: @ 823B1E1 +MeteorFalls_StevensCave_Text_ShouldKnowHowGoodIAmExpectWorst: @ 823B1E1 .string "STEVEN: Oh, wow, {PLAYER}{KUN}.\n" .string "I'm amazed you knew where to find me.\p" .string "Do you, uh…maybe think of me as\n" @@ -39,11 +39,11 @@ MeteorFalls_StevensCave_Text_23B1E1: @ 823B1E1 .string "Okay, {PLAYER}{KUN}, if you're going to mount\n" .string "a serious challenge, expect the worst!$" -MeteorFalls_StevensCave_Text_23B32D: @ 823B32D +MeteorFalls_StevensCave_Text_StevenDefeat: @ 823B32D .string "You…\n" .string "I had no idea you'd become so strong…$" -MeteorFalls_StevensCave_Text_23B358: @ 823B358 +MeteorFalls_StevensCave_Text_MyPredictionCameTrue: @ 823B358 .string "STEVEN: Come to think of it, ever since\n" .string "our paths first crossed in GRANITE\l" .string "CAVE in DEWFORD, I had this feeling.\p" diff --git a/data/maps/MirageTower_4F/map.json b/data/maps/MirageTower_4F/map.json index 45e5fa62b..71e080a23 100644 --- a/data/maps/MirageTower_4F/map.json +++ b/data/maps/MirageTower_4F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MirageTower_4F_EventScript_23AD48", + "script": "MirageTower_4F_EventScript_RootFossil", "flag": "FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MirageTower_4F_EventScript_23AD89", + "script": "MirageTower_4F_EventScript_ClawFossil", "flag": "FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL" }, { diff --git a/data/maps/MirageTower_4F/scripts.inc b/data/maps/MirageTower_4F/scripts.inc index ac3afdce6..d23cb160e 100644 --- a/data/maps/MirageTower_4F/scripts.inc +++ b/data/maps/MirageTower_4F/scripts.inc @@ -1,12 +1,12 @@ MirageTower_4F_MapScripts:: @ 823AD47 .byte 0 -MirageTower_4F_EventScript_23AD48:: @ 823AD48 +MirageTower_4F_EventScript_RootFossil:: @ 823AD48 lock faceplayer - msgbox MirageTower_4F_Text_23ADF9, MSGBOX_YESNO + msgbox MirageTower_4F_Text_TakeRootFossil, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq MirageTower_4F_EventScript_23AD7F + goto_if_eq MirageTower_4F_EventScript_LeaveRootFossil giveitem_std ITEM_ROOT_FOSSIL closemessage setflag FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL @@ -14,20 +14,20 @@ MirageTower_4F_EventScript_23AD48:: @ 823AD48 removeobject 1 delay 30 setflag FLAG_CHOSE_ROOT_FOSSIL - goto MirageTower_4F_EventScript_23ADCA + goto MirageTower_4F_EventScript_CollapseMirageTower end -MirageTower_4F_EventScript_23AD7F:: @ 823AD7F - msgbox MirageTower_4F_Text_23AE79, MSGBOX_DEFAULT +MirageTower_4F_EventScript_LeaveRootFossil:: @ 823AD7F + msgbox MirageTower_4F_Text_LeftRootFossilAlone, MSGBOX_DEFAULT release end -MirageTower_4F_EventScript_23AD89:: @ 823AD89 +MirageTower_4F_EventScript_ClawFossil:: @ 823AD89 lock faceplayer - msgbox MirageTower_4F_Text_23AE98, MSGBOX_YESNO + msgbox MirageTower_4F_Text_TakeClawFossil, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq MirageTower_4F_EventScript_23ADC0 + goto_if_eq MirageTower_4F_EventScript_LeaveClawFossil giveitem_std ITEM_CLAW_FOSSIL closemessage setflag FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL @@ -35,15 +35,15 @@ MirageTower_4F_EventScript_23AD89:: @ 823AD89 removeobject 2 delay 30 setflag FLAG_CHOSE_CLAW_FOSSIL - goto MirageTower_4F_EventScript_23ADCA + goto MirageTower_4F_EventScript_CollapseMirageTower end -MirageTower_4F_EventScript_23ADC0:: @ 823ADC0 - msgbox MirageTower_4F_Text_23AF18, MSGBOX_DEFAULT +MirageTower_4F_EventScript_LeaveClawFossil:: @ 823ADC0 + msgbox MirageTower_4F_Text_LeaveClawFossilAlone, MSGBOX_DEFAULT release end -MirageTower_4F_EventScript_23ADCA:: @ 823ADCA +MirageTower_4F_EventScript_CollapseMirageTower:: @ 823ADCA setvar VAR_0x8004, 1 @ vertical pan setvar VAR_0x8005, 1 @ horizontal pan setvar VAR_0x8006, 32 @ num shakes @@ -59,21 +59,21 @@ MirageTower_4F_EventScript_23ADCA:: @ 823ADCA release end -MirageTower_4F_Text_23ADF9: @ 823ADF9 +MirageTower_4F_Text_TakeRootFossil: @ 823ADF9 .string "You found the ROOT FOSSIL.\p" .string "If this FOSSIL is taken, the ground\n" .string "around it will likely crumble away…\p" .string "Take the ROOT FOSSIL anyway?$" -MirageTower_4F_Text_23AE79: @ 823AE79 +MirageTower_4F_Text_LeftRootFossilAlone: @ 823AE79 .string "{PLAYER} left the ROOT FOSSIL alone.$" -MirageTower_4F_Text_23AE98: @ 823AE98 +MirageTower_4F_Text_TakeClawFossil: @ 823AE98 .string "You found the CLAW FOSSIL.\p" .string "If this FOSSIL is taken, the ground\n" .string "around it will likely crumble away…\p" .string "Take the CLAW FOSSIL anyway?$" -MirageTower_4F_Text_23AF18: @ 823AF18 +MirageTower_4F_Text_LeaveClawFossilAlone: @ 823AF18 .string "{PLAYER} left the CLAW FOSSIL alone.$" diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index c7283ef0f..a70d7e3ae 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -115,16 +115,12 @@ MtChimney_EventScript_LavaCookieLady:: @ 822EEF3 compare VAR_RESULT, FALSE goto_if_eq MtChimney_EventScript_BagIsFull hidemoneybox - nop - nop release end MtChimney_EventScript_BagIsFull:: @ 822EF51 msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT hidemoneybox - nop - nop release end @@ -136,16 +132,12 @@ MtChimney_EventScript_TakeMoney:: @ 822EF5E MtChimney_EventScript_DeclineLavaCookie:: @ 822EF69 msgbox MtChimney_Text_OhFineThen, MSGBOX_DEFAULT hidemoneybox - nop - nop release end MtChimney_EventScript_NotEnoughMoney:: @ 822EF76 msgbox MtChimney_Text_YouveNotGotTheMoney, MSGBOX_DEFAULT hidemoneybox - nop - nop release end diff --git a/data/maps/NewMauville_Entrance/map.json b/data/maps/NewMauville_Entrance/map.json index d36763350..593e23a62 100644 --- a/data/maps/NewMauville_Entrance/map.json +++ b/data/maps/NewMauville_Entrance/map.json @@ -38,7 +38,7 @@ "elevation": 3, "var": "VAR_NEW_MAUVILLE_STATE", "var_value": "0", - "script": "NewMauville_Entrance_EventScript_2372FF" + "script": "NewMauville_Entrance_EventScript_Door" } ], "bg_events": [] diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index e9dd09c27..e9369b7ea 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -1,14 +1,14 @@ NewMauville_Entrance_MapScripts:: @ 82372AD - map_script MAP_SCRIPT_ON_LOAD, NewMauville_Entrance_MapScript1_2372B8 + map_script MAP_SCRIPT_ON_LOAD, NewMauville_Entrance_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Entrance_OnTransition .byte 0 -NewMauville_Entrance_MapScript1_2372B8: @ 82372B8 +NewMauville_Entrance_OnLoad: @ 82372B8 compare VAR_NEW_MAUVILLE_STATE, 0 - call_if_eq NewMauville_Entrance_EventScript_2372C4 + call_if_eq NewMauville_Entrance_EventScript_CloseDoor end -NewMauville_Entrance_EventScript_2372C4:: @ 82372C4 +NewMauville_Entrance_EventScript_CloseDoor:: @ 82372C4 setmetatile 3, 0, METATILE_Facility_NewMauvilleDoor_Closed_Tile0, 1 setmetatile 4, 0, METATILE_Facility_NewMauvilleDoor_Closed_Tile1, 1 setmetatile 5, 0, METATILE_Facility_NewMauvilleDoor_Closed_Tile2, 1 @@ -21,18 +21,18 @@ NewMauville_Entrance_OnTransition: @ 82372FB setflag FLAG_LANDMARK_NEW_MAUVILLE end -NewMauville_Entrance_EventScript_2372FF:: @ 82372FF +NewMauville_Entrance_EventScript_Door:: @ 82372FF lockall applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox NewMauville_Entrance_Text_237382, MSGBOX_DEFAULT + msgbox NewMauville_Entrance_Text_DoorIsLocked, MSGBOX_DEFAULT checkitem ITEM_BASEMENT_KEY, 1 - compare VAR_RESULT, 0 - goto_if_eq NewMauville_Entrance_EventScript_237380 - msgbox NewMauville_Entrance_Text_237396, MSGBOX_YESNO + compare VAR_RESULT, FALSE + goto_if_eq NewMauville_Entrance_EventScript_DontOpenDoor + msgbox NewMauville_Entrance_Text_UseBasementKey, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq NewMauville_Entrance_EventScript_237380 - msgbox NewMauville_Entrance_Text_2373AC, MSGBOX_DEFAULT + goto_if_eq NewMauville_Entrance_EventScript_DontOpenDoor + msgbox NewMauville_Entrance_Text_UsedBasementKey, MSGBOX_DEFAULT setmetatile 3, 0, METATILE_Facility_NewMauvilleDoor_Open_Tile0, 0 setmetatile 4, 0, METATILE_Facility_NewMauvilleDoor_Open_Tile1, 0 setmetatile 5, 0, METATILE_Facility_NewMauvilleDoor_Open_Tile2, 0 @@ -45,17 +45,17 @@ NewMauville_Entrance_EventScript_2372FF:: @ 82372FF releaseall end -NewMauville_Entrance_EventScript_237380:: @ 8237380 +NewMauville_Entrance_EventScript_DontOpenDoor:: @ 8237380 releaseall end -NewMauville_Entrance_Text_237382: @ 8237382 +NewMauville_Entrance_Text_DoorIsLocked: @ 8237382 .string "The door is locked.$" -NewMauville_Entrance_Text_237396: @ 8237396 +NewMauville_Entrance_Text_UseBasementKey: @ 8237396 .string "Use the BASEMENT KEY?$" -NewMauville_Entrance_Text_2373AC: @ 82373AC +NewMauville_Entrance_Text_UsedBasementKey: @ 82373AC .string "{PLAYER} used the BASEMENT KEY.\p" .string "The door opened!$" diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json index e58588a47..8909fcbaa 100644 --- a/data/maps/NewMauville_Inside/map.json +++ b/data/maps/NewMauville_Inside/map.json @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "NewMauville_Inside_EventScript_2377AF", + "script": "NewMauville_Inside_EventScript_Voltorb1", "flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "NewMauville_Inside_EventScript_2377FC", + "script": "NewMauville_Inside_EventScript_Voltorb2", "flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2" }, { @@ -115,7 +115,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "NewMauville_Inside_EventScript_237849", + "script": "NewMauville_Inside_EventScript_Voltorb3", "flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3" } ], @@ -136,7 +136,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "NewMauville_Inside_EventScript_237459" + "script": "NewMauville_Inside_EventScript_BlueButton" }, { "type": "trigger", @@ -145,7 +145,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": "0", - "script": "NewMauville_Inside_EventScript_237471" + "script": "NewMauville_Inside_EventScript_GreenButton" }, { "type": "trigger", @@ -154,7 +154,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "NewMauville_Inside_EventScript_237459" + "script": "NewMauville_Inside_EventScript_BlueButton" }, { "type": "trigger", @@ -163,7 +163,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "NewMauville_Inside_EventScript_237459" + "script": "NewMauville_Inside_EventScript_BlueButton" }, { "type": "trigger", @@ -172,7 +172,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": "0", - "script": "NewMauville_Inside_EventScript_237471" + "script": "NewMauville_Inside_EventScript_GreenButton" }, { "type": "trigger", @@ -181,7 +181,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": "0", - "script": "NewMauville_Inside_EventScript_237471" + "script": "NewMauville_Inside_EventScript_GreenButton" }, { "type": "trigger", @@ -190,7 +190,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "NewMauville_Inside_EventScript_237459" + "script": "NewMauville_Inside_EventScript_BlueButton" }, { "type": "trigger", @@ -199,7 +199,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "NewMauville_Inside_EventScript_237459" + "script": "NewMauville_Inside_EventScript_BlueButton" }, { "type": "trigger", @@ -208,7 +208,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": "0", - "script": "NewMauville_Inside_EventScript_237471" + "script": "NewMauville_Inside_EventScript_GreenButton" }, { "type": "trigger", @@ -217,7 +217,7 @@ "elevation": 3, "var": "VAR_NEW_MAUVILLE_STATE", "var_value": "1", - "script": "NewMauville_Inside_EventScript_237725" + "script": "NewMauville_Inside_EventScript_RedButton" } ], "bg_events": [ @@ -227,7 +227,7 @@ "y": 4, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "NewMauville_Inside_EventScript_23778F" + "script": "NewMauville_Inside_EventScript_Generator" }, { "type": "sign", @@ -235,7 +235,7 @@ "y": 3, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "NewMauville_Inside_EventScript_23778F" + "script": "NewMauville_Inside_EventScript_Generator" }, { "type": "sign", @@ -243,7 +243,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "NewMauville_Inside_EventScript_23778F" + "script": "NewMauville_Inside_EventScript_Generator" }, { "type": "sign", @@ -251,7 +251,7 @@ "y": 4, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "NewMauville_Inside_EventScript_23778F" + "script": "NewMauville_Inside_EventScript_Generator" }, { "type": "sign", @@ -259,7 +259,7 @@ "y": 4, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "NewMauville_Inside_EventScript_23778F" + "script": "NewMauville_Inside_EventScript_Generator" }, { "type": "sign", @@ -267,7 +267,7 @@ "y": 4, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "NewMauville_Inside_EventScript_23778F" + "script": "NewMauville_Inside_EventScript_Generator" }, { "type": "sign", @@ -275,7 +275,7 @@ "y": 3, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "NewMauville_Inside_EventScript_23778F" + "script": "NewMauville_Inside_EventScript_Generator" }, { "type": "sign", @@ -283,7 +283,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "NewMauville_Inside_EventScript_23778F" + "script": "NewMauville_Inside_EventScript_Generator" } ] }
\ No newline at end of file diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc index be4e846eb..7675799eb 100644 --- a/data/maps/NewMauville_Inside/scripts.inc +++ b/data/maps/NewMauville_Inside/scripts.inc @@ -1,18 +1,18 @@ NewMauville_Inside_MapScripts:: @ 82373D7 - map_script MAP_SCRIPT_ON_RESUME, NewMauville_Inside_MapScript1_2373E7 + map_script MAP_SCRIPT_ON_RESUME, NewMauville_Inside_OnResume map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Inside_OnTransition - map_script MAP_SCRIPT_ON_LOAD, NewMauville_Inside_MapScript1_23744D + map_script MAP_SCRIPT_ON_LOAD, NewMauville_Inside_OnLoad .byte 0 -NewMauville_Inside_MapScript1_2373E7: @ 82373E7 +NewMauville_Inside_OnResume: @ 82373E7 compare VAR_TEMP_1, 1 - call_if_eq NewMauville_Inside_EventScript_237489 + call_if_eq NewMauville_Inside_EventScript_SetBarrierStateBlueButton compare VAR_TEMP_2, 1 - call_if_eq NewMauville_Inside_EventScript_2375D7 - call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NewMauville_Inside_EventScript_237407 + call_if_eq NewMauville_Inside_EventScript_SetBarrierStateGreenButton + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NewMauville_Inside_EventScript_TryRemoveVoltorb end -NewMauville_Inside_EventScript_237407:: @ 8237407 +NewMauville_Inside_EventScript_TryRemoveVoltorb:: @ 8237407 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn @@ -22,49 +22,49 @@ NewMauville_Inside_EventScript_237407:: @ 8237407 NewMauville_Inside_OnTransition: @ 823741B setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 - call_if_unset FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE, NewMauville_Inside_EventScript_237441 - call_if_unset FLAG_DEFEATED_VOLTORB_2_NEW_MAUVILLE, NewMauville_Inside_EventScript_237445 - call_if_unset FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE, NewMauville_Inside_EventScript_237449 + call_if_unset FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE, NewMauville_Inside_EventScript_ShowVoltorb1 + call_if_unset FLAG_DEFEATED_VOLTORB_2_NEW_MAUVILLE, NewMauville_Inside_EventScript_ShowVoltorb2 + call_if_unset FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE, NewMauville_Inside_EventScript_ShowVoltorb3 end -NewMauville_Inside_EventScript_237441:: @ 8237441 +NewMauville_Inside_EventScript_ShowVoltorb1:: @ 8237441 clearflag FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1 return -NewMauville_Inside_EventScript_237445:: @ 8237445 +NewMauville_Inside_EventScript_ShowVoltorb2:: @ 8237445 clearflag FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2 return -NewMauville_Inside_EventScript_237449:: @ 8237449 +NewMauville_Inside_EventScript_ShowVoltorb3:: @ 8237449 clearflag FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3 return -NewMauville_Inside_MapScript1_23744D: @ 823744D +NewMauville_Inside_OnLoad: @ 823744D compare VAR_NEW_MAUVILLE_STATE, 2 - call_if_eq NewMauville_Inside_EventScript_23773A + call_if_eq NewMauville_Inside_EventScript_SetGeneratorOffMetatiles end -NewMauville_Inside_EventScript_237459:: @ 8237459 +NewMauville_Inside_EventScript_BlueButton:: @ 8237459 lockall setvar VAR_TEMP_1, 1 setvar VAR_TEMP_2, 0 playse SE_PIN - call NewMauville_Inside_EventScript_237489 + call NewMauville_Inside_EventScript_SetBarrierStateBlueButton special DrawWholeMapView releaseall end -NewMauville_Inside_EventScript_237471:: @ 8237471 +NewMauville_Inside_EventScript_GreenButton:: @ 8237471 lockall setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 1 playse SE_PIN - call NewMauville_Inside_EventScript_2375D7 + call NewMauville_Inside_EventScript_SetBarrierStateGreenButton special DrawWholeMapView releaseall end -NewMauville_Inside_EventScript_237489:: @ 8237489 +NewMauville_Inside_EventScript_SetBarrierStateBlueButton:: @ 8237489 setmetatile 23, 34, METATILE_BikeShop_Barrier_Hidden_Top, 1 setmetatile 23, 35, METATILE_BikeShop_Barrier_Hidden_Bottom, 1 setmetatile 23, 36, METATILE_BikeShop_Floor_Shadow_Top, 0 @@ -104,7 +104,7 @@ NewMauville_Inside_EventScript_237489:: @ 8237489 setmetatile 18, 36, METATILE_BikeShop_Button_Green, 0 return -NewMauville_Inside_EventScript_2375D7:: @ 82375D7 +NewMauville_Inside_EventScript_SetBarrierStateGreenButton:: @ 82375D7 setmetatile 23, 34, METATILE_BikeShop_Barrier_Blue_Top, 1 setmetatile 23, 35, METATILE_BikeShop_Barrier_Blue_TopMid, 1 setmetatile 23, 36, METATILE_BikeShop_Barrier_Blue_BottomMid, 1 @@ -144,15 +144,15 @@ NewMauville_Inside_EventScript_2375D7:: @ 82375D7 setmetatile 30, 38, METATILE_BikeShop_Button_Blue, 0 return -NewMauville_Inside_EventScript_237725:: @ 8237725 +NewMauville_Inside_EventScript_RedButton:: @ 8237725 lockall - msgbox NewMauville_Inside_Text_237932, MSGBOX_DEFAULT - call NewMauville_Inside_EventScript_23773A + msgbox NewMauville_Inside_Text_SteppedOnSwitchGeneratorStopped, MSGBOX_DEFAULT + call NewMauville_Inside_EventScript_SetGeneratorOffMetatiles setvar VAR_NEW_MAUVILLE_STATE, 2 releaseall end -NewMauville_Inside_EventScript_23773A:: @ 823773A +NewMauville_Inside_EventScript_SetGeneratorOffMetatiles:: @ 823773A setmetatile 33, 6, METATILE_BikeShop_Button_Pressed, 0 setmetatile 32, 2, METATILE_BikeShop_Generator_Off_Tile0, 1 setmetatile 33, 2, METATILE_BikeShop_Generator_Off_Tile1, 1 @@ -165,20 +165,20 @@ NewMauville_Inside_EventScript_23773A:: @ 823773A special DrawWholeMapView return -NewMauville_Inside_EventScript_23778F:: @ 823778F +NewMauville_Inside_EventScript_Generator:: @ 823778F lockall compare VAR_NEW_MAUVILLE_STATE, 2 - goto_if_eq NewMauville_Inside_EventScript_2377A5 - msgbox NewMauville_Inside_Text_237896, MSGBOX_DEFAULT + goto_if_eq NewMauville_Inside_EventScript_GeneratorOff + msgbox NewMauville_Inside_Text_GeneratorRadiatingHeat, MSGBOX_DEFAULT releaseall end -NewMauville_Inside_EventScript_2377A5:: @ 82377A5 - msgbox NewMauville_Inside_Text_237916, MSGBOX_DEFAULT +NewMauville_Inside_EventScript_GeneratorOff:: @ 82377A5 + msgbox NewMauville_Inside_Text_GeneratorQuietedDown, MSGBOX_DEFAULT releaseall end -NewMauville_Inside_EventScript_2377AF:: @ 82377AF +NewMauville_Inside_EventScript_Voltorb1:: @ 82377AF lock faceplayer setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE @@ -191,21 +191,21 @@ NewMauville_Inside_EventScript_2377AF:: @ 82377AF clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if_eq NewMauville_Inside_EventScript_2377F3 + goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb1 compare VAR_RESULT, B_OUTCOME_RAN - goto_if_eq NewMauville_Inside_EventScript_2377F3 + goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb1 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if_eq NewMauville_Inside_EventScript_2377F3 + goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb1 setflag FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE release end -NewMauville_Inside_EventScript_2377F3:: @ 82377F3 +NewMauville_Inside_EventScript_DefeatedVoltorb1:: @ 82377F3 setflag FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE goto Common_EventScript_RemoveStaticPokemon end -NewMauville_Inside_EventScript_2377FC:: @ 82377FC +NewMauville_Inside_EventScript_Voltorb2:: @ 82377FC lock faceplayer setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE @@ -218,21 +218,21 @@ NewMauville_Inside_EventScript_2377FC:: @ 82377FC clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if_eq NewMauville_Inside_EventScript_237840 + goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb2 compare VAR_RESULT, B_OUTCOME_RAN - goto_if_eq NewMauville_Inside_EventScript_237840 + goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb2 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if_eq NewMauville_Inside_EventScript_237840 + goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb2 setflag FLAG_DEFEATED_VOLTORB_2_NEW_MAUVILLE release end -NewMauville_Inside_EventScript_237840:: @ 8237840 +NewMauville_Inside_EventScript_DefeatedVoltorb2:: @ 8237840 setflag FLAG_DEFEATED_VOLTORB_2_NEW_MAUVILLE goto Common_EventScript_RemoveStaticPokemon end -NewMauville_Inside_EventScript_237849:: @ 8237849 +NewMauville_Inside_EventScript_Voltorb3:: @ 8237849 lock faceplayer setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE @@ -245,30 +245,30 @@ NewMauville_Inside_EventScript_237849:: @ 8237849 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if_eq NewMauville_Inside_EventScript_23788D + goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb3 compare VAR_RESULT, B_OUTCOME_RAN - goto_if_eq NewMauville_Inside_EventScript_23788D + goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb3 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if_eq NewMauville_Inside_EventScript_23788D + goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb3 setflag FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE release end -NewMauville_Inside_EventScript_23788D:: @ 823788D +NewMauville_Inside_EventScript_DefeatedVoltorb3:: @ 823788D setflag FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE goto Common_EventScript_RemoveStaticPokemon end -NewMauville_Inside_Text_237896: @ 8237896 +NewMauville_Inside_Text_GeneratorRadiatingHeat: @ 8237896 .string "The generator is radiating heat that\n" .string "can be felt even at a distance.\p" .string "It looks like it should be turned off\n" .string "as soon as possible.$" -NewMauville_Inside_Text_237916: @ 8237916 +NewMauville_Inside_Text_GeneratorQuietedDown: @ 8237916 .string "The generator quieted down.$" -NewMauville_Inside_Text_237932: @ 8237932 +NewMauville_Inside_Text_SteppedOnSwitchGeneratorStopped: @ 8237932 .string "{PLAYER} stepped on the switch.\p" .string "Click…\p" .string "… … … … … … … …\n" diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json index 3070d9c07..ff64a5967 100644 --- a/data/maps/PacifidlogTown/map.json +++ b/data/maps/PacifidlogTown/map.json @@ -35,7 +35,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_EventScript_1EBACC", + "script": "PacifidlogTown_EventScript_Girl", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_EventScript_1EBAD5", + "script": "PacifidlogTown_EventScript_Fisherman", "flag": "0" }, { @@ -61,7 +61,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_EventScript_1EBAC3", + "script": "PacifidlogTown_EventScript_NinjaBoy", "flag": "0" } ], @@ -125,7 +125,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PacifidlogTown_EventScript_1EBADE" + "script": "PacifidlogTown_EventScript_TownSign" }, { "type": "sign", diff --git a/data/maps/PacifidlogTown/scripts.inc b/data/maps/PacifidlogTown/scripts.inc index 26e9924ed..fc491cfe3 100644 --- a/data/maps/PacifidlogTown/scripts.inc +++ b/data/maps/PacifidlogTown/scripts.inc @@ -1,44 +1,44 @@ PacifidlogTown_MapScripts:: @ 81EBAB1 map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_OnTransition - map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_MapScript1_1EBAC0 + map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_OnResume .byte 0 PacifidlogTown_OnTransition: @ 81EBABC setflag FLAG_VISITED_PACIFIDLOG_TOWN end -PacifidlogTown_MapScript1_1EBAC0: @ 81EBAC0 +PacifidlogTown_OnResume: @ 81EBAC0 setstepcallback STEP_CB_PACIFIDLOG_BRIDGE end -PacifidlogTown_EventScript_1EBAC3:: @ 81EBAC3 - msgbox PacifidlogTown_Text_1EBB6C, MSGBOX_NPC +PacifidlogTown_EventScript_NinjaBoy:: @ 81EBAC3 + msgbox PacifidlogTown_Text_NeatHousesOnWater, MSGBOX_NPC end -PacifidlogTown_EventScript_1EBACC:: @ 81EBACC - msgbox PacifidlogTown_Text_1EBAE7, MSGBOX_NPC +PacifidlogTown_EventScript_Girl:: @ 81EBACC + msgbox PacifidlogTown_Text_FastRunningCurrent, MSGBOX_NPC end -PacifidlogTown_EventScript_1EBAD5:: @ 81EBAD5 - msgbox PacifidlogTown_Text_1EBBAC, MSGBOX_NPC +PacifidlogTown_EventScript_Fisherman:: @ 81EBAD5 + msgbox PacifidlogTown_Text_SkyPillarTooScary, MSGBOX_NPC end -PacifidlogTown_EventScript_1EBADE:: @ 81EBADE - msgbox PacifidlogTown_Text_1EBC7A, MSGBOX_SIGN +PacifidlogTown_EventScript_TownSign:: @ 81EBADE + msgbox PacifidlogTown_Text_TownSign, MSGBOX_SIGN end -PacifidlogTown_Text_1EBAE7: @ 81EBAE7 +PacifidlogTown_Text_FastRunningCurrent: @ 81EBAE7 .string "The sea between PACIFIDLOG and\n" .string "SLATEPORT has a fast-running tide.\p" .string "If you decide to SURF, you could end\n" .string "up swept away somewhere else.$" -PacifidlogTown_Text_1EBB6C: @ 81EBB6C +PacifidlogTown_Text_NeatHousesOnWater: @ 81EBB6C .string "See, isn't it neat?\n" .string "These houses are on water!\p" .string "I was born here!$" -PacifidlogTown_Text_1EBBAC: @ 81EBBAC +PacifidlogTown_Text_SkyPillarTooScary: @ 81EBBAC .string "The SKY PILLAR?\p" .string "…Oh, you must mean that tall, tall\n" .string "tower a little further out.\p" @@ -47,7 +47,7 @@ PacifidlogTown_Text_1EBBAC: @ 81EBBAC .string "Life at sea level in PACIFIDLOG,\n" .string "that suits me fine.$" -PacifidlogTown_Text_1EBC7A: @ 81EBC7A +PacifidlogTown_Text_TownSign: @ 81EBC7A .string "PACIFIDLOG TOWN\p" .string "“Where the morning sun smiles upon\n" .string "the waters.”$" diff --git a/data/maps/PacifidlogTown_House1/map.json b/data/maps/PacifidlogTown_House1/map.json index 1e48da85c..8f7357246 100644 --- a/data/maps/PacifidlogTown_House1/map.json +++ b/data/maps/PacifidlogTown_House1/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House1_EventScript_20365D", + "script": "PacifidlogTown_House1_EventScript_Man", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House1_EventScript_203666", + "script": "PacifidlogTown_House1_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/PacifidlogTown_House1/scripts.inc b/data/maps/PacifidlogTown_House1/scripts.inc index 937b645bc..7759cb29a 100644 --- a/data/maps/PacifidlogTown_House1/scripts.inc +++ b/data/maps/PacifidlogTown_House1/scripts.inc @@ -1,15 +1,15 @@ PacifidlogTown_House1_MapScripts:: @ 820365C .byte 0 -PacifidlogTown_House1_EventScript_20365D:: @ 820365D - msgbox PacifidlogTown_House1_Text_20366F, MSGBOX_NPC +PacifidlogTown_House1_EventScript_Man:: @ 820365D + msgbox PacifidlogTown_House1_Text_RegiStory, MSGBOX_NPC end -PacifidlogTown_House1_EventScript_203666:: @ 8203666 - msgbox PacifidlogTown_House1_Text_20373A, MSGBOX_NPC +PacifidlogTown_House1_EventScript_Woman:: @ 8203666 + msgbox PacifidlogTown_House1_Text_SixDotsOpenThreeDoors, MSGBOX_NPC end -PacifidlogTown_House1_Text_20366F: @ 820366F +PacifidlogTown_House1_Text_RegiStory: @ 820366F .string "In the HOENN region, there are three\n" .string "POKéMON that represent the power of\l" .string "rock, ice, and steel.\p" @@ -18,7 +18,7 @@ PacifidlogTown_House1_Text_20366F: @ 820366F .string "That's the story I heard when I was\n" .string "just a little kid.$" -PacifidlogTown_House1_Text_20373A: @ 820373A +PacifidlogTown_House1_Text_SixDotsOpenThreeDoors: @ 820373A .string "“Six dots open three doors.”\p" .string "Grandpa used to say that, but I don't\n" .string "know what he meant.$" diff --git a/data/maps/PacifidlogTown_House2/map.json b/data/maps/PacifidlogTown_House2/map.json index d57720795..8c9cd91af 100644 --- a/data/maps/PacifidlogTown_House2/map.json +++ b/data/maps/PacifidlogTown_House2/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House2_EventScript_203792", + "script": "PacifidlogTown_House2_EventScript_FanClubYoungerBrother", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House2_EventScript_203891", + "script": "PacifidlogTown_House2_EventScript_HappyAzurill", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House2_EventScript_2038AC", + "script": "PacifidlogTown_House2_EventScript_UnhappyAzurill", "flag": "0" } ], diff --git a/data/maps/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc index 4f646ff43..d22a87dc9 100644 --- a/data/maps/PacifidlogTown_House2/scripts.inc +++ b/data/maps/PacifidlogTown_House2/scripts.inc @@ -1,101 +1,101 @@ PacifidlogTown_House2_MapScripts:: @ 8203791 .byte 0 -PacifidlogTown_House2_EventScript_203792:: @ 8203792 +PacifidlogTown_House2_EventScript_FanClubYoungerBrother:: @ 8203792 lock faceplayer dotimebasedevents - call PacifidlogTown_House2_EventScript_2037DE - goto_if_set FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_20387E - call_if_set FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_2037F8 - call_if_unset FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_203801 + call PacifidlogTown_House2_EventScript_UpdateFanClubTMFlag + goto_if_set FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_ComeBackInXDays + call_if_set FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_MonAssessment + call_if_unset FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_FirstMonAssessment setflag FLAG_MET_FANCLUB_YOUNGER_BROTHER specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 4 - goto_if_ge PacifidlogTown_House2_EventScript_203816 + goto_if_ge PacifidlogTown_House2_EventScript_GiveReturn specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 2 - goto_if_ge PacifidlogTown_House2_EventScript_203845 - goto PacifidlogTown_House2_EventScript_20384F + goto_if_ge PacifidlogTown_House2_EventScript_PutInEffort + goto PacifidlogTown_House2_EventScript_GiveFrustration end -PacifidlogTown_House2_EventScript_2037DE:: @ 82037DE +PacifidlogTown_House2_EventScript_UpdateFanClubTMFlag:: @ 82037DE goto_if_unset FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, Common_EventScript_NopReturn specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable compare VAR_RESULT, 0 - call_if_eq PacifidlogTown_House2_EventScript_203812 + call_if_eq PacifidlogTown_House2_EventScript_ClearReceivedFanClubTM return -PacifidlogTown_House2_EventScript_2037F8:: @ 82037F8 - msgbox PacifidlogTown_House2_Text_20395B, MSGBOX_DEFAULT +PacifidlogTown_House2_EventScript_MonAssessment:: @ 82037F8 + msgbox PacifidlogTown_House2_Text_AhYourPokemon, MSGBOX_DEFAULT return -PacifidlogTown_House2_EventScript_203801:: @ 8203801 - msgbox PacifidlogTown_House2_Text_2038C7, MSGBOX_DEFAULT - msgbox PacifidlogTown_House2_Text_20395B, MSGBOX_DEFAULT +PacifidlogTown_House2_EventScript_FirstMonAssessment:: @ 8203801 + msgbox PacifidlogTown_House2_Text_ChairmansYoungerBrotherOnVacation, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_AhYourPokemon, MSGBOX_DEFAULT return -PacifidlogTown_House2_EventScript_203812:: @ 8203812 +PacifidlogTown_House2_EventScript_ClearReceivedFanClubTM:: @ 8203812 clearflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK return -PacifidlogTown_House2_EventScript_203816:: @ 8203816 - msgbox PacifidlogTown_House2_Text_20396D, MSGBOX_DEFAULT +PacifidlogTown_House2_EventScript_GiveReturn:: @ 8203816 + msgbox PacifidlogTown_House2_Text_AdoringPokemonTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_TM27 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK special SetPacifidlogTMReceivedDay - msgbox PacifidlogTown_House2_Text_203A85, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_ExplainReturnFrustration, MSGBOX_DEFAULT release end -PacifidlogTown_House2_EventScript_203845:: @ 8203845 - msgbox PacifidlogTown_House2_Text_2039CE, MSGBOX_DEFAULT +PacifidlogTown_House2_EventScript_PutInEffort:: @ 8203845 + msgbox PacifidlogTown_House2_Text_PutInSomeMoreEffort, MSGBOX_DEFAULT release end -PacifidlogTown_House2_EventScript_20384F:: @ 820384F - msgbox PacifidlogTown_House2_Text_203A2F, MSGBOX_DEFAULT +PacifidlogTown_House2_EventScript_GiveFrustration:: @ 820384F + msgbox PacifidlogTown_House2_Text_ViciousPokemonTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_TM21 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK special SetPacifidlogTMReceivedDay - msgbox PacifidlogTown_House2_Text_203A85, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_ExplainReturnFrustration, MSGBOX_DEFAULT release end -PacifidlogTown_House2_EventScript_20387E:: @ 820387E +PacifidlogTown_House2_EventScript_ComeBackInXDays:: @ 820387E specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable buffernumberstring 0, VAR_RESULT - msgbox PacifidlogTown_House2_Text_203AF4, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_GetGoodTMInXDays, MSGBOX_DEFAULT release end -PacifidlogTown_House2_EventScript_203891:: @ 8203891 +PacifidlogTown_House2_EventScript_HappyAzurill:: @ 8203891 lock faceplayer waitse playmoncry SPECIES_AZURILL, 0 - msgbox PacifidlogTown_House2_Text_203B8D, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_Rurii, MSGBOX_DEFAULT waitmoncry - msgbox PacifidlogTown_House2_Text_203B9D, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_VeryFriendlyWithTrainer, MSGBOX_DEFAULT release end -PacifidlogTown_House2_EventScript_2038AC:: @ 82038AC +PacifidlogTown_House2_EventScript_UnhappyAzurill:: @ 82038AC lock faceplayer waitse playmoncry SPECIES_AZURILL, 2 - msgbox PacifidlogTown_House2_Text_203BCE, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_Rururi, MSGBOX_DEFAULT waitmoncry - msgbox PacifidlogTown_House2_Text_203BDF, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_DoesntLikeTrainerVeryMuch, MSGBOX_DEFAULT release end -PacifidlogTown_House2_Text_2038C7: @ 82038C7 +PacifidlogTown_House2_Text_ChairmansYoungerBrotherOnVacation: @ 82038C7 .string "Er-hem!\p" .string "I am the POKéMON FAN CLUB's most\n" .string "important person, the CHAIRMAN's\l" @@ -103,50 +103,50 @@ PacifidlogTown_House2_Text_2038C7: @ 82038C7 .string "I'm here enjoying my vacation with\n" .string "POKéMON, yes, indeed.$" -PacifidlogTown_House2_Text_20395B: @ 820395B +PacifidlogTown_House2_Text_AhYourPokemon: @ 820395B .string "Ah!\n" .string "Your POKéMON…$" -PacifidlogTown_House2_Text_20396D: @ 820396D +PacifidlogTown_House2_Text_AdoringPokemonTakeThis: @ 820396D .string "It clearly likes you very much.\p" .string "A POKéMON that adoring and adorable\n" .string "deserves a TM like this, no?$" -PacifidlogTown_House2_Text_2039CE: @ 82039CE +PacifidlogTown_House2_Text_PutInSomeMoreEffort: @ 82039CE .string "Hmm…\n" .string "It's not bad, but it's also not good.\p" .string "You, as the TRAINER, need to put in\n" .string "some more effort.$" -PacifidlogTown_House2_Text_203A2F: @ 8203A2F +PacifidlogTown_House2_Text_ViciousPokemonTakeThis: @ 8203A2F .string "It has a vicious look to it.\p" .string "A frightening POKéMON like that\n" .string "deserves a TM like this.$" -PacifidlogTown_House2_Text_203A85: @ 8203A85 +PacifidlogTown_House2_Text_ExplainReturnFrustration: @ 8203A85 .string "If a POKéMON likes you a lot, RETURN's\n" .string "power is enhanced.\p" .string "If it doesn't like you, FRUSTRATION's\n" .string "power goes up.$" -PacifidlogTown_House2_Text_203AF4: @ 8203AF4 +PacifidlogTown_House2_Text_GetGoodTMInXDays: @ 8203AF4 .string "Oh, yes. In about {STR_VAR_1} or so days,\n" .string "I should be getting a good TM or two.\p" .string "You should come see me then.\n" .string "I'll give you a TM that's suitable for\l" .string "your POKéMON.$" -PacifidlogTown_House2_Text_203B8D: @ 8203B8D +PacifidlogTown_House2_Text_Rurii: @ 8203B8D .string "AZURILL: Rurii.$" -PacifidlogTown_House2_Text_203B9D: @ 8203B9D +PacifidlogTown_House2_Text_VeryFriendlyWithTrainer: @ 8203B9D .string "It appears to be very friendly with the\n" .string "TRAINER.$" -PacifidlogTown_House2_Text_203BCE: @ 8203BCE +PacifidlogTown_House2_Text_Rururi: @ 8203BCE .string "AZURILL: Rururi!$" -PacifidlogTown_House2_Text_203BDF: @ 8203BDF +PacifidlogTown_House2_Text_DoesntLikeTrainerVeryMuch: @ 8203BDF .string "It doesn't appear to like the TRAINER\n" .string "very much.$" diff --git a/data/maps/PacifidlogTown_House3/map.json b/data/maps/PacifidlogTown_House3/map.json index 181d69a80..11bd0761b 100644 --- a/data/maps/PacifidlogTown_House3/map.json +++ b/data/maps/PacifidlogTown_House3/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House3_EventScript_203CB5", + "script": "PacifidlogTown_House3_EventScript_Girl", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House3_EventScript_203C11", + "script": "PacifidlogTown_House3_EventScript_Trader", "flag": "0" } ], diff --git a/data/maps/PacifidlogTown_House3/scripts.inc b/data/maps/PacifidlogTown_House3/scripts.inc index 921f788d6..ea33c8d01 100644 --- a/data/maps/PacifidlogTown_House3/scripts.inc +++ b/data/maps/PacifidlogTown_House3/scripts.inc @@ -1,59 +1,59 @@ PacifidlogTown_House3_MapScripts:: @ 8203C10 .byte 0 -PacifidlogTown_House3_EventScript_203C11:: @ 8203C11 +PacifidlogTown_House3_EventScript_Trader:: @ 8203C11 lock faceplayer - goto_if_set FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED, PacifidlogTown_House3_EventScript_203CAB + goto_if_set FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED, PacifidlogTown_House3_EventScript_TradeCompleted setvar VAR_0x8008, INGAME_TRADE_HORSEA copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, GetInGameTradeSpeciesInfo copyvar VAR_0x8009, VAR_RESULT - msgbox PacifidlogTown_House3_Text_203CBE, MSGBOX_YESNO + msgbox PacifidlogTown_House3_Text_WillingToTradeIt, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq PacifidlogTown_House3_EventScript_203C93 + goto_if_eq PacifidlogTown_House3_EventScript_DeclineTrade special ChoosePartyMon waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, 255 - goto_if_eq PacifidlogTown_House3_EventScript_203C93 + goto_if_eq PacifidlogTown_House3_EventScript_DeclineTrade copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, GetTradeSpecies copyvar VAR_0x800B, VAR_RESULT compare VAR_RESULT, VAR_0x8009 - goto_if_ne PacifidlogTown_House3_EventScript_203C9D + goto_if_ne PacifidlogTown_House3_EventScript_NotRequestedMon copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A special CreateInGameTradePokemon special DoInGameTradeScene waitstate bufferspeciesname 0, VAR_0x8009 - msgbox PacifidlogTown_House3_Text_203D87, MSGBOX_DEFAULT + msgbox PacifidlogTown_House3_Text_ItsSubtlyDifferentThankYou, MSGBOX_DEFAULT setflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED release end -PacifidlogTown_House3_EventScript_203C93:: @ 8203C93 - msgbox PacifidlogTown_House3_Text_203E12, MSGBOX_DEFAULT +PacifidlogTown_House3_EventScript_DeclineTrade:: @ 8203C93 + msgbox PacifidlogTown_House3_Text_NotDesperateOrAnything, MSGBOX_DEFAULT release end -PacifidlogTown_House3_EventScript_203C9D:: @ 8203C9D +PacifidlogTown_House3_EventScript_NotRequestedMon:: @ 8203C9D bufferspeciesname 0, VAR_0x8009 - msgbox PacifidlogTown_House3_Text_203DDE, MSGBOX_DEFAULT + msgbox PacifidlogTown_House3_Text_WontAcceptAnyLessThanRealMon, MSGBOX_DEFAULT release end -PacifidlogTown_House3_EventScript_203CAB:: @ 8203CAB - msgbox PacifidlogTown_House3_Text_203E7F, MSGBOX_DEFAULT +PacifidlogTown_House3_EventScript_TradeCompleted:: @ 8203CAB + msgbox PacifidlogTown_House3_Text_ReallyWantedToGetBagon, MSGBOX_DEFAULT release end -PacifidlogTown_House3_EventScript_203CB5:: @ 8203CB5 - msgbox PacifidlogTown_House3_Text_203EF1, MSGBOX_NPC +PacifidlogTown_House3_EventScript_Girl:: @ 8203CB5 + msgbox PacifidlogTown_House3_Text_IsThatAPokedex, MSGBOX_NPC end -PacifidlogTown_House3_Text_203CBE: @ 8203CBE +PacifidlogTown_House3_Text_WillingToTradeIt: @ 8203CBE .string "Check out this {STR_VAR_2}!\p" .string "It's the {STR_VAR_2} that I caught\n" .string "yesterday to celebrate my birthday!\p" @@ -62,29 +62,29 @@ PacifidlogTown_House3_Text_203CBE: @ 8203CBE .string "I'll tell you what. I might be willing\n" .string "to trade it for a {STR_VAR_1}.$" -PacifidlogTown_House3_Text_203D87: @ 8203D87 +PacifidlogTown_House3_Text_ItsSubtlyDifferentThankYou: @ 8203D87 .string "Oh, so this is a {STR_VAR_1}?\p" .string "It's sort of like a {STR_VAR_2},\n" .string "and yet it's subtly different.\p" .string "Thank you!$" -PacifidlogTown_House3_Text_203DDE: @ 8203DDE +PacifidlogTown_House3_Text_WontAcceptAnyLessThanRealMon: @ 8203DDE .string "No, no, no! I won't accept any\n" .string "less than a real {STR_VAR_1}!$" -PacifidlogTown_House3_Text_203E12: @ 8203E12 +PacifidlogTown_House3_Text_NotDesperateOrAnything: @ 8203E12 .string "Oh, so you're not going to go through\n" .string "with this?\p" .string "That's cool. I'm not desperate to make\n" .string "a trade or anything.$" -PacifidlogTown_House3_Text_203E7F: @ 8203E7F +PacifidlogTown_House3_Text_ReallyWantedToGetBagon: @ 8203E7F .string "I know I could go looking for one\n" .string "on my own, but…\p" .string "But I really wanted to get a BAGON\n" .string "that another TRAINER caught…$" -PacifidlogTown_House3_Text_203EF1: @ 8203EF1 +PacifidlogTown_House3_Text_IsThatAPokedex: @ 8203EF1 .string "Is that a POKéDEX?\p" .string "Did you get to meet a lot of different\n" .string "POKéMON?\p" diff --git a/data/maps/PacifidlogTown_House4/map.json b/data/maps/PacifidlogTown_House4/map.json index d38384fc9..f196f6a8a 100644 --- a/data/maps/PacifidlogTown_House4/map.json +++ b/data/maps/PacifidlogTown_House4/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House4_EventScript_203F55", + "script": "PacifidlogTown_House4_EventScript_Woman", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House4_EventScript_203F4C", + "script": "PacifidlogTown_House4_EventScript_LittleGirl", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House4_EventScript_203F5E", + "script": "PacifidlogTown_House4_EventScript_Boy", "flag": "0" } ], diff --git a/data/maps/PacifidlogTown_House4/scripts.inc b/data/maps/PacifidlogTown_House4/scripts.inc index 1535b534d..42a988bc2 100644 --- a/data/maps/PacifidlogTown_House4/scripts.inc +++ b/data/maps/PacifidlogTown_House4/scripts.inc @@ -1,53 +1,53 @@ PacifidlogTown_House4_MapScripts:: @ 8203F4B .byte 0 -PacifidlogTown_House4_EventScript_203F4C:: @ 8203F4C - msgbox PacifidlogTown_House4_Text_204017, MSGBOX_NPC +PacifidlogTown_House4_EventScript_LittleGirl:: @ 8203F4C + msgbox PacifidlogTown_House4_Text_SkyPokemon, MSGBOX_NPC end -PacifidlogTown_House4_EventScript_203F55:: @ 8203F55 - msgbox PacifidlogTown_House4_Text_203F93, MSGBOX_NPC +PacifidlogTown_House4_EventScript_Woman:: @ 8203F55 + msgbox PacifidlogTown_House4_Text_PeopleSawHighFlyingPokemon, MSGBOX_NPC end -PacifidlogTown_House4_EventScript_203F5E:: @ 8203F5E +PacifidlogTown_House4_EventScript_Boy:: @ 8203F5E lock faceplayer - msgbox PacifidlogTown_House4_Text_204035, MSGBOX_YESNO + msgbox PacifidlogTown_House4_Text_WhereDidYouComeFrom, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq PacifidlogTown_House4_EventScript_203F7F + goto_if_eq PacifidlogTown_House4_EventScript_Yes compare VAR_RESULT, NO - goto_if_eq PacifidlogTown_House4_EventScript_203F89 + goto_if_eq PacifidlogTown_House4_EventScript_No end -PacifidlogTown_House4_EventScript_203F7F:: @ 8203F7F - msgbox PacifidlogTown_House4_Text_20404E, MSGBOX_DEFAULT +PacifidlogTown_House4_EventScript_Yes:: @ 8203F7F + msgbox PacifidlogTown_House4_Text_YesTown, MSGBOX_DEFAULT release end -PacifidlogTown_House4_EventScript_203F89:: @ 8203F89 - msgbox PacifidlogTown_House4_Text_204084, MSGBOX_DEFAULT +PacifidlogTown_House4_EventScript_No:: @ 8203F89 + msgbox PacifidlogTown_House4_Text_YouHaveToComeFromSomewhere, MSGBOX_DEFAULT release end -PacifidlogTown_House4_Text_203F93: @ 8203F93 +PacifidlogTown_House4_Text_PeopleSawHighFlyingPokemon: @ 8203F93 .string "People were saying they saw a POKéMON\n" .string "flying high above HOENN.\p" .string "Is it flying around all the time?\n" .string "Doesn't it need to rest somewhere?$" -PacifidlogTown_House4_Text_204017: @ 8204017 +PacifidlogTown_House4_Text_SkyPokemon: @ 8204017 .string "A sky POKéMON!\n" .string "A sky POKéMON!$" -PacifidlogTown_House4_Text_204035: @ 8204035 +PacifidlogTown_House4_Text_WhereDidYouComeFrom: @ 8204035 .string "Where did you come from?$" -PacifidlogTown_House4_Text_20404E: @ 820404E +PacifidlogTown_House4_Text_YesTown: @ 820404E .string "Yes?\n" .string "YES TOWN?\p" .string "I've never heard of a place like that.$" -PacifidlogTown_House4_Text_204084: @ 8204084 +PacifidlogTown_House4_Text_YouHaveToComeFromSomewhere: @ 8204084 .string "No? That doesn't make any sense.\n" .string "You have to come from somewhere.\p" .string "Oh! Wait! You're not going to say you\n" diff --git a/data/maps/PacifidlogTown_House5/map.json b/data/maps/PacifidlogTown_House5/map.json index db7e51c46..c828d7a29 100644 --- a/data/maps/PacifidlogTown_House5/map.json +++ b/data/maps/PacifidlogTown_House5/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House5_EventScript_204111", + "script": "PacifidlogTown_House5_EventScript_MirageIslandWatcher", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House5_EventScript_204137", + "script": "PacifidlogTown_House5_EventScript_Gentleman", "flag": "0" } ], diff --git a/data/maps/PacifidlogTown_House5/scripts.inc b/data/maps/PacifidlogTown_House5/scripts.inc index cdc54fefe..f8be20f47 100644 --- a/data/maps/PacifidlogTown_House5/scripts.inc +++ b/data/maps/PacifidlogTown_House5/scripts.inc @@ -1,33 +1,33 @@ PacifidlogTown_House5_MapScripts:: @ 8204110 .byte 0 -PacifidlogTown_House5_EventScript_204111:: @ 8204111 +PacifidlogTown_House5_EventScript_MirageIslandWatcher:: @ 8204111 lock faceplayer specialvar VAR_RESULT, IsMirageIslandPresent - compare VAR_RESULT, 1 - goto_if_eq PacifidlogTown_House5_EventScript_20412D - msgbox PacifidlogTown_House5_Text_204140, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq PacifidlogTown_House5_EventScript_MirageIslandPresent + msgbox PacifidlogTown_House5_Text_CantSeeMirageIslandToday, MSGBOX_DEFAULT release end -PacifidlogTown_House5_EventScript_20412D:: @ 820412D - msgbox PacifidlogTown_House5_Text_204161, MSGBOX_DEFAULT +PacifidlogTown_House5_EventScript_MirageIslandPresent:: @ 820412D + msgbox PacifidlogTown_House5_Text_CanSeeMirageIslandToday, MSGBOX_DEFAULT release end -PacifidlogTown_House5_EventScript_204137:: @ 8204137 - msgbox PacifidlogTown_House5_Text_20418B, MSGBOX_NPC +PacifidlogTown_House5_EventScript_Gentleman:: @ 8204137 + msgbox PacifidlogTown_House5_Text_MirageIslandAppearDependingOnWeather, MSGBOX_NPC end -PacifidlogTown_House5_Text_204140: @ 8204140 +PacifidlogTown_House5_Text_CantSeeMirageIslandToday: @ 8204140 .string "I can't see MIRAGE ISLAND today…$" -PacifidlogTown_House5_Text_204161: @ 8204161 +PacifidlogTown_House5_Text_CanSeeMirageIslandToday: @ 8204161 .string "Oh! Oh my!\n" .string "I can see MIRAGE ISLAND today!$" -PacifidlogTown_House5_Text_20418B: @ 820418B +PacifidlogTown_House5_Text_MirageIslandAppearDependingOnWeather: @ 820418B .string "MIRAGE ISLAND…\p" .string "It must become visible and invisible\n" .string "depending on the weather conditions\l" diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc index bc018c2f0..dc54ab491 100644 --- a/data/maps/Route109_SeashoreHouse/scripts.inc +++ b/data/maps/Route109_SeashoreHouse/scripts.inc @@ -43,8 +43,6 @@ Route109_SeashoreHouse_EventScript_AlreadyReceivedSodaPop:: @ 8269460 goto_if_eq Route109_SeashoreHouse_EventScript_BuySodaPop msgbox Route109_SeashoreHouse_Text_ThatsTooBad, MSGBOX_DEFAULT hidemoneybox - nop - nop release end @@ -60,24 +58,18 @@ Route109_SeashoreHouse_EventScript_BuySodaPop:: @ 8269484 updatemoneybox 0, 0 giveitem_std ITEM_SODA_POP hidemoneybox - nop - nop release end Route109_SeashoreHouse_EventScript_NotEnoughMoney:: @ 82694C8 msgbox Route109_SeashoreHouse_Text_NotEnoughMoney, MSGBOX_DEFAULT hidemoneybox - nop - nop release end Route109_SeashoreHouse_EventScript_NotEnoughSpace:: @ 82694D5 msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT hidemoneybox - nop - nop release end diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index 5f64957cb..6da6396be 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -75,8 +75,6 @@ Route121_SafariZoneEntrance_EventScript_TryEnterSafariZone:: @ 822BC48 msgbox Route121_SafariZoneEntrance_Text_PleaseEnjoyYourself, MSGBOX_DEFAULT closemessage hidemoneybox - nop - nop applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_EnterSafariZone waitmovement 0 special EnterSafariMode @@ -113,8 +111,6 @@ Route121_SafariZoneEntrance_EventScript_NotEnoughMoney:: @ 822BCF8 Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter:: @ 822BD06 closemessage hidemoneybox - nop - nop applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_BackAwayFromCounter waitmovement 0 releaseall diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json index bd5c8206d..f01096ad4 100644 --- a/data/maps/RusturfTunnel/map.json +++ b/data/maps/RusturfTunnel/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RusturfTunnel_EventScript_22CE76", + "script": "RusturfTunnel_EventScript_WandasBoyfriend", "flag": "FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN" }, { @@ -77,7 +77,7 @@ "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", - "flag": "FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN" + "flag": "FLAG_HIDE_RUSTURF_TUNNEL_BRINEY" }, { "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RusturfTunnel_EventScript_22D0C2", + "script": "RusturfTunnel_EventScript_Grunt", "flag": "FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT" }, { @@ -102,7 +102,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RusturfTunnel_EventScript_22D0AF", + "script": "RusturfTunnel_EventScript_Peeko", "flag": "FLAG_HIDE_RUSTURF_TUNNEL_PEEKO" }, { @@ -128,7 +128,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "RusturfTunnel_EventScript_22D1B1", + "script": "RusturfTunnel_EventScript_Mike", "flag": "0" }, { @@ -141,7 +141,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RusturfTunnel_EventScript_22CE5F", + "script": "RusturfTunnel_EventScript_Wanda", "flag": "FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN" } ], @@ -176,7 +176,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "RusturfTunnel_EventScript_22D071" + "script": "RusturfTunnel_EventScript_TunnelBlockagePos1" }, { "type": "trigger", @@ -185,7 +185,7 @@ "elevation": 3, "var": "VAR_RUSTURF_TUNNEL_STATE", "var_value": "2", - "script": "RusturfTunnel_EventScript_22D083" + "script": "RusturfTunnel_EventScript_AquaGruntBackUp" }, { "type": "trigger", @@ -194,7 +194,7 @@ "elevation": 3, "var": "VAR_RUSTURF_TUNNEL_STATE", "var_value": "2", - "script": "RusturfTunnel_EventScript_22D083" + "script": "RusturfTunnel_EventScript_AquaGruntBackUp" }, { "type": "trigger", @@ -203,7 +203,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "RusturfTunnel_EventScript_22D077" + "script": "RusturfTunnel_EventScript_TunnelBlockagePos2" }, { "type": "trigger", @@ -212,7 +212,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "RusturfTunnel_EventScript_22D07D" + "script": "RusturfTunnel_EventScript_TunnelBlockagePos3" } ], "bg_events": [] diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index aa66ffcc1..9219ba3e4 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -1,146 +1,146 @@ RusturfTunnel_MapScripts:: @ 822CE27 map_script MAP_SCRIPT_ON_TRANSITION, RusturfTunnel_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, RusturfTunnel_MapScript2_22CE32 + map_script MAP_SCRIPT_ON_FRAME_TABLE, RusturfTunnel_OnFrame .byte 0 -RusturfTunnel_MapScript2_22CE32: @ 822CE32 - map_script_2 VAR_RUSTURF_TUNNEL_STATE, 4, RusturfTunnel_EventScript_22CEAE - map_script_2 VAR_RUSTURF_TUNNEL_STATE, 5, RusturfTunnel_EventScript_22CEAE +RusturfTunnel_OnFrame: @ 822CE32 + map_script_2 VAR_RUSTURF_TUNNEL_STATE, 4, RusturfTunnel_EventScript_ClearTunnelScene + map_script_2 VAR_RUSTURF_TUNNEL_STATE, 5, RusturfTunnel_EventScript_ClearTunnelScene .2byte 0 RusturfTunnel_OnTransition: @ 822CE44 compare VAR_RUSTURF_TUNNEL_STATE, 2 - call_if_eq RusturfTunnel_EventScript_22CE50 + call_if_eq RusturfTunnel_EventScript_SetAquaGruntAndPeekoPos end -RusturfTunnel_EventScript_22CE50:: @ 822CE50 +RusturfTunnel_EventScript_SetAquaGruntAndPeekoPos:: @ 822CE50 setobjectxyperm 7, 13, 4 setobjectxyperm 6, 13, 5 return -RusturfTunnel_EventScript_22CE5F:: @ 822CE5F +RusturfTunnel_EventScript_Wanda:: @ 822CE5F lock faceplayer - msgbox RusturfTunnel_Text_22D7A3, MSGBOX_DEFAULT + msgbox RusturfTunnel_Text_BoyfriendOnOtherSideOfRock, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -RusturfTunnel_EventScript_22CE76:: @ 822CE76 +RusturfTunnel_EventScript_WandasBoyfriend:: @ 822CE76 lock faceplayer - goto_if_set FLAG_TEMP_1, RusturfTunnel_EventScript_22CE99 + goto_if_set FLAG_TEMP_1, RusturfTunnel_EventScript_AlreadySpokenTo setflag FLAG_TEMP_1 - msgbox RusturfTunnel_Text_22D510, MSGBOX_DEFAULT + msgbox RusturfTunnel_Text_WhyCantTheyKeepDigging, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -RusturfTunnel_EventScript_22CE99:: @ 822CE99 - msgbox RusturfTunnel_Text_22D5F3, MSGBOX_DEFAULT +RusturfTunnel_EventScript_AlreadySpokenTo:: @ 822CE99 + msgbox RusturfTunnel_Text_ToGetToVerdanturf, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -RusturfTunnel_EventScript_22CEAE:: @ 822CEAE +RusturfTunnel_EventScript_ClearTunnelScene:: @ 822CEAE lockall compare VAR_TEMP_1, 1 - call_if_eq RusturfTunnel_EventScript_22CFA7 + call_if_eq RusturfTunnel_EventScript_FaceWandasBoyfriend1 compare VAR_TEMP_1, 2 - call_if_eq RusturfTunnel_EventScript_22CFBC + call_if_eq RusturfTunnel_EventScript_FaceWandasBoyfriend2 compare VAR_TEMP_1, 3 - call_if_eq RusturfTunnel_EventScript_22CFC7 - call RusturfTunnel_EventScript_22CFFF - msgbox RusturfTunnel_Text_22D65C, MSGBOX_DEFAULT + call_if_eq RusturfTunnel_EventScript_FaceWandasBoyfriend3 + call RusturfTunnel_EventScript_WandasBoyfriendNotice + msgbox RusturfTunnel_Text_YouShatteredBoulderTakeHM, MSGBOX_DEFAULT compare VAR_TEMP_1, 2 - call_if_eq RusturfTunnel_EventScript_22CFC8 + call_if_eq RusturfTunnel_EventScript_WandasBoyfriendApproachPlayer compare VAR_TEMP_1, 3 - call_if_eq RusturfTunnel_EventScript_22CFC8 + call_if_eq RusturfTunnel_EventScript_WandasBoyfriendApproachPlayer giveitem_std ITEM_HM04 setflag FLAG_RECEIVED_HM04 - msgbox RusturfTunnel_Text_22D6D2, MSGBOX_DEFAULT + msgbox RusturfTunnel_Text_ExplainStrength, MSGBOX_DEFAULT closemessage compare VAR_TEMP_1, 1 - call_if_eq RusturfTunnel_EventScript_22CF5D + call_if_eq RusturfTunnel_EventScript_BoyfriendApproachWanda1 compare VAR_TEMP_1, 2 - call_if_eq RusturfTunnel_EventScript_22CF6F + call_if_eq RusturfTunnel_EventScript_BoyfriendApproachWanda2 compare VAR_TEMP_1, 3 - call_if_eq RusturfTunnel_EventScript_22CF8B - msgbox RusturfTunnel_Text_22D745, MSGBOX_DEFAULT + call_if_eq RusturfTunnel_EventScript_BoyfriendApproachWanda3 + msgbox RusturfTunnel_Text_WandaReunion, MSGBOX_DEFAULT closemessage compare VAR_TEMP_1, 1 - call_if_eq RusturfTunnel_EventScript_22CFD4 + call_if_eq RusturfTunnel_EventScript_WandaAndBoyfriendExit1 compare VAR_TEMP_1, 2 - call_if_eq RusturfTunnel_EventScript_22CFE6 + call_if_eq RusturfTunnel_EventScript_WandaAndBoyfriendExit compare VAR_TEMP_1, 3 - call_if_eq RusturfTunnel_EventScript_22CFE6 - call RusturfTunnel_EventScript_272216 + call_if_eq RusturfTunnel_EventScript_WandaAndBoyfriendExit + call RusturfTunnel_EventScript_SetRusturfTunnelOpen releaseall end -RusturfTunnel_EventScript_22CF5D:: @ 822CF5D - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D042 - applymovement 1, RusturfTunnel_Movement_22D067 +RusturfTunnel_EventScript_BoyfriendApproachWanda1:: @ 822CF5D + applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend1 + applymovement 1, RusturfTunnel_Movement_BoyfriendApproachWanda1 waitmovement 0 return -RusturfTunnel_EventScript_22CF6F:: @ 822CF6F - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045 - applymovement 1, RusturfTunnel_Movement_22D06C +RusturfTunnel_EventScript_BoyfriendApproachWanda2:: @ 822CF6F + applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend + applymovement 1, RusturfTunnel_Movement_BoyfriendApproachWanda waitmovement 0 applymovement 10, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -RusturfTunnel_EventScript_22CF8B:: @ 822CF8B - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045 - applymovement 1, RusturfTunnel_Movement_22D06C +RusturfTunnel_EventScript_BoyfriendApproachWanda3:: @ 822CF8B + applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend + applymovement 1, RusturfTunnel_Movement_BoyfriendApproachWanda waitmovement 0 applymovement 10, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -RusturfTunnel_EventScript_22CFA7:: @ 822CFA7 +RusturfTunnel_EventScript_FaceWandasBoyfriend1:: @ 822CFA7 applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -RusturfTunnel_EventScript_22CFBC:: @ 822CFBC - applymovement 1, RusturfTunnel_Movement_22D048 +RusturfTunnel_EventScript_FaceWandasBoyfriend2:: @ 822CFBC + applymovement 1, RusturfTunnel_Movement_BoyfriendFaceRight waitmovement 0 return -RusturfTunnel_EventScript_22CFC7:: @ 822CFC7 +RusturfTunnel_EventScript_FaceWandasBoyfriend3:: @ 822CFC7 return -RusturfTunnel_EventScript_22CFC8:: @ 822CFC8 +RusturfTunnel_EventScript_WandasBoyfriendApproachPlayer:: @ 822CFC8 closemessage - applymovement 1, RusturfTunnel_Movement_22D065 + applymovement 1, RusturfTunnel_Movement_WandasBoyfriendApproachPlayer waitmovement 0 return -RusturfTunnel_EventScript_22CFD4:: @ 822CFD4 - applymovement 10, RusturfTunnel_Movement_22D017 - applymovement 1, RusturfTunnel_Movement_22D04B +RusturfTunnel_EventScript_WandaAndBoyfriendExit1:: @ 822CFD4 + applymovement 10, RusturfTunnel_Movement_WandaExit1 + applymovement 1, RusturfTunnel_Movement_WandasBoyfriendExit1 waitmovement 0 return -RusturfTunnel_EventScript_22CFE6:: @ 822CFE6 - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D02F - applymovement 10, RusturfTunnel_Movement_22D023 - applymovement 1, RusturfTunnel_Movement_22D058 +RusturfTunnel_EventScript_WandaAndBoyfriendExit:: @ 822CFE6 + applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchWandaExit + applymovement 10, RusturfTunnel_Movement_WandaExit + applymovement 1, RusturfTunnel_Movement_WandasBoyfriendExit waitmovement 0 return -RusturfTunnel_EventScript_22CFFF:: @ 822CFFF +RusturfTunnel_EventScript_WandasBoyfriendNotice:: @ 822CFFF playse SE_PIN applymovement 1, Common_Movement_ExclamationMark waitmovement 0 @@ -148,7 +148,7 @@ RusturfTunnel_EventScript_22CFFF:: @ 822CFFF waitmovement 0 return -RusturfTunnel_Movement_22D017: @ 822D017 +RusturfTunnel_Movement_WandaExit1: @ 822D017 walk_right walk_right walk_right @@ -162,7 +162,7 @@ RusturfTunnel_Movement_22D017: @ 822D017 walk_down step_end -RusturfTunnel_Movement_22D023: @ 822D023 +RusturfTunnel_Movement_WandaExit: @ 822D023 walk_right walk_right walk_right @@ -176,7 +176,7 @@ RusturfTunnel_Movement_22D023: @ 822D023 walk_down step_end -RusturfTunnel_Movement_22D02F: @ 822D02F +RusturfTunnel_Movement_PlayerWatchWandaExit: @ 822D02F delay_8 walk_in_place_fastest_up delay_16 @@ -184,11 +184,13 @@ RusturfTunnel_Movement_22D02F: @ 822D02F walk_in_place_fastest_right step_end +@ Unused RusturfTunnel_Movement_22D035: @ 822D035 walk_left walk_in_place_fastest_right step_end +@ Unused RusturfTunnel_Movement_22D038: @ 822D038 walk_down walk_in_place_fastest_up @@ -196,6 +198,7 @@ RusturfTunnel_Movement_22D038: @ 822D038 walk_in_place_fastest_right step_end +@ Unused RusturfTunnel_Movement_22D03D: @ 822D03D walk_up walk_in_place_fastest_down @@ -203,22 +206,22 @@ RusturfTunnel_Movement_22D03D: @ 822D03D walk_in_place_fastest_right step_end -RusturfTunnel_Movement_22D042: @ 822D042 +RusturfTunnel_Movement_PlayerWatchBoyfriend1: @ 822D042 walk_left walk_in_place_fastest_right step_end -RusturfTunnel_Movement_22D045: @ 822D045 +RusturfTunnel_Movement_PlayerWatchBoyfriend: @ 822D045 walk_right walk_in_place_fastest_left step_end -RusturfTunnel_Movement_22D048: @ 822D048 +RusturfTunnel_Movement_BoyfriendFaceRight: @ 822D048 walk_up walk_in_place_fastest_right step_end -RusturfTunnel_Movement_22D04B: @ 822D04B +RusturfTunnel_Movement_WandasBoyfriendExit1: @ 822D04B walk_right walk_right walk_right @@ -233,7 +236,7 @@ RusturfTunnel_Movement_22D04B: @ 822D04B walk_down step_end -RusturfTunnel_Movement_22D058: @ 822D058 +RusturfTunnel_Movement_WandasBoyfriendExit: @ 822D058 walk_up walk_right walk_right @@ -248,42 +251,42 @@ RusturfTunnel_Movement_22D058: @ 822D058 walk_down step_end -RusturfTunnel_Movement_22D065: @ 822D065 +RusturfTunnel_Movement_WandasBoyfriendApproachPlayer: @ 822D065 walk_right step_end -RusturfTunnel_Movement_22D067: @ 822D067 +RusturfTunnel_Movement_BoyfriendApproachWanda1: @ 822D067 walk_in_place_fast_up walk_in_place_fast_up walk_fast_up walk_fast_right step_end -RusturfTunnel_Movement_22D06C: @ 822D06C +RusturfTunnel_Movement_BoyfriendApproachWanda: @ 822D06C walk_in_place_fast_right walk_in_place_fast_right walk_fast_right walk_in_place_fastest_up step_end -RusturfTunnel_EventScript_22D071:: @ 822D071 +RusturfTunnel_EventScript_TunnelBlockagePos1:: @ 822D071 setvar VAR_TEMP_1, 1 end -RusturfTunnel_EventScript_22D077:: @ 822D077 +RusturfTunnel_EventScript_TunnelBlockagePos2:: @ 822D077 setvar VAR_TEMP_1, 2 end -RusturfTunnel_EventScript_22D07D:: @ 822D07D +RusturfTunnel_EventScript_TunnelBlockagePos3:: @ 822D07D setvar VAR_TEMP_1, 3 end -RusturfTunnel_EventScript_22D083:: @ 822D083 +RusturfTunnel_EventScript_AquaGruntBackUp:: @ 822D083 lockall - msgbox RusturfTunnel_Text_22D1C8, MSGBOX_DEFAULT + msgbox RusturfTunnel_Text_ComeAndGetSome, MSGBOX_DEFAULT closemessage - applymovement 6, RusturfTunnel_Movement_22D0AB - applymovement 7, RusturfTunnel_Movement_22D0AB + applymovement 6, RusturfTunnel_Movement_GruntAndPeekoBackUp + applymovement 7, RusturfTunnel_Movement_GruntAndPeekoBackUp waitmovement 0 copyobjectxytoperm 6 copyobjectxytoperm 7 @@ -291,55 +294,55 @@ RusturfTunnel_EventScript_22D083:: @ 822D083 releaseall end -RusturfTunnel_Movement_22D0AB: @ 822D0AB +RusturfTunnel_Movement_GruntAndPeekoBackUp: @ 822D0AB lock_facing_direction walk_right unlock_facing_direction step_end -RusturfTunnel_EventScript_22D0AF:: @ 822D0AF +RusturfTunnel_EventScript_Peeko:: @ 822D0AF lock faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox RusturfTunnel_Text_22D1F7, MSGBOX_DEFAULT + msgbox RusturfTunnel_Text_Peeko, MSGBOX_DEFAULT waitmoncry release end -RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 +RusturfTunnel_EventScript_Grunt:: @ 822D0C2 lock faceplayer playbgm MUS_AQA_0, 0 - msgbox RusturfTunnel_Text_22D20A, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_GRUNT_RUSTURF_TUNNEL, RusturfTunnel_Text_22D2B0 - msgbox RusturfTunnel_Text_22D2E1, MSGBOX_DEFAULT + msgbox RusturfTunnel_Text_GruntIntro, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_RUSTURF_TUNNEL, RusturfTunnel_Text_GruntDefeat + msgbox RusturfTunnel_Text_GruntTakePackage, MSGBOX_DEFAULT giveitem_std ITEM_DEVON_GOODS closemessage - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D178 - applymovement 6, RusturfTunnel_Movement_22D181 + applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PushPlayerAsideForGrunt + applymovement 6, RusturfTunnel_Movement_GruntEscape waitmovement 0 removeobject 6 delay 50 addobject 5 - applymovement 5, RusturfTunnel_Movement_22D18B + applymovement 5, RusturfTunnel_Movement_BrineyApproachPeeko1 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D17E - applymovement 5, RusturfTunnel_Movement_22D1A4 + applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerMoveAsideForBriney + applymovement 5, RusturfTunnel_Movement_BrineyApproachPeeko2 waitmovement 0 - msgbox RusturfTunnel_Text_22D395, MSGBOX_DEFAULT + msgbox RusturfTunnel_Text_PeekoGladToSeeYouSafe, MSGBOX_DEFAULT applymovement 5, Common_Movement_FacePlayer waitmovement 0 - message RusturfTunnel_Text_22D3BA + message RusturfTunnel_Text_ThankYouLetsGoHomePeeko waitmessage waitse playmoncry SPECIES_WINGULL, 0 waitbuttonpress waitmoncry closemessage - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D19F - applymovement 5, RusturfTunnel_Movement_22D193 - applymovement 7, RusturfTunnel_Movement_22D1A7 + applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBrineyExit + applymovement 5, RusturfTunnel_Movement_BrineyExit + applymovement 7, RusturfTunnel_Movement_PeekoExit waitmovement 0 removeobject 5 removeobject 7 @@ -351,7 +354,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 release end -RusturfTunnel_Movement_22D178: @ 822D178 +RusturfTunnel_Movement_PushPlayerAsideForGrunt: @ 822D178 face_down lock_facing_direction walk_up @@ -359,12 +362,12 @@ RusturfTunnel_Movement_22D178: @ 822D178 walk_in_place_fastest_left step_end -RusturfTunnel_Movement_22D17E: @ 822D17E +RusturfTunnel_Movement_PlayerMoveAsideForBriney: @ 822D17E walk_down walk_in_place_fastest_up step_end -RusturfTunnel_Movement_22D181: @ 822D181 +RusturfTunnel_Movement_GruntEscape: @ 822D181 walk_fast_left walk_fast_left walk_fast_left @@ -376,7 +379,7 @@ RusturfTunnel_Movement_22D181: @ 822D181 walk_fast_left step_end -RusturfTunnel_Movement_22D18B: @ 822D18B +RusturfTunnel_Movement_BrineyApproachPeeko1: @ 822D18B walk_right walk_right walk_right @@ -386,7 +389,7 @@ RusturfTunnel_Movement_22D18B: @ 822D18B walk_right step_end -RusturfTunnel_Movement_22D193: @ 822D193 +RusturfTunnel_Movement_BrineyExit: @ 822D193 walk_left walk_left walk_left @@ -400,19 +403,19 @@ RusturfTunnel_Movement_22D193: @ 822D193 walk_left step_end -RusturfTunnel_Movement_22D19F: @ 822D19F +RusturfTunnel_Movement_PlayerWatchBrineyExit: @ 822D19F delay_16 delay_8 delay_4 walk_in_place_fastest_left step_end -RusturfTunnel_Movement_22D1A4: @ 822D1A4 +RusturfTunnel_Movement_BrineyApproachPeeko2: @ 822D1A4 delay_16 walk_right step_end -RusturfTunnel_Movement_22D1A7: @ 822D1A7 +RusturfTunnel_Movement_PeekoExit: @ 822D1A7 walk_left walk_left walk_left @@ -424,19 +427,19 @@ RusturfTunnel_Movement_22D1A7: @ 822D1A7 walk_left step_end -RusturfTunnel_EventScript_22D1B1:: @ 822D1B1 - trainerbattle_single TRAINER_MIKE_2, RusturfTunnel_Text_22D84D, RusturfTunnel_Text_22D8DB - msgbox RusturfTunnel_Text_22D8F9, MSGBOX_AUTOCLOSE +RusturfTunnel_EventScript_Mike:: @ 822D1B1 + trainerbattle_single TRAINER_MIKE_2, RusturfTunnel_Text_MikeIntro, RusturfTunnel_Text_MikeDefeat + msgbox RusturfTunnel_Text_MikePostBattle, MSGBOX_AUTOCLOSE end -RusturfTunnel_Text_22D1C8: @ 822D1C8 +RusturfTunnel_Text_ComeAndGetSome: @ 822D1C8 .string "What, are you coming?\n" .string "Come and get some, then!$" -RusturfTunnel_Text_22D1F7: @ 822D1F7 +RusturfTunnel_Text_Peeko: @ 822D1F7 .string "PEEKO: Pii pihyoh!$" -RusturfTunnel_Text_22D20A: @ 822D20A +RusturfTunnel_Text_GruntIntro: @ 822D20A .string "Grah, keelhaul it all!\p" .string "That hostage POKéMON turned out to\n" .string "be worthless!\p" @@ -445,11 +448,11 @@ RusturfTunnel_Text_22D20A: @ 822D20A .string "Hey! You!\n" .string "So you want to battle me?$" -RusturfTunnel_Text_22D2B0: @ 822D2B0 +RusturfTunnel_Text_GruntDefeat: @ 822D2B0 .string "Urrrggh! My career in crime comes to\n" .string "a dead end!$" -RusturfTunnel_Text_22D2E1: @ 822D2E1 +RusturfTunnel_Text_GruntTakePackage: @ 822D2E1 .string "This is plain not right…\p" .string "The BOSS told me this would be a\n" .string "slick-and-easy job to pull.\p" @@ -458,11 +461,11 @@ RusturfTunnel_Text_22D2E1: @ 822D2E1 .string "Tch!\n" .string "You want it back that badly, take it!$" -RusturfTunnel_Text_22D395: @ 822D395 +RusturfTunnel_Text_PeekoGladToSeeYouSafe: @ 822D395 .string "PEEKO!\n" .string "Am I glad to see you're safe!$" -RusturfTunnel_Text_22D3BA: @ 822D3BA +RusturfTunnel_Text_ThankYouLetsGoHomePeeko: @ 822D3BA .string "PEEKO owes her life to you!\p" .string "They call me MR. BRINEY.\n" .string "And, you are?\p" @@ -478,7 +481,7 @@ RusturfTunnel_Text_22D3BA: @ 822D3BA .string "home.\p" .string "PEEKO: Pihyoh!$" -RusturfTunnel_Text_22D510: @ 822D510 +RusturfTunnel_Text_WhyCantTheyKeepDigging: @ 822D510 .string "… …\p" .string "Why can't they keep digging?\n" .string "Is the bedrock too hard?\p" @@ -490,30 +493,30 @@ RusturfTunnel_Text_22D510: @ 822D510 .string "But this…\n" .string "What am I to do?$" -RusturfTunnel_Text_22D5F3: @ 822D5F3 +RusturfTunnel_Text_ToGetToVerdanturf: @ 822D5F3 .string "To get from RUSTBORO to VERDANTURF,\n" .string "you need to go to DEWFORD, then pass\l" .string "through SLATEPORT and MAUVILLE…$" -RusturfTunnel_Text_22D65C: @ 822D65C +RusturfTunnel_Text_YouShatteredBoulderTakeHM: @ 822D65C .string "Wow! You shattered that boulder\n" .string "blocking the way.\p" .string "To show you how much I appreciate it,\n" .string "I'd like you to have this HM.$" -RusturfTunnel_Text_22D6D2: @ 822D6D2 +RusturfTunnel_Text_ExplainStrength: @ 822D6D2 .string "That HM contains STRENGTH.\p" .string "If a muscular POKéMON were to learn\n" .string "that, it would be able to move even\l" .string "large boulders.$" -RusturfTunnel_Text_22D745: @ 822D745 +RusturfTunnel_Text_WandaReunion: @ 822D745 .string "WANDA!\n" .string "Now I can see you anytime!\p" .string "WANDA: That's…wonderful.\p" .string "Please, take some rest at my home.$" -RusturfTunnel_Text_22D7A3: @ 822D7A3 +RusturfTunnel_Text_BoyfriendOnOtherSideOfRock: @ 822D7A3 .string "On the other side of this rock…\n" .string "My boyfriend is there.\p" .string "He… He's not just digging the tunnel\n" @@ -521,17 +524,17 @@ RusturfTunnel_Text_22D7A3: @ 822D7A3 .string "He works his hands raw and rough\n" .string "for the benefit of everyone.$" -RusturfTunnel_Text_22D84D: @ 822D84D +RusturfTunnel_Text_MikeIntro: @ 822D84D .string "What do you call a wild man up in the\n" .string "mountains? A mountain man, right?\p" .string "So why don't they call a POKéMON in\n" .string "the mountains a mountain POKéMON?$" -RusturfTunnel_Text_22D8DB: @ 822D8DB +RusturfTunnel_Text_MikeDefeat: @ 822D8DB .string "My POKéMON…\n" .string "Ran out of power…$" -RusturfTunnel_Text_22D8F9: @ 822D8F9 +RusturfTunnel_Text_MikePostBattle: @ 822D8F9 .string "They halted development here to\n" .string "protect POKéMON, right?\l" .string "There's a feel-good story!$" diff --git a/data/maps/SealedChamber_InnerRoom/map.json b/data/maps/SealedChamber_InnerRoom/map.json index e0e6097ec..4549a1bbd 100644 --- a/data/maps/SealedChamber_InnerRoom/map.json +++ b/data/maps/SealedChamber_InnerRoom/map.json @@ -31,7 +31,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_InnerRoom_EventScript_2391F8" + "script": "SealedChamber_InnerRoom_EventScript_BrailleBackWall" }, { "type": "sign", @@ -39,7 +39,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_InnerRoom_EventScript_239255" + "script": "SealedChamber_InnerRoom_EventScript_BrailleStoryPart1" }, { "type": "sign", @@ -47,7 +47,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_InnerRoom_EventScript_23925F" + "script": "SealedChamber_InnerRoom_EventScript_BrailleStoryPart2" }, { "type": "sign", @@ -55,7 +55,7 @@ "y": 13, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_InnerRoom_EventScript_239269" + "script": "SealedChamber_InnerRoom_EventScript_BrailleStoryPart3" }, { "type": "sign", @@ -63,7 +63,7 @@ "y": 13, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_InnerRoom_EventScript_239273" + "script": "SealedChamber_InnerRoom_EventScript_BrailleStoryPart4" }, { "type": "sign", @@ -71,7 +71,7 @@ "y": 18, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_InnerRoom_EventScript_23927D" + "script": "SealedChamber_InnerRoom_EventScript_BrailleStoryPart5" }, { "type": "sign", @@ -79,7 +79,7 @@ "y": 18, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_InnerRoom_EventScript_239287" + "script": "SealedChamber_InnerRoom_EventScript_BrailleStoryPart6" }, { "type": "sign", @@ -87,7 +87,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_InnerRoom_EventScript_2391F8" + "script": "SealedChamber_InnerRoom_EventScript_BrailleBackWall" }, { "type": "sign", @@ -95,7 +95,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_InnerRoom_EventScript_2391F8" + "script": "SealedChamber_InnerRoom_EventScript_BrailleBackWall" } ] }
\ No newline at end of file diff --git a/data/maps/SealedChamber_InnerRoom/scripts.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc index 6dde1d444..15c98e57e 100644 --- a/data/maps/SealedChamber_InnerRoom/scripts.inc +++ b/data/maps/SealedChamber_InnerRoom/scripts.inc @@ -1,15 +1,15 @@ SealedChamber_InnerRoom_MapScripts:: @ 82391F7 .byte 0 -SealedChamber_InnerRoom_EventScript_2391F8:: @ 82391F8 +SealedChamber_InnerRoom_EventScript_BrailleBackWall:: @ 82391F8 lockall - braillemessage SealedChamber_InnerRoom_Braille_2A6B99 + braillemessage SealedChamber_InnerRoom_Braille_FirstWailordLastRelicanth waitbuttonpress closebraillemessage - goto_if_set FLAG_REGI_DOORS_OPENED, SealedChamber_InnerRoom_EventScript_239253 + goto_if_set FLAG_REGI_DOORS_OPENED, SealedChamber_InnerRoom_EventScript_NoEffect specialvar VAR_RESULT, CheckRelicanthWailord - compare VAR_RESULT, 0 - goto_if_eq SealedChamber_InnerRoom_EventScript_239253 + compare VAR_RESULT, FALSE + goto_if_eq SealedChamber_InnerRoom_EventScript_NoEffect fadeoutbgm 0 playse SE_TRACK_MOVE special DoSealedChamberShakingEffect1 @@ -34,53 +34,53 @@ SealedChamber_InnerRoom_EventScript_2391F8:: @ 82391F8 releaseall end -SealedChamber_InnerRoom_EventScript_239253:: @ 8239253 +SealedChamber_InnerRoom_EventScript_NoEffect:: @ 8239253 releaseall end -SealedChamber_InnerRoom_EventScript_239255:: @ 8239255 +SealedChamber_InnerRoom_EventScript_BrailleStoryPart1:: @ 8239255 lockall - braillemessage SealedChamber_InnerRoom_Braille_2A6BCA + braillemessage SealedChamber_InnerRoom_Braille_InThisCaveWeHaveLived waitbuttonpress closebraillemessage releaseall end -SealedChamber_InnerRoom_EventScript_23925F:: @ 823925F +SealedChamber_InnerRoom_EventScript_BrailleStoryPart2:: @ 823925F lockall - braillemessage SealedChamber_InnerRoom_Braille_2A6BEC + braillemessage SealedChamber_InnerRoom_Braille_WeOweAllToThePokemon waitbuttonpress closebraillemessage releaseall end -SealedChamber_InnerRoom_EventScript_239269:: @ 8239269 +SealedChamber_InnerRoom_EventScript_BrailleStoryPart3:: @ 8239269 lockall - braillemessage SealedChamber_InnerRoom_Braille_2A6C0D + braillemessage SealedChamber_InnerRoom_Braille_ButWeSealedThePokemonAway waitbuttonpress closebraillemessage releaseall end -SealedChamber_InnerRoom_EventScript_239273:: @ 8239273 +SealedChamber_InnerRoom_EventScript_BrailleStoryPart4:: @ 8239273 lockall - braillemessage SealedChamber_InnerRoom_Braille_2A6C34 + braillemessage SealedChamber_InnerRoom_Braille_WeFearedIt waitbuttonpress closebraillemessage releaseall end -SealedChamber_InnerRoom_EventScript_23927D:: @ 823927D +SealedChamber_InnerRoom_EventScript_BrailleStoryPart5:: @ 823927D lockall - braillemessage SealedChamber_InnerRoom_Braille_2A6C48 + braillemessage SealedChamber_InnerRoom_Braille_ThoseWithCourageHope waitbuttonpress closebraillemessage releaseall end -SealedChamber_InnerRoom_EventScript_239287:: @ 8239287 +SealedChamber_InnerRoom_EventScript_BrailleStoryPart6:: @ 8239287 lockall - braillemessage SealedChamber_InnerRoom_Braille_2A6C73 + braillemessage SealedChamber_InnerRoom_Braille_OpenDoorEternalPokemonWaits waitbuttonpress closebraillemessage releaseall diff --git a/data/maps/SealedChamber_OuterRoom/map.json b/data/maps/SealedChamber_OuterRoom/map.json index cc9c32272..54a10ee70 100644 --- a/data/maps/SealedChamber_OuterRoom/map.json +++ b/data/maps/SealedChamber_OuterRoom/map.json @@ -31,7 +31,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_23916C" + "script": "SealedChamber_OuterRoom_EventScript_BrailleABC" }, { "type": "sign", @@ -39,7 +39,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_239176" + "script": "SealedChamber_OuterRoom_EventScript_BrailleGHI" }, { "type": "sign", @@ -47,7 +47,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_239180" + "script": "SealedChamber_OuterRoom_EventScript_BrailleMNO" }, { "type": "sign", @@ -55,7 +55,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_23918A" + "script": "SealedChamber_OuterRoom_EventScript_BrailleTUV" }, { "type": "sign", @@ -63,7 +63,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_239194" + "script": "SealedChamber_OuterRoom_EventScript_BrailleDEF" }, { "type": "sign", @@ -71,7 +71,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_23919E" + "script": "SealedChamber_OuterRoom_EventScript_BrailleJKL" }, { "type": "sign", @@ -79,7 +79,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_2391A8" + "script": "SealedChamber_OuterRoom_EventScript_BraillePQRS" }, { "type": "sign", @@ -87,7 +87,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_2391BC" + "script": "SealedChamber_OuterRoom_EventScript_BrailleWXYZ" }, { "type": "sign", @@ -95,7 +95,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_2391B2" + "script": "SealedChamber_OuterRoom_EventScript_BraillePeriod" }, { "type": "sign", @@ -103,7 +103,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_2391C6" + "script": "SealedChamber_OuterRoom_EventScript_BrailleComma" }, { "type": "sign", @@ -111,7 +111,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_2391D0" + "script": "SealedChamber_OuterRoom_EventScript_InnerRoomEntranceWall" }, { "type": "sign", @@ -119,7 +119,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_23916C" + "script": "SealedChamber_OuterRoom_EventScript_BrailleABC" }, { "type": "sign", @@ -127,7 +127,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_23916C" + "script": "SealedChamber_OuterRoom_EventScript_BrailleABC" }, { "type": "sign", @@ -135,7 +135,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_239176" + "script": "SealedChamber_OuterRoom_EventScript_BrailleGHI" }, { "type": "sign", @@ -143,7 +143,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_239176" + "script": "SealedChamber_OuterRoom_EventScript_BrailleGHI" }, { "type": "sign", @@ -151,7 +151,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_239180" + "script": "SealedChamber_OuterRoom_EventScript_BrailleMNO" }, { "type": "sign", @@ -159,7 +159,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_239180" + "script": "SealedChamber_OuterRoom_EventScript_BrailleMNO" }, { "type": "sign", @@ -167,7 +167,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_23918A" + "script": "SealedChamber_OuterRoom_EventScript_BrailleTUV" }, { "type": "sign", @@ -175,7 +175,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_23918A" + "script": "SealedChamber_OuterRoom_EventScript_BrailleTUV" }, { "type": "sign", @@ -183,7 +183,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_239194" + "script": "SealedChamber_OuterRoom_EventScript_BrailleDEF" }, { "type": "sign", @@ -191,7 +191,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_239194" + "script": "SealedChamber_OuterRoom_EventScript_BrailleDEF" }, { "type": "sign", @@ -199,7 +199,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_23919E" + "script": "SealedChamber_OuterRoom_EventScript_BrailleJKL" }, { "type": "sign", @@ -207,7 +207,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_23919E" + "script": "SealedChamber_OuterRoom_EventScript_BrailleJKL" }, { "type": "sign", @@ -215,7 +215,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_2391A8" + "script": "SealedChamber_OuterRoom_EventScript_BraillePQRS" }, { "type": "sign", @@ -223,7 +223,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_2391A8" + "script": "SealedChamber_OuterRoom_EventScript_BraillePQRS" }, { "type": "sign", @@ -231,7 +231,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_2391BC" + "script": "SealedChamber_OuterRoom_EventScript_BrailleWXYZ" }, { "type": "sign", @@ -239,7 +239,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_2391BC" + "script": "SealedChamber_OuterRoom_EventScript_BrailleWXYZ" }, { "type": "sign", @@ -247,7 +247,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_2391ED" + "script": "SealedChamber_OuterRoom_EventScript_BrailleDigHere" }, { "type": "sign", @@ -255,7 +255,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_2391ED" + "script": "SealedChamber_OuterRoom_EventScript_BrailleDigHere" } ] }
\ No newline at end of file diff --git a/data/maps/SealedChamber_OuterRoom/scripts.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc index e3a7086a3..f3cd05a86 100644 --- a/data/maps/SealedChamber_OuterRoom/scripts.inc +++ b/data/maps/SealedChamber_OuterRoom/scripts.inc @@ -1,10 +1,10 @@ SealedChamber_OuterRoom_MapScripts:: @ 8239106 - map_script MAP_SCRIPT_ON_RESUME, SealedChamber_OuterRoom_MapScript1_239116 + map_script MAP_SCRIPT_ON_RESUME, SealedChamber_OuterRoom_OnResume map_script MAP_SCRIPT_ON_TRANSITION, SealedChamber_OuterRoom_OnTransition - map_script MAP_SCRIPT_ON_LOAD, SealedChamber_OuterRoom_MapScript1_23912B + map_script MAP_SCRIPT_ON_LOAD, SealedChamber_OuterRoom_OnLoad .byte 0 -SealedChamber_OuterRoom_MapScript1_239116: @ 8239116 +SealedChamber_OuterRoom_OnResume: @ 8239116 setdivewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44 setescapewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44 end @@ -13,11 +13,11 @@ SealedChamber_OuterRoom_OnTransition: @ 8239127 setflag FLAG_LANDMARK_SEALED_CHAMBER end -SealedChamber_OuterRoom_MapScript1_23912B: @ 823912B - call_if_unset FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_239135 +SealedChamber_OuterRoom_OnLoad: @ 823912B + call_if_unset FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_CloseInnerRoomEntrance end -SealedChamber_OuterRoom_EventScript_239135:: @ 8239135 +SealedChamber_OuterRoom_EventScript_CloseInnerRoomEntrance:: @ 8239135 setmetatile 9, 1, METATILE_Cave_EntranceCover, 1 setmetatile 10, 1, METATILE_Cave_EntranceCover, 1 setmetatile 11, 1, METATILE_Cave_EntranceCover, 1 @@ -26,103 +26,103 @@ SealedChamber_OuterRoom_EventScript_239135:: @ 8239135 setmetatile 11, 2, METATILE_Cave_SealedChamberBraille_Mid, 1 return -SealedChamber_OuterRoom_EventScript_23916C:: @ 823916C +SealedChamber_OuterRoom_EventScript_BrailleABC:: @ 823916C lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B27 + braillemessage SealedChamber_OuterRoom_Braille_ABC waitbuttonpress closebraillemessage releaseall end -SealedChamber_OuterRoom_EventScript_239176:: @ 8239176 +SealedChamber_OuterRoom_EventScript_BrailleGHI:: @ 8239176 lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B31 + braillemessage SealedChamber_OuterRoom_Braille_GHI waitbuttonpress closebraillemessage releaseall end -SealedChamber_OuterRoom_EventScript_239180:: @ 8239180 +SealedChamber_OuterRoom_EventScript_BrailleMNO:: @ 8239180 lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B3B + braillemessage SealedChamber_OuterRoom_Braille_MNO waitbuttonpress closebraillemessage releaseall end -SealedChamber_OuterRoom_EventScript_23918A:: @ 823918A +SealedChamber_OuterRoom_EventScript_BrailleTUV:: @ 823918A lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B45 + braillemessage SealedChamber_OuterRoom_Braille_TUV waitbuttonpress closebraillemessage releaseall end -SealedChamber_OuterRoom_EventScript_239194:: @ 8239194 +SealedChamber_OuterRoom_EventScript_BrailleDEF:: @ 8239194 lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B4F + braillemessage SealedChamber_OuterRoom_Braille_DEF waitbuttonpress closebraillemessage releaseall end -SealedChamber_OuterRoom_EventScript_23919E:: @ 823919E +SealedChamber_OuterRoom_EventScript_BrailleJKL:: @ 823919E lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B59 + braillemessage SealedChamber_OuterRoom_Braille_JKL waitbuttonpress closebraillemessage releaseall end -SealedChamber_OuterRoom_EventScript_2391A8:: @ 82391A8 +SealedChamber_OuterRoom_EventScript_BraillePQRS:: @ 82391A8 lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B63 + braillemessage SealedChamber_OuterRoom_Braille_PQRS waitbuttonpress closebraillemessage releaseall end -SealedChamber_OuterRoom_EventScript_2391B2:: @ 82391B2 +SealedChamber_OuterRoom_EventScript_BraillePeriod:: @ 82391B2 lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B6E + braillemessage SealedChamber_OuterRoom_Braille_Period waitbuttonpress closebraillemessage releaseall end -SealedChamber_OuterRoom_EventScript_2391BC:: @ 82391BC +SealedChamber_OuterRoom_EventScript_BrailleWXYZ:: @ 82391BC lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B76 + braillemessage SealedChamber_OuterRoom_Braille_WXYZ waitbuttonpress closebraillemessage releaseall end -SealedChamber_OuterRoom_EventScript_2391C6:: @ 82391C6 +SealedChamber_OuterRoom_EventScript_BrailleComma:: @ 82391C6 lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B81 + braillemessage SealedChamber_OuterRoom_Braille_Comma waitbuttonpress closebraillemessage releaseall end -SealedChamber_OuterRoom_EventScript_2391D0:: @ 82391D0 +SealedChamber_OuterRoom_EventScript_InnerRoomEntranceWall:: @ 82391D0 lockall - goto_if_set FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_2391E3 - braillemessage SealedChamber_OuterRoom_Braille_2A6B89 + goto_if_set FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_HoleInWall + braillemessage SealedChamber_OuterRoom_Braille_DigHere waitbuttonpress closebraillemessage releaseall end -SealedChamber_OuterRoom_EventScript_2391E3:: @ 82391E3 +SealedChamber_OuterRoom_EventScript_HoleInWall:: @ 82391E3 msgbox gText_BigHoleInTheWall, MSGBOX_DEFAULT releaseall end -SealedChamber_OuterRoom_EventScript_2391ED:: @ 82391ED +SealedChamber_OuterRoom_EventScript_BrailleDigHere:: @ 82391ED lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B89 + braillemessage SealedChamber_OuterRoom_Braille_DigHere waitbuttonpress closebraillemessage releaseall diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.json b/data/maps/ShoalCave_LowTideEntranceRoom/map.json index 4b5d23110..984537594 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/map.json +++ b/data/maps/ShoalCave_LowTideEntranceRoom/map.json @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "ShoalCave_LowTideEntranceRoom_EventScript_236DD9", + "script": "ShoalCave_LowTideEntranceRoom_EventScript_ShellBellExpert", "flag": "0" } ], diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc index f5c487ab3..8713578cf 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc @@ -4,90 +4,91 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 8236DBA ShoalCave_LowTideEntranceRoom_OnTransition: @ 8236DC0 special UpdateShoalTideFlag - goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideEntranceRoom_EventScript_236DD1 - goto ShoalCave_LowTideEntranceRoom_EventScript_236DD5 + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideEntranceRoom_EventScript_SetHighTide + goto ShoalCave_LowTideEntranceRoom_EventScript_SetLowTide -ShoalCave_LowTideEntranceRoom_EventScript_236DD1:: @ 8236DD1 +ShoalCave_LowTideEntranceRoom_EventScript_SetHighTide:: @ 8236DD1 setmaplayoutindex LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM end -ShoalCave_LowTideEntranceRoom_EventScript_236DD5:: @ 8236DD5 +ShoalCave_LowTideEntranceRoom_EventScript_SetLowTide:: @ 8236DD5 setmaplayoutindex LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM end -ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9 +ShoalCave_LowTideEntranceRoom_EventScript_ShellBellExpert:: @ 8236DD9 lock faceplayer dotimebasedevents - call_if_set FLAG_SYS_SHOAL_ITEM, ShoalCave_LowTideEntranceRoom_EventScript_236ED9 + call_if_set FLAG_SYS_SHOAL_ITEM, ShoalCave_LowTideEntranceRoom_EventScript_ResetShoalItems checkitem ITEM_SHOAL_SALT, 4 - compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B + compare VAR_RESULT, FALSE + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_NotEnoughShoalSaltOrShells checkitem ITEM_SHOAL_SHELL, 4 - compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B - msgbox ShoalCave_LowTideEntranceRoom_Text_2A7F37, MSGBOX_YESNO + compare VAR_RESULT, FALSE + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_NotEnoughShoalSaltOrShells + msgbox ShoalCave_LowTideEntranceRoom_Text_WouldYouLikeShellBell, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236ECF + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_DeclineShellBell checkitemspace ITEM_SHELL_BELL, 1 - compare VAR_RESULT, 0 - call_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E69 + compare VAR_RESULT, FALSE + call_if_eq ShoalCave_LowTideEntranceRoom_EventScript_CheckSpaceWillBeFreed compare VAR_RESULT, 2 - goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E91 - msgbox ShoalCave_LowTideEntranceRoom_Text_2A7FAC, MSGBOX_DEFAULT + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_NoRoomForShellBell + msgbox ShoalCave_LowTideEntranceRoom_Text_MakeShellBellRightAway, MSGBOX_DEFAULT takeitem ITEM_SHOAL_SALT, 4 takeitem ITEM_SHOAL_SHELL, 4 giveitem_std ITEM_SHELL_BELL - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull - msgbox ShoalCave_LowTideEntranceRoom_Text_2A8012, MSGBOX_DEFAULT + msgbox ShoalCave_LowTideEntranceRoom_Text_ExplainShellBell, MSGBOX_DEFAULT setflag FLAG_TEMP_2 release end -ShoalCave_LowTideEntranceRoom_EventScript_236E69:: @ 8236E69 +@ If the bag is full, check if a slot will be freed when 4 Shoal Salt or Shells are given +ShoalCave_LowTideEntranceRoom_EventScript_CheckSpaceWillBeFreed:: @ 8236E69 checkitem ITEM_SHOAL_SALT, 5 - compare VAR_RESULT, 1 - goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E7A + compare VAR_RESULT, TRUE + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_CheckSpaceWillBeFreedShells return -ShoalCave_LowTideEntranceRoom_EventScript_236E7A:: @ 8236E7A +ShoalCave_LowTideEntranceRoom_EventScript_CheckSpaceWillBeFreedShells:: @ 8236E7A checkitem ITEM_SHOAL_SHELL, 5 - compare VAR_RESULT, 1 - goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E8B + compare VAR_RESULT, TRUE + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_NoSpaceWillBeFreed return -ShoalCave_LowTideEntranceRoom_EventScript_236E8B:: @ 8236E8B +ShoalCave_LowTideEntranceRoom_EventScript_NoSpaceWillBeFreed:: @ 8236E8B setvar VAR_RESULT, 2 return -ShoalCave_LowTideEntranceRoom_EventScript_236E91:: @ 8236E91 - msgbox ShoalCave_LowTideEntranceRoom_Text_2A80F5, MSGBOX_DEFAULT +ShoalCave_LowTideEntranceRoom_EventScript_NoRoomForShellBell:: @ 8236E91 + msgbox ShoalCave_LowTideEntranceRoom_Text_NoSpaceInYourBag, MSGBOX_DEFAULT release end -ShoalCave_LowTideEntranceRoom_EventScript_236E9B:: @ 8236E9B +ShoalCave_LowTideEntranceRoom_EventScript_NotEnoughShoalSaltOrShells:: @ 8236E9B checkitem ITEM_SHOAL_SALT, 1 - compare VAR_RESULT, 1 - goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236EC5 + compare VAR_RESULT, TRUE + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_HasSomeShoalSaltOrShell checkitem ITEM_SHOAL_SHELL, 1 - compare VAR_RESULT, 1 - goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236EC5 - msgbox ShoalCave_LowTideEntranceRoom_Text_2A7E0E, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_HasSomeShoalSaltOrShell + msgbox ShoalCave_LowTideEntranceRoom_Text_AreYouPlanningOnGoingInThere, MSGBOX_DEFAULT release end -ShoalCave_LowTideEntranceRoom_EventScript_236EC5:: @ 8236EC5 - msgbox ShoalCave_LowTideEntranceRoom_Text_2A7EB3, MSGBOX_DEFAULT +ShoalCave_LowTideEntranceRoom_EventScript_HasSomeShoalSaltOrShell:: @ 8236EC5 + msgbox ShoalCave_LowTideEntranceRoom_Text_BringMe4ShoalSaltAndShells, MSGBOX_DEFAULT release end -ShoalCave_LowTideEntranceRoom_EventScript_236ECF:: @ 8236ECF - msgbox ShoalCave_LowTideEntranceRoom_Text_2A80C6, MSGBOX_DEFAULT +ShoalCave_LowTideEntranceRoom_EventScript_DeclineShellBell:: @ 8236ECF + msgbox ShoalCave_LowTideEntranceRoom_Text_WantedToMakeShellBell, MSGBOX_DEFAULT release end -ShoalCave_LowTideEntranceRoom_EventScript_236ED9:: @ 8236ED9 +ShoalCave_LowTideEntranceRoom_EventScript_ResetShoalItems:: @ 8236ED9 clearflag FLAG_RECEIVED_SHOAL_SALT_1 clearflag FLAG_RECEIVED_SHOAL_SALT_2 clearflag FLAG_RECEIVED_SHOAL_SALT_3 diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.json b/data/maps/ShoalCave_LowTideInnerRoom/map.json index f9eec06c4..5bc7ef756 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/map.json +++ b/data/maps/ShoalCave_LowTideInnerRoom/map.json @@ -94,7 +94,7 @@ "y": 8, "elevation": 5, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "ShoalCave_LowTideInnerRoom_EventScript_23708C" + "script": "ShoalCave_LowTideInnerRoom_EventScript_ShoalSalt1" }, { "type": "sign", @@ -102,7 +102,7 @@ "y": 26, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "ShoalCave_LowTideInnerRoom_EventScript_2370C8" + "script": "ShoalCave_LowTideInnerRoom_EventScript_ShoalSalt2" }, { "type": "sign", @@ -110,7 +110,7 @@ "y": 20, "elevation": 5, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "ShoalCave_LowTideInnerRoom_EventScript_236FBA" + "script": "ShoalCave_LowTideInnerRoom_EventScript_ShoalShell1" }, { "type": "sign", @@ -118,7 +118,7 @@ "y": 10, "elevation": 5, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "ShoalCave_LowTideInnerRoom_EventScript_236FF6" + "script": "ShoalCave_LowTideInnerRoom_EventScript_ShoalShell2" }, { "type": "sign", @@ -126,7 +126,7 @@ "y": 9, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "ShoalCave_LowTideInnerRoom_EventScript_237028" + "script": "ShoalCave_LowTideInnerRoom_EventScript_ShoalShell3" }, { "type": "sign", @@ -134,7 +134,7 @@ "y": 13, "elevation": 5, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "ShoalCave_LowTideInnerRoom_EventScript_23705A" + "script": "ShoalCave_LowTideInnerRoom_EventScript_ShoalShell4" } ] }
\ No newline at end of file diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc index c7f296319..089d38458 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc @@ -1,69 +1,69 @@ ShoalCave_LowTideInnerRoom_MapScripts:: @ 8236EF5 - map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideInnerRoom_MapScript1_236F16 + map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideInnerRoom_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, ShoalCave_LowTideInnerRoom_OnTransition .byte 0 ShoalCave_LowTideInnerRoom_OnTransition: @ 8236F00 - goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_236F0E - goto ShoalCave_LowTideInnerRoom_EventScript_236F12 + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_SetHighTide + goto ShoalCave_LowTideInnerRoom_EventScript_SetLowTide -ShoalCave_LowTideInnerRoom_EventScript_236F0E:: @ 8236F0E +ShoalCave_LowTideInnerRoom_EventScript_SetHighTide:: @ 8236F0E setmaplayoutindex LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM end -ShoalCave_LowTideInnerRoom_EventScript_236F12:: @ 8236F12 +ShoalCave_LowTideInnerRoom_EventScript_SetLowTide:: @ 8236F12 setmaplayoutindex LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM end -ShoalCave_LowTideInnerRoom_MapScript1_236F16: @ 8236F16 - call ShoalCave_LowTideInnerRoom_EventScript_236F1C +ShoalCave_LowTideInnerRoom_OnLoad: @ 8236F16 + call ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles end -ShoalCave_LowTideInnerRoom_EventScript_236F1C:: @ 8236F1C - goto_if_set FLAG_RECEIVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_236F3D - goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_236F3D +ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles:: @ 8236F1C + goto_if_set FLAG_RECEIVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles2 + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles2 setmetatile 31, 8, METATILE_Cave_ShoalCave_DirtPile_Large, 1 - goto ShoalCave_LowTideInnerRoom_EventScript_236F3D + goto ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles2 end -ShoalCave_LowTideInnerRoom_EventScript_236F3D:: @ 8236F3D - goto_if_set FLAG_RECEIVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_236F5E - goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_236F5E +ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles2:: @ 8236F3D + goto_if_set FLAG_RECEIVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles3 + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles3 setmetatile 14, 26, METATILE_Cave_ShoalCave_DirtPile_Large, 1 - goto ShoalCave_LowTideInnerRoom_EventScript_236F5E + goto ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles3 end -ShoalCave_LowTideInnerRoom_EventScript_236F5E:: @ 8236F5E - goto_if_set FLAG_RECEIVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_236F76 +ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles3:: @ 8236F5E + goto_if_set FLAG_RECEIVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles4 setmetatile 41, 20, METATILE_Cave_ShoalCave_BlueStone_Large, 1 - goto ShoalCave_LowTideInnerRoom_EventScript_236F76 + goto ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles4 end -ShoalCave_LowTideInnerRoom_EventScript_236F76:: @ 8236F76 - goto_if_set FLAG_RECEIVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_236F8E +ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles4:: @ 8236F76 + goto_if_set FLAG_RECEIVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles5 setmetatile 41, 10, METATILE_Cave_ShoalCave_BlueStone_Large, 1 - goto ShoalCave_LowTideInnerRoom_EventScript_236F8E + goto ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles5 end -ShoalCave_LowTideInnerRoom_EventScript_236F8E:: @ 8236F8E - goto_if_set FLAG_RECEIVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_236FA6 +ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles5:: @ 8236F8E + goto_if_set FLAG_RECEIVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles6 setmetatile 6, 9, METATILE_Cave_ShoalCave_BlueStone_Large, 1 - goto ShoalCave_LowTideInnerRoom_EventScript_236FA6 + goto ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles6 end -ShoalCave_LowTideInnerRoom_EventScript_236FA6:: @ 8236FA6 - goto_if_set FLAG_RECEIVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_236FB9 +ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles6:: @ 8236FA6 + goto_if_set FLAG_RECEIVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatilesEnd setmetatile 16, 13, METATILE_Cave_ShoalCave_BlueStone_Large, 1 return -ShoalCave_LowTideInnerRoom_EventScript_236FB9:: @ 8236FB9 +ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatilesEnd:: @ 8236FB9 return -ShoalCave_LowTideInnerRoom_EventScript_236FBA:: @ 8236FBA +ShoalCave_LowTideInnerRoom_EventScript_ShoalShell1:: @ 8236FBA lockall - goto_if_set FLAG_RECEIVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_236FEC + goto_if_set FLAG_RECEIVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell giveitem_std ITEM_SHOAL_SHELL - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 41, 20, METATILE_Cave_ShoalCave_BlueStone_Small, 0 special DrawWholeMapView @@ -71,16 +71,16 @@ ShoalCave_LowTideInnerRoom_EventScript_236FBA:: @ 8236FBA releaseall end -ShoalCave_LowTideInnerRoom_EventScript_236FEC:: @ 8236FEC - msgbox ShoalCave_LowTideInnerRoom_Text_2A81A8, MSGBOX_DEFAULT +ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell:: @ 8236FEC + msgbox ShoalCave_Text_WasShoallShellNowNothing, MSGBOX_DEFAULT releaseall end -ShoalCave_LowTideInnerRoom_EventScript_236FF6:: @ 8236FF6 +ShoalCave_LowTideInnerRoom_EventScript_ShoalShell2:: @ 8236FF6 lockall - goto_if_set FLAG_RECEIVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_236FEC + goto_if_set FLAG_RECEIVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell giveitem_std ITEM_SHOAL_SHELL - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 41, 10, METATILE_Cave_ShoalCave_BlueStone_Small, 0 special DrawWholeMapView @@ -88,11 +88,11 @@ ShoalCave_LowTideInnerRoom_EventScript_236FF6:: @ 8236FF6 releaseall end -ShoalCave_LowTideInnerRoom_EventScript_237028:: @ 8237028 +ShoalCave_LowTideInnerRoom_EventScript_ShoalShell3:: @ 8237028 lockall - goto_if_set FLAG_RECEIVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_236FEC + goto_if_set FLAG_RECEIVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell giveitem_std ITEM_SHOAL_SHELL - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 6, 9, METATILE_Cave_ShoalCave_BlueStone_Small, 0 special DrawWholeMapView @@ -100,11 +100,11 @@ ShoalCave_LowTideInnerRoom_EventScript_237028:: @ 8237028 releaseall end -ShoalCave_LowTideInnerRoom_EventScript_23705A:: @ 823705A +ShoalCave_LowTideInnerRoom_EventScript_ShoalShell4:: @ 823705A lockall - goto_if_set FLAG_RECEIVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_236FEC + goto_if_set FLAG_RECEIVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell giveitem_std ITEM_SHOAL_SHELL - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 16, 13, METATILE_Cave_ShoalCave_BlueStone_Small, 0 special DrawWholeMapView @@ -112,11 +112,11 @@ ShoalCave_LowTideInnerRoom_EventScript_23705A:: @ 823705A releaseall end -ShoalCave_LowTideInnerRoom_EventScript_23708C:: @ 823708C +ShoalCave_LowTideInnerRoom_EventScript_ShoalSalt1:: @ 823708C lockall - goto_if_set FLAG_RECEIVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_2370BE + goto_if_set FLAG_RECEIVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalSalt giveitem_std ITEM_SHOAL_SALT - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 31, 8, METATILE_Cave_ShoalCave_DirtPile_Small, 0 special DrawWholeMapView @@ -124,16 +124,16 @@ ShoalCave_LowTideInnerRoom_EventScript_23708C:: @ 823708C releaseall end -ShoalCave_LowTideInnerRoom_EventScript_2370BE:: @ 82370BE - msgbox ShoalCave_LowTideInnerRoom_Text_2A8169, MSGBOX_DEFAULT +ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalSalt:: @ 82370BE + msgbox ShoalCave_Text_WasShoalSaltNowNothing, MSGBOX_DEFAULT releaseall end -ShoalCave_LowTideInnerRoom_EventScript_2370C8:: @ 82370C8 +ShoalCave_LowTideInnerRoom_EventScript_ShoalSalt2:: @ 82370C8 lockall - goto_if_set FLAG_RECEIVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_2370BE + goto_if_set FLAG_RECEIVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalSalt giveitem_std ITEM_SHOAL_SALT - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 14, 26, METATILE_Cave_ShoalCave_DirtPile_Small, 0 special DrawWholeMapView diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.json b/data/maps/ShoalCave_LowTideLowerRoom/map.json index fad5ddc00..6e8cbe8c9 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/map.json +++ b/data/maps/ShoalCave_LowTideLowerRoom/map.json @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "ShoalCave_LowTideLowerRoom_EventScript_2371B2", + "script": "ShoalCave_LowTideLowerRoom_EventScript_BlackBelt", "flag": "0" } ], @@ -79,7 +79,7 @@ "y": 2, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "ShoalCave_LowTideLowerRoom_EventScript_237176" + "script": "ShoalCave_LowTideLowerRoom_EventScript_ShoalSalt4" } ] }
\ No newline at end of file diff --git a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc index 8492afe5b..2cbf8138d 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc @@ -1,60 +1,60 @@ ShoalCave_LowTideLowerRoom_MapScripts:: @ 8237156 - map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideLowerRoom_MapScript1_23715C + map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideLowerRoom_OnLoad .byte 0 -ShoalCave_LowTideLowerRoom_MapScript1_23715C: @ 823715C - call ShoalCave_LowTideLowerRoom_EventScript_237162 +ShoalCave_LowTideLowerRoom_OnLoad: @ 823715C + call ShoalCave_LowTideLowerRoom_EventScript_SetShoalItemMetatiles end -ShoalCave_LowTideLowerRoom_EventScript_237162:: @ 8237162 - goto_if_set FLAG_RECEIVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_237175 - setmetatile 18, 2, 856, 1 +ShoalCave_LowTideLowerRoom_EventScript_SetShoalItemMetatiles:: @ 8237162 + goto_if_set FLAG_RECEIVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_SetShoalItemMetatilesEnd + setmetatile 18, 2, METATILE_Cave_ShoalCave_DirtPile_Large, 1 return -ShoalCave_LowTideLowerRoom_EventScript_237175:: @ 8237175 +ShoalCave_LowTideLowerRoom_EventScript_SetShoalItemMetatilesEnd:: @ 8237175 return -ShoalCave_LowTideLowerRoom_EventScript_237176:: @ 8237176 +ShoalCave_LowTideLowerRoom_EventScript_ShoalSalt4:: @ 8237176 lockall - goto_if_set FLAG_RECEIVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_2371A8 + goto_if_set FLAG_RECEIVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_ReceivedShoalSalt giveitem_std ITEM_SHOAL_SALT - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull - setmetatile 18, 2, 858, 0 + setmetatile 18, 2, METATILE_Cave_ShoalCave_DirtPile_Small, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SALT_4 releaseall end -ShoalCave_LowTideLowerRoom_EventScript_2371A8:: @ 82371A8 - msgbox ShoalCave_LowTideLowerRoom_Text_2A8169, MSGBOX_DEFAULT +ShoalCave_LowTideLowerRoom_EventScript_ReceivedShoalSalt:: @ 82371A8 + msgbox ShoalCave_Text_WasShoalSaltNowNothing, MSGBOX_DEFAULT releaseall end -ShoalCave_LowTideLowerRoom_EventScript_2371B2:: @ 82371B2 +ShoalCave_LowTideLowerRoom_EventScript_BlackBelt:: @ 82371B2 lock faceplayer - goto_if_set FLAG_RECEIVED_FOCUS_BAND, ShoalCave_LowTideLowerRoom_EventScript_2371E1 - msgbox ShoalCave_LowTideLowerRoom_Text_2371EB, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_FOCUS_BAND, ShoalCave_LowTideLowerRoom_EventScript_ReceivedFocusBand + msgbox ShoalCave_LowTideLowerRoom_Text_CanOvercomeColdWithFocus, MSGBOX_DEFAULT giveitem_std ITEM_FOCUS_BAND - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_FOCUS_BAND release end -ShoalCave_LowTideLowerRoom_EventScript_2371E1:: @ 82371E1 - msgbox ShoalCave_LowTideLowerRoom_Text_23728D, MSGBOX_DEFAULT +ShoalCave_LowTideLowerRoom_EventScript_ReceivedFocusBand:: @ 82371E1 + msgbox ShoalCave_LowTideLowerRoom_Text_EverythingStartsWithFocus, MSGBOX_DEFAULT release end -ShoalCave_LowTideLowerRoom_Text_2371EB: @ 82371EB +ShoalCave_LowTideLowerRoom_Text_CanOvercomeColdWithFocus: @ 82371EB .string "The penetrating cold around these\n" .string "parts is an impediment to training.\p" .string "But with focus, one can overcome!\p" .string "With this FOCUS BAND, buckle down and\n" .string "withstand the cold!$" -ShoalCave_LowTideLowerRoom_Text_23728D: @ 823728D +ShoalCave_LowTideLowerRoom_Text_EverythingStartsWithFocus: @ 823728D .string "Everything starts with focus!$" diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.json b/data/maps/ShoalCave_LowTideStairsRoom/map.json index 4da33c163..7280cf140 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/map.json +++ b/data/maps/ShoalCave_LowTideStairsRoom/map.json @@ -52,7 +52,7 @@ "y": 11, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "ShoalCave_LowTideStairsRoom_EventScript_23711A" + "script": "ShoalCave_LowTideStairsRoom_EventScript_ShoalSalt3" } ] }
\ No newline at end of file diff --git a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc index 74b653a5f..32ec5b298 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc @@ -1,33 +1,33 @@ ShoalCave_LowTideStairsRoom_MapScripts:: @ 82370FA - map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideStairsRoom_MapScript1_237100 + map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideStairsRoom_OnLoad .byte 0 -ShoalCave_LowTideStairsRoom_MapScript1_237100: @ 8237100 - call ShoalCave_LowTideStairsRoom_EventScript_237106 +ShoalCave_LowTideStairsRoom_OnLoad: @ 8237100 + call ShoalCave_LowTideStairsRoom_EventScript_SetShoalItemMetatiles end -ShoalCave_LowTideStairsRoom_EventScript_237106:: @ 8237106 - goto_if_set FLAG_RECEIVED_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_237119 - setmetatile 11, 11, 856, 1 +ShoalCave_LowTideStairsRoom_EventScript_SetShoalItemMetatiles:: @ 8237106 + goto_if_set FLAG_RECEIVED_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_SetShoalItemMetatilesEnd + setmetatile 11, 11, METATILE_Cave_ShoalCave_DirtPile_Large, 1 return -ShoalCave_LowTideStairsRoom_EventScript_237119:: @ 8237119 +ShoalCave_LowTideStairsRoom_EventScript_SetShoalItemMetatilesEnd:: @ 8237119 return -ShoalCave_LowTideStairsRoom_EventScript_23711A:: @ 823711A +ShoalCave_LowTideStairsRoom_EventScript_ShoalSalt3:: @ 823711A lockall - goto_if_set FLAG_RECEIVED_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_23714C + goto_if_set FLAG_RECEIVED_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_ReceivedShoalSalt giveitem_std ITEM_SHOAL_SALT - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull - setmetatile 11, 11, 858, 0 + setmetatile 11, 11, METATILE_Cave_ShoalCave_DirtPile_Small, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SALT_3 releaseall end -ShoalCave_LowTideStairsRoom_EventScript_23714C:: @ 823714C - msgbox ShoalCave_LowTideStairsRoom_Text_2A8169, MSGBOX_DEFAULT +ShoalCave_LowTideStairsRoom_EventScript_ReceivedShoalSalt:: @ 823714C + msgbox ShoalCave_Text_WasShoalSaltNowNothing, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index dcf92fe2d..a6e6541da 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -26,8 +26,6 @@ SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFee:: @ 820ADC1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_CheckMoneyForFee closemessage hidemoneybox - nop - nop applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter waitmovement 0 releaseall @@ -43,8 +41,6 @@ SlateportCity_OceanicMuseum_1F_EventScript_CheckMoneyForFee:: @ 820ADE8 msgbox SlateportCity_OceanicMuseum_1F_Text_PleaseEnjoyYourself, MSGBOX_DEFAULT setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1 hidemoneybox - nop - nop releaseall end @@ -53,8 +49,6 @@ SlateportCity_OceanicMuseum_1F_EventScript_NotEnoughMoney:: @ 820AE18 msgbox SlateportCity_OceanicMuseum_1F_Text_NotEnoughMoney, MSGBOX_DEFAULT closemessage hidemoneybox - nop - nop applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter waitmovement 0 releaseall @@ -64,8 +58,6 @@ SlateportCity_OceanicMuseum_1F_EventScript_AllowEntranceAnyway:: @ 820AE39 msgbox SlateportCity_OceanicMuseum_1F_Text_CatchUpWithYourGroup, MSGBOX_DEFAULT setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1 hidemoneybox - nop - nop releaseall end diff --git a/data/maps/Underwater_MarineCave/scripts.inc b/data/maps/Underwater_MarineCave/scripts.inc index 248854dd7..b1cc353f0 100644 --- a/data/maps/Underwater_MarineCave/scripts.inc +++ b/data/maps/Underwater_MarineCave/scripts.inc @@ -1,5 +1,5 @@ Underwater_MarineCave_MapScripts:: @ 823AFB8 - map_script MAP_SCRIPT_ON_RESUME, Underwater_MarineCave_MapScript1_OnResume + map_script MAP_SCRIPT_ON_RESUME, Underwater_MarineCave_OnResume map_script MAP_SCRIPT_ON_TRANSITION, Underwater_MarineCave_OnTransition .byte 0 @@ -7,7 +7,7 @@ Underwater_MarineCave_OnTransition: @ 823AFC3 setflag FLAG_ARRIVED_AT_MARINE_CAVE_EMERGE_SPOT end -Underwater_MarineCave_MapScript1_OnResume: @ 823AFC7 +Underwater_MarineCave_OnResume: @ 823AFC7 setdivewarp MAP_MARINE_CAVE_ENTRANCE, 255, 10, 17 end diff --git a/data/maps/Underwater_SeafloorCavern/scripts.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc index ca94964cf..118632461 100644 --- a/data/maps/Underwater_SeafloorCavern/scripts.inc +++ b/data/maps/Underwater_SeafloorCavern/scripts.inc @@ -1,23 +1,23 @@ Underwater_SeafloorCavern_MapScripts:: @ 823433B - map_script MAP_SCRIPT_ON_RESUME, Underwater_SeafloorCavern_MapScript1_2343D3 + map_script MAP_SCRIPT_ON_RESUME, Underwater_SeafloorCavern_OnResume map_script MAP_SCRIPT_ON_TRANSITION, Underwater_SeafloorCavern_OnTransition - map_script MAP_SCRIPT_ON_LOAD, Underwater_SeafloorCavern_MapScript1_23435C + map_script MAP_SCRIPT_ON_LOAD, Underwater_SeafloorCavern_OnLoad .byte 0 Underwater_SeafloorCavern_OnTransition: @ 823434B setflag FLAG_LANDMARK_SEAFLOOR_CAVERN - goto_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_234358 + goto_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_HideSubmarine end -Underwater_SeafloorCavern_EventScript_234358:: @ 8234358 +Underwater_SeafloorCavern_EventScript_HideSubmarine:: @ 8234358 setflag FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE end -Underwater_SeafloorCavern_MapScript1_23435C: @ 823435C - call_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_234366 +Underwater_SeafloorCavern_OnLoad: @ 823435C + call_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_SetSubmarineGoneMetatiles end -Underwater_SeafloorCavern_EventScript_234366:: @ 8234366 +Underwater_SeafloorCavern_EventScript_SetSubmarineGoneMetatiles:: @ 8234366 setmetatile 5, 3, METATILE_Underwater_RockWall, 1 setmetatile 6, 3, METATILE_Underwater_RockWall, 1 setmetatile 7, 3, METATILE_Underwater_RockWall, 1 @@ -32,7 +32,7 @@ Underwater_SeafloorCavern_EventScript_234366:: @ 8234366 setmetatile 8, 5, METATILE_Underwater_FloorShadow, 0 return -Underwater_SeafloorCavern_MapScript1_2343D3: @ 82343D3 +Underwater_SeafloorCavern_OnResume: @ 82343D3 setdivewarp MAP_SEAFLOOR_CAVERN_ENTRANCE, 255, 10, 17 end diff --git a/data/maps/Underwater_SealedChamber/map.json b/data/maps/Underwater_SealedChamber/map.json index 2256ee670..7579f15d5 100644 --- a/data/maps/Underwater_SealedChamber/map.json +++ b/data/maps/Underwater_SealedChamber/map.json @@ -31,7 +31,7 @@ "y": 43, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Underwater_SealedChamber_EventScript_2390FC" + "script": "Underwater_SealedChamber_EventScript_Braille" } ] }
\ No newline at end of file diff --git a/data/maps/Underwater_SealedChamber/scripts.inc b/data/maps/Underwater_SealedChamber/scripts.inc index 168383f5d..b1fb5e71a 100644 --- a/data/maps/Underwater_SealedChamber/scripts.inc +++ b/data/maps/Underwater_SealedChamber/scripts.inc @@ -1,26 +1,26 @@ Underwater_SealedChamber_MapScripts:: @ 82390C4 - map_script MAP_SCRIPT_ON_DIVE_WARP, Underwater_SealedChamber_MapScript1_2390CA + map_script MAP_SCRIPT_ON_DIVE_WARP, Underwater_SealedChamber_OnDive .byte 0 -Underwater_SealedChamber_MapScript1_2390CA: @ 82390CA +Underwater_SealedChamber_OnDive: @ 82390CA getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 12 - goto_if_ne Underwater_SealedChamber_EventScript_2390EA + goto_if_ne Underwater_SealedChamber_EventScript_SurfaceRoute134 compare VAR_0x8005, 44 - goto_if_ne Underwater_SealedChamber_EventScript_2390EA - goto Underwater_SealedChamber_EventScript_2390F3 + goto_if_ne Underwater_SealedChamber_EventScript_SurfaceRoute134 + goto Underwater_SealedChamber_EventScript_SurfaceSealedChamber -Underwater_SealedChamber_EventScript_2390EA:: @ 82390EA +Underwater_SealedChamber_EventScript_SurfaceRoute134:: @ 82390EA setdivewarp MAP_ROUTE134, 255, 60, 31 end -Underwater_SealedChamber_EventScript_2390F3:: @ 82390F3 +Underwater_SealedChamber_EventScript_SurfaceSealedChamber:: @ 82390F3 setdivewarp MAP_SEALED_CHAMBER_OUTER_ROOM, 255, 10, 19 end -Underwater_SealedChamber_EventScript_2390FC:: @ 82390FC +Underwater_SealedChamber_EventScript_Braille:: @ 82390FC lockall - braillemessage Underwater_SealedChamber_Braille_2A6B15 + braillemessage Underwater_SealedChamber_Braille_GoUpHere waitbuttonpress closebraillemessage releaseall diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 8685f3341..d76915648 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "VictoryRoad_1F_EventScript_235E73", + "script": "VictoryRoad_1F_EventScript_Edgar", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "VictoryRoad_1F_EventScript_235EA1", + "script": "VictoryRoad_1F_EventScript_Hope", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "VictoryRoad_1F_EventScript_235E8A", + "script": "VictoryRoad_1F_EventScript_Albert", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VictoryRoad_1F_EventScript_235E2C", + "script": "VictoryRoad_1F_EventScript_EntranceWally", "flag": "FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VictoryRoad_1F_EventScript_235E35", + "script": "VictoryRoad_1F_EventScript_ExitWally", "flag": "FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY" }, { @@ -115,7 +115,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "VictoryRoad_1F_EventScript_235ECF", + "script": "VictoryRoad_1F_EventScript_Katelynn", "flag": "0" }, { @@ -128,7 +128,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "VictoryRoad_1F_EventScript_235EB8", + "script": "VictoryRoad_1F_EventScript_Quincy", "flag": "0" } ], @@ -177,7 +177,7 @@ "elevation": 4, "var": "VAR_VICTORY_ROAD_1F_STATE", "var_value": "0", - "script": "VictoryRoad_1F_EventScript_235DAF" + "script": "VictoryRoad_1F_EventScript_WallyBattleTrigger1" }, { "type": "trigger", @@ -186,7 +186,7 @@ "elevation": 4, "var": "VAR_VICTORY_ROAD_1F_STATE", "var_value": "0", - "script": "VictoryRoad_1F_EventScript_235DC8" + "script": "VictoryRoad_1F_EventScript_WallyBattleTrigger2" } ], "bg_events": [ diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 9b7c00c62..6536be934 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -4,45 +4,45 @@ VictoryRoad_1F_MapScripts:: @ 8235D7A VictoryRoad_1F_OnTransition: @ 8235D80 compare VAR_VICTORY_ROAD_1F_STATE, 1 - call_if_eq VictoryRoad_1F_EventScript_235D97 + call_if_eq VictoryRoad_1F_EventScript_SetEntranceWallyPos1 compare VAR_VICTORY_ROAD_1F_STATE, 2 - call_if_eq VictoryRoad_1F_EventScript_235DA3 + call_if_eq VictoryRoad_1F_EventScript_SetEntranceWallyPos2 end -VictoryRoad_1F_EventScript_235D97:: @ 8235D97 +VictoryRoad_1F_EventScript_SetEntranceWallyPos1:: @ 8235D97 setobjectxyperm 4, 2, 24 setobjectmovementtype 4, MOVEMENT_TYPE_FACE_DOWN return -VictoryRoad_1F_EventScript_235DA3:: @ 8235DA3 +VictoryRoad_1F_EventScript_SetEntranceWallyPos2:: @ 8235DA3 setobjectxyperm 4, 3, 24 setobjectmovementtype 4, MOVEMENT_TYPE_FACE_DOWN return -VictoryRoad_1F_EventScript_235DAF:: @ 8235DAF +VictoryRoad_1F_EventScript_WallyBattleTrigger1:: @ 8235DAF lockall setvar VAR_0x8008, 1 addobject 4 - applymovement 4, VictoryRoad_1F_Movement_235E15 + applymovement 4, VictoryRoad_1F_Movement_WallyApproachPlayer1 waitmovement 0 - goto VictoryRoad_1F_EventScript_235DE1 + goto VictoryRoad_1F_EventScript_WallyEntranceBattle end -VictoryRoad_1F_EventScript_235DC8:: @ 8235DC8 +VictoryRoad_1F_EventScript_WallyBattleTrigger2:: @ 8235DC8 lockall setvar VAR_0x8008, 2 addobject 4 - applymovement 4, VictoryRoad_1F_Movement_235E21 + applymovement 4, VictoryRoad_1F_Movement_WallyApproachPlayer2 waitmovement 0 - goto VictoryRoad_1F_EventScript_235DE1 + goto VictoryRoad_1F_EventScript_WallyEntranceBattle end -VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1 +VictoryRoad_1F_EventScript_WallyEntranceBattle:: @ 8235DE1 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox VictoryRoad_1F_Text_235EE6, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_235FFC - msgbox VictoryRoad_1F_Text_236020, MSGBOX_DEFAULT + msgbox VictoryRoad_1F_Text_WallyNotGoingToLoseAnymore, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_WallyEntranceDefeat + msgbox VictoryRoad_1F_Text_WallyPostEntranceBattle, MSGBOX_DEFAULT clearflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY copyobjectxytoperm 4 setflag FLAG_DEFEATED_WALLY_VICTORY_ROAD @@ -50,7 +50,7 @@ VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1 releaseall end -VictoryRoad_1F_Movement_235E15: @ 8235E15 +VictoryRoad_1F_Movement_WallyApproachPlayer1: @ 8235E15 walk_left walk_left walk_left @@ -64,7 +64,7 @@ VictoryRoad_1F_Movement_235E15: @ 8235E15 walk_up step_end -VictoryRoad_1F_Movement_235E21: @ 8235E21 +VictoryRoad_1F_Movement_WallyApproachPlayer2: @ 8235E21 walk_left walk_left walk_left @@ -77,49 +77,51 @@ VictoryRoad_1F_Movement_235E21: @ 8235E21 walk_up step_end -VictoryRoad_1F_EventScript_235E2C:: @ 8235E2C - msgbox VictoryRoad_1F_Text_236020, MSGBOX_NPC +@ This Wally appears near the entrance once his battle is triggered and remains there until the Hall of Fame is entered +VictoryRoad_1F_EventScript_EntranceWally:: @ 8235E2C + msgbox VictoryRoad_1F_Text_WallyPostEntranceBattle, MSGBOX_NPC end -VictoryRoad_1F_EventScript_235E35:: @ 8235E35 - trainerbattle_single TRAINER_WALLY_3, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA +@ This Wally appears and remains at the exit after the Hall of Fame is entered +VictoryRoad_1F_EventScript_ExitWally:: @ 8235E35 + trainerbattle_single TRAINER_WALLY_3, VictoryRoad_1F_Text_WallyIntro, VictoryRoad_1F_Text_WallyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq VictoryRoad_1F_EventScript_235E5C - msgbox VictoryRoad_1F_Text_2360FE, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq VictoryRoad_1F_EventScript_RematchWally + msgbox VictoryRoad_1F_Text_WallyPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_1F_EventScript_235E5C:: @ 8235E5C - trainerbattle_rematch TRAINER_WALLY_3, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA - msgbox VictoryRoad_1F_Text_2360FE, MSGBOX_AUTOCLOSE +VictoryRoad_1F_EventScript_RematchWally:: @ 8235E5C + trainerbattle_rematch TRAINER_WALLY_3, VictoryRoad_1F_Text_WallyIntro, VictoryRoad_1F_Text_WallyDefeat + msgbox VictoryRoad_1F_Text_WallyPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_1F_EventScript_235E73:: @ 8235E73 - trainerbattle_single TRAINER_EDGAR, VictoryRoad_1F_Text_236184, VictoryRoad_1F_Text_2361CB - msgbox VictoryRoad_1F_Text_2361E5, MSGBOX_AUTOCLOSE +VictoryRoad_1F_EventScript_Edgar:: @ 8235E73 + trainerbattle_single TRAINER_EDGAR, VictoryRoad_1F_Text_EdgarIntro, VictoryRoad_1F_Text_EdgarDefeat + msgbox VictoryRoad_1F_Text_EdgarPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_1F_EventScript_235E8A:: @ 8235E8A - trainerbattle_single TRAINER_ALBERT, VictoryRoad_1F_Text_236248, VictoryRoad_1F_Text_236290 - msgbox VictoryRoad_1F_Text_2362A4, MSGBOX_AUTOCLOSE +VictoryRoad_1F_EventScript_Albert:: @ 8235E8A + trainerbattle_single TRAINER_ALBERT, VictoryRoad_1F_Text_AlbertIntro, VictoryRoad_1F_Text_AlbertDefeat + msgbox VictoryRoad_1F_Text_AlbertPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_1F_EventScript_235EA1:: @ 8235EA1 - trainerbattle_single TRAINER_HOPE, VictoryRoad_1F_Text_2362EE, VictoryRoad_1F_Text_236336 - msgbox VictoryRoad_1F_Text_236356, MSGBOX_AUTOCLOSE +VictoryRoad_1F_EventScript_Hope:: @ 8235EA1 + trainerbattle_single TRAINER_HOPE, VictoryRoad_1F_Text_HopeIntro, VictoryRoad_1F_Text_HopeDefeat + msgbox VictoryRoad_1F_Text_HopePostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_1F_EventScript_235EB8:: @ 8235EB8 - trainerbattle_single TRAINER_QUINCY, VictoryRoad_1F_Text_236390, VictoryRoad_1F_Text_2363C4 - msgbox VictoryRoad_1F_Text_2363D5, MSGBOX_AUTOCLOSE +VictoryRoad_1F_EventScript_Quincy:: @ 8235EB8 + trainerbattle_single TRAINER_QUINCY, VictoryRoad_1F_Text_QuincyIntro, VictoryRoad_1F_Text_QuincyDefeat + msgbox VictoryRoad_1F_Text_QuincyPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_1F_EventScript_235ECF:: @ 8235ECF - trainerbattle_single TRAINER_KATELYNN, VictoryRoad_1F_Text_236468, VictoryRoad_1F_Text_2364A7 - msgbox VictoryRoad_1F_Text_2364BB, MSGBOX_AUTOCLOSE +VictoryRoad_1F_EventScript_Katelynn:: @ 8235ECF + trainerbattle_single TRAINER_KATELYNN, VictoryRoad_1F_Text_KatelynnIntro, VictoryRoad_1F_Text_KatelynnDefeat + msgbox VictoryRoad_1F_Text_KatelynnPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_1F_Text_235EE6: @ 8235EE6 +VictoryRoad_1F_Text_WallyNotGoingToLoseAnymore: @ 8235EE6 .string "WALLY: Hi! {PLAYER}!\p" .string "I bet you're surprised to see me here!\p" .string "I made it all the way here, and it's\n" @@ -131,89 +133,89 @@ VictoryRoad_1F_Text_235EE6: @ 8235EE6 .string "gave me courage and strength!\p" .string "Okay… Here I come!$" -VictoryRoad_1F_Text_235FFC: @ 8235FFC +VictoryRoad_1F_Text_WallyEntranceDefeat: @ 8235FFC .string "Wow!\n" .string "{PLAYER}, you are strong, after all!$" -VictoryRoad_1F_Text_236020: @ 8236020 +VictoryRoad_1F_Text_WallyPostEntranceBattle: @ 8236020 .string "WALLY: I couldn't beat you today,\n" .string "{PLAYER}, but one of these days, I'll\l" .string "catch up to you!$" -VictoryRoad_1F_Text_236073: @ 8236073 +VictoryRoad_1F_Text_WallyIntro: @ 8236073 .string "WALLY: Hi! {PLAYER}!\p" .string "I've gotten stronger since that last\n" .string "time! I wanted to show you, {PLAYER}!\p" .string "Okay… Here I come!$" -VictoryRoad_1F_Text_2360DA: @ 82360DA +VictoryRoad_1F_Text_WallyDefeat: @ 82360DA .string "Wow!\n" .string "{PLAYER}, you are strong, after all!$" -VictoryRoad_1F_Text_2360FE: @ 82360FE +VictoryRoad_1F_Text_WallyPostBattle: @ 82360FE .string "WALLY: I couldn't beat you this time,\n" .string "too… But one of these days, {PLAYER},\l" .string "I'm going to catch up to you…\p" .string "And challenge the POKéMON LEAGUE!$" -VictoryRoad_1F_Text_236184: @ 8236184 +VictoryRoad_1F_Text_EdgarIntro: @ 8236184 .string "I've made it this far a couple times,\n" .string "but the last stretch is so long…$" -VictoryRoad_1F_Text_2361CB: @ 82361CB +VictoryRoad_1F_Text_EdgarDefeat: @ 82361CB .string "My dream ends here again…$" -VictoryRoad_1F_Text_2361E5: @ 82361E5 +VictoryRoad_1F_Text_EdgarPostBattle: @ 82361E5 .string "You've made it this far. Keep the\n" .string "momentum going and become the\l" .string "CHAMPION! If anyone can, it's you!$" -VictoryRoad_1F_Text_236248: @ 8236248 +VictoryRoad_1F_Text_AlbertIntro: @ 8236248 .string "I didn't come all this way to lose now.\n" .string "That possibility doesn't exist!$" -VictoryRoad_1F_Text_236290: @ 8236290 +VictoryRoad_1F_Text_AlbertDefeat: @ 8236290 .string "Impossible…\n" .string "I lost?$" -VictoryRoad_1F_Text_2362A4: @ 82362A4 +VictoryRoad_1F_Text_AlbertPostBattle: @ 82362A4 .string "I lost here…\p" .string "That means I lack the qualifications\n" .string "to become the CHAMPION…$" -VictoryRoad_1F_Text_2362EE: @ 82362EE +VictoryRoad_1F_Text_HopeIntro: @ 82362EE .string "This seemingly infinite and harsh road\n" .string "lives up to its name of VICTORY.$" -VictoryRoad_1F_Text_236336: @ 8236336 +VictoryRoad_1F_Text_HopeDefeat: @ 8236336 .string "Your battle style is fantastic…$" -VictoryRoad_1F_Text_236356: @ 8236356 +VictoryRoad_1F_Text_HopePostBattle: @ 8236356 .string "You seem to have the potential for\n" .string "becoming the CHAMPION.$" -VictoryRoad_1F_Text_236390: @ 8236390 +VictoryRoad_1F_Text_QuincyIntro: @ 8236390 .string "What is the VICTORY ROAD?\n" .string "I'll tell you if you win!$" -VictoryRoad_1F_Text_2363C4: @ 82363C4 +VictoryRoad_1F_Text_QuincyDefeat: @ 82363C4 .string "Okay!\n" .string "Well done!$" -VictoryRoad_1F_Text_2363D5: @ 82363D5 +VictoryRoad_1F_Text_QuincyPostBattle: @ 82363D5 .string "Getting through here safely--that's\n" .string "the final test for any TRAINER aiming\l" .string "to become the POKéMON CHAMPION.\p" .string "That's why it's called the VICTORY\n" .string "ROAD.$" -VictoryRoad_1F_Text_236468: @ 8236468 +VictoryRoad_1F_Text_KatelynnIntro: @ 8236468 .string "I have nothing to say to anyone\n" .string "that's come this far. Come on!$" -VictoryRoad_1F_Text_2364A7: @ 82364A7 +VictoryRoad_1F_Text_KatelynnDefeat: @ 82364A7 .string "This is a disgrace…$" -VictoryRoad_1F_Text_2364BB: @ 82364BB +VictoryRoad_1F_Text_KatelynnPostBattle: @ 82364BB .string "Humph, go right on ahead.\n" .string "See if I care.$" diff --git a/data/maps/VictoryRoad_B1F/map.json b/data/maps/VictoryRoad_B1F/map.json index b8f00f4fb..3241c1364 100644 --- a/data/maps/VictoryRoad_B1F/map.json +++ b/data/maps/VictoryRoad_B1F/map.json @@ -193,7 +193,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "VictoryRoad_B1F_EventScript_2364E5", + "script": "VictoryRoad_B1F_EventScript_Samuel", "flag": "0" }, { @@ -206,7 +206,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "VictoryRoad_B1F_EventScript_2364FC", + "script": "VictoryRoad_B1F_EventScript_Shannon", "flag": "0" }, { @@ -219,7 +219,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "VictoryRoad_B1F_EventScript_236513", + "script": "VictoryRoad_B1F_EventScript_Michelle", "flag": "0" }, { @@ -271,7 +271,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "VictoryRoad_B1F_EventScript_23652A", + "script": "VictoryRoad_B1F_EventScript_Mitchell", "flag": "0" }, { @@ -284,7 +284,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "VictoryRoad_B1F_EventScript_236541", + "script": "VictoryRoad_B1F_EventScript_Halle", "flag": "0" } ], diff --git a/data/maps/VictoryRoad_B1F/scripts.inc b/data/maps/VictoryRoad_B1F/scripts.inc index c2fb918cc..fd175599c 100644 --- a/data/maps/VictoryRoad_B1F/scripts.inc +++ b/data/maps/VictoryRoad_B1F/scripts.inc @@ -1,88 +1,88 @@ VictoryRoad_B1F_MapScripts:: @ 82364E4 .byte 0 -VictoryRoad_B1F_EventScript_2364E5:: @ 82364E5 - trainerbattle_single TRAINER_SAMUEL, VictoryRoad_B1F_Text_236558, VictoryRoad_B1F_Text_2365AD - msgbox VictoryRoad_B1F_Text_2365C4, MSGBOX_AUTOCLOSE +VictoryRoad_B1F_EventScript_Samuel:: @ 82364E5 + trainerbattle_single TRAINER_SAMUEL, VictoryRoad_B1F_Text_SamuelIntro, VictoryRoad_B1F_Text_SamuelDefeat + msgbox VictoryRoad_B1F_Text_SamuelPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_B1F_EventScript_2364FC:: @ 82364FC - trainerbattle_single TRAINER_SHANNON, VictoryRoad_B1F_Text_2365FD, VictoryRoad_B1F_Text_23664D - msgbox VictoryRoad_B1F_Text_236678, MSGBOX_AUTOCLOSE +VictoryRoad_B1F_EventScript_Shannon:: @ 82364FC + trainerbattle_single TRAINER_SHANNON, VictoryRoad_B1F_Text_ShannonIntro, VictoryRoad_B1F_Text_ShannonDefeat + msgbox VictoryRoad_B1F_Text_ShannonPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_B1F_EventScript_236513:: @ 8236513 - trainerbattle_single TRAINER_MICHELLE, VictoryRoad_B1F_Text_2366C2, VictoryRoad_B1F_Text_23670B - msgbox VictoryRoad_B1F_Text_23671B, MSGBOX_AUTOCLOSE +VictoryRoad_B1F_EventScript_Michelle:: @ 8236513 + trainerbattle_single TRAINER_MICHELLE, VictoryRoad_B1F_Text_MichelleIntro, VictoryRoad_B1F_Text_MichelleDefeat + msgbox VictoryRoad_B1F_Text_MichellePostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_B1F_EventScript_23652A:: @ 823652A - trainerbattle_single TRAINER_MITCHELL, VictoryRoad_B1F_Text_236757, VictoryRoad_B1F_Text_236780 - msgbox VictoryRoad_B1F_Text_2367A7, MSGBOX_AUTOCLOSE +VictoryRoad_B1F_EventScript_Mitchell:: @ 823652A + trainerbattle_single TRAINER_MITCHELL, VictoryRoad_B1F_Text_MitchellIntro, VictoryRoad_B1F_Text_MitchellDefeat + msgbox VictoryRoad_B1F_Text_MitchellPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_B1F_EventScript_236541:: @ 8236541 - trainerbattle_single TRAINER_HALLE, VictoryRoad_B1F_Text_2367FD, VictoryRoad_B1F_Text_23683B - msgbox VictoryRoad_B1F_Text_23684C, MSGBOX_AUTOCLOSE +VictoryRoad_B1F_EventScript_Halle:: @ 8236541 + trainerbattle_single TRAINER_HALLE, VictoryRoad_B1F_Text_HalleIntro, VictoryRoad_B1F_Text_HalleDefeat + msgbox VictoryRoad_B1F_Text_HallePostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_B1F_Text_236558: @ 8236558 +VictoryRoad_B1F_Text_SamuelIntro: @ 8236558 .string "The thought that I'm getting closer to\n" .string "the POKéMON LEAGUE…\p" .string "I'm getting stage fright…$" -VictoryRoad_B1F_Text_2365AD: @ 82365AD +VictoryRoad_B1F_Text_SamuelDefeat: @ 82365AD .string "I couldn't do a thing…$" -VictoryRoad_B1F_Text_2365C4: @ 82365C4 +VictoryRoad_B1F_Text_SamuelPostBattle: @ 82365C4 .string "The POKéMON LEAGUE became distant\n" .string "again… What a letdown…$" -VictoryRoad_B1F_Text_2365FD: @ 82365FD +VictoryRoad_B1F_Text_ShannonIntro: @ 82365FD .string "To win your way through the POKéMON\n" .string "LEAGUE, you need the trust of your\l" .string "POKéMON.$" -VictoryRoad_B1F_Text_23664D: @ 823664D +VictoryRoad_B1F_Text_ShannonDefeat: @ 823664D .string "Your relationship is based on\n" .string "solid trust.$" -VictoryRoad_B1F_Text_236678: @ 8236678 +VictoryRoad_B1F_Text_ShannonPostBattle: @ 8236678 .string "By being together all the time, trust\n" .string "grows between POKéMON and TRAINERS.$" -VictoryRoad_B1F_Text_2366C2: @ 82366C2 +VictoryRoad_B1F_Text_MichelleIntro: @ 82366C2 .string "This isn't the goal. It's only a place\n" .string "on the way to the POKéMON LEAGUE.$" -VictoryRoad_B1F_Text_23670B: @ 823670B +VictoryRoad_B1F_Text_MichelleDefeat: @ 823670B .string "That's the way!$" -VictoryRoad_B1F_Text_23671B: @ 823671B +VictoryRoad_B1F_Text_MichellePostBattle: @ 823671B .string "You'll do fine, for sure!\n" .string "Your POKéMON are all eager to go!$" -VictoryRoad_B1F_Text_236757: @ 8236757 +VictoryRoad_B1F_Text_MitchellIntro: @ 8236757 .string "My POKéMON are cosmically\n" .string "awe inspiring!$" -VictoryRoad_B1F_Text_236780: @ 8236780 +VictoryRoad_B1F_Text_MitchellDefeat: @ 8236780 .string "I've never met anyone like you before.$" -VictoryRoad_B1F_Text_2367A7: @ 82367A7 +VictoryRoad_B1F_Text_MitchellPostBattle: @ 82367A7 .string "Even outside of battle, I sense\n" .string "incredible power emanating from you\l" .string "and your POKéMON.$" -VictoryRoad_B1F_Text_2367FD: @ 82367FD +VictoryRoad_B1F_Text_HalleIntro: @ 82367FD .string "Okay, no need to get your back up!\n" .string "Relax, let's take it easy!$" -VictoryRoad_B1F_Text_23683B: @ 823683B +VictoryRoad_B1F_Text_HalleDefeat: @ 823683B .string "Whoa!\n" .string "Wonderful!$" -VictoryRoad_B1F_Text_23684C: @ 823684C +VictoryRoad_B1F_Text_HallePostBattle: @ 823684C .string "Sure, this is VICTORY ROAD.\p" .string "But it's not all that different from\n" .string "the path you've taken so far.\p" diff --git a/data/maps/VictoryRoad_B2F/map.json b/data/maps/VictoryRoad_B2F/map.json index de10ef891..d78339b52 100644 --- a/data/maps/VictoryRoad_B2F/map.json +++ b/data/maps/VictoryRoad_B2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "VictoryRoad_B2F_EventScript_2368D5", + "script": "VictoryRoad_B2F_EventScript_Vito", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "VictoryRoad_B2F_EventScript_2368EC", + "script": "VictoryRoad_B2F_EventScript_Owen", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "VictoryRoad_B2F_EventScript_236903", + "script": "VictoryRoad_B2F_EventScript_Caroline", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "VictoryRoad_B2F_EventScript_23691A", + "script": "VictoryRoad_B2F_EventScript_Julie", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "VictoryRoad_B2F_EventScript_236948", + "script": "VictoryRoad_B2F_EventScript_Dianne", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "VictoryRoad_B2F_EventScript_236931", + "script": "VictoryRoad_B2F_EventScript_Felix", "flag": "0" } ], diff --git a/data/maps/VictoryRoad_B2F/scripts.inc b/data/maps/VictoryRoad_B2F/scripts.inc index 732878de3..9db635a85 100644 --- a/data/maps/VictoryRoad_B2F/scripts.inc +++ b/data/maps/VictoryRoad_B2F/scripts.inc @@ -1,108 +1,108 @@ VictoryRoad_B2F_MapScripts:: @ 82368D4 .byte 0 -VictoryRoad_B2F_EventScript_2368D5:: @ 82368D5 - trainerbattle_single TRAINER_VITO, VictoryRoad_B2F_Text_23695F, VictoryRoad_B2F_Text_2369B3 - msgbox VictoryRoad_B2F_Text_2369DE, MSGBOX_AUTOCLOSE +VictoryRoad_B2F_EventScript_Vito:: @ 82368D5 + trainerbattle_single TRAINER_VITO, VictoryRoad_B2F_Text_VitoIntro, VictoryRoad_B2F_Text_VitoDefeat + msgbox VictoryRoad_B2F_Text_VitoPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_B2F_EventScript_2368EC:: @ 82368EC - trainerbattle_single TRAINER_OWEN, VictoryRoad_B2F_Text_236A4C, VictoryRoad_B2F_Text_236A92 - msgbox VictoryRoad_B2F_Text_236AAE, MSGBOX_AUTOCLOSE +VictoryRoad_B2F_EventScript_Owen:: @ 82368EC + trainerbattle_single TRAINER_OWEN, VictoryRoad_B2F_Text_OwenIntro, VictoryRoad_B2F_Text_OwenDefeat + msgbox VictoryRoad_B2F_Text_OwenPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_B2F_EventScript_236903:: @ 8236903 - trainerbattle_single TRAINER_CAROLINE, VictoryRoad_B2F_Text_236AF0, VictoryRoad_B2F_Text_236B14 - msgbox VictoryRoad_B2F_Text_236B2F, MSGBOX_AUTOCLOSE +VictoryRoad_B2F_EventScript_Caroline:: @ 8236903 + trainerbattle_single TRAINER_CAROLINE, VictoryRoad_B2F_Text_CarolineIntro, VictoryRoad_B2F_Text_CarolineDefeat + msgbox VictoryRoad_B2F_Text_CarolinePostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_B2F_EventScript_23691A:: @ 823691A - trainerbattle_single TRAINER_JULIE, VictoryRoad_B2F_Text_236B88, VictoryRoad_B2F_Text_236C0A - msgbox VictoryRoad_B2F_Text_236C21, MSGBOX_AUTOCLOSE +VictoryRoad_B2F_EventScript_Julie:: @ 823691A + trainerbattle_single TRAINER_JULIE, VictoryRoad_B2F_Text_JulieIntro, VictoryRoad_B2F_Text_JulieDefeat + msgbox VictoryRoad_B2F_Text_JuliePostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_B2F_EventScript_236931:: @ 8236931 - trainerbattle_single TRAINER_FELIX, VictoryRoad_B2F_Text_236C67, VictoryRoad_B2F_Text_236CAB - msgbox VictoryRoad_B2F_Text_236CBA, MSGBOX_AUTOCLOSE +VictoryRoad_B2F_EventScript_Felix:: @ 8236931 + trainerbattle_single TRAINER_FELIX, VictoryRoad_B2F_Text_FelixIntro, VictoryRoad_B2F_Text_FelixDefeat + msgbox VictoryRoad_B2F_Text_FelixPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_B2F_EventScript_236948:: @ 8236948 - trainerbattle_single TRAINER_DIANNE, VictoryRoad_B2F_Text_236D27, VictoryRoad_B2F_Text_236D6E - msgbox VictoryRoad_B2F_Text_236D8C, MSGBOX_AUTOCLOSE +VictoryRoad_B2F_EventScript_Dianne:: @ 8236948 + trainerbattle_single TRAINER_DIANNE, VictoryRoad_B2F_Text_DianneIntro, VictoryRoad_B2F_Text_DianneDefeat + msgbox VictoryRoad_B2F_Text_DiannePostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_B2F_Text_23695F: @ 823695F +VictoryRoad_B2F_Text_VitoIntro: @ 823695F .string "I trained together with my whole family,\n" .string "every one of us!\l" .string "I'm not losing to anyone!$" -VictoryRoad_B2F_Text_2369B3: @ 82369B3 +VictoryRoad_B2F_Text_VitoDefeat: @ 82369B3 .string "Better than my family?!\n" .string "Is that possible?!$" -VictoryRoad_B2F_Text_2369DE: @ 82369DE +VictoryRoad_B2F_Text_VitoPostBattle: @ 82369DE .string "I was better than everyone in my\n" .string "family. I've never lost before…\p" .string "I've lost my confidence…\n" .string "Maybe I'll go home…$" -VictoryRoad_B2F_Text_236A4C: @ 8236A4C +VictoryRoad_B2F_Text_OwenIntro: @ 8236A4C .string "I'd heard that there was a tough\n" .string "little kid around. Do they mean you?$" -VictoryRoad_B2F_Text_236A92: @ 8236A92 +VictoryRoad_B2F_Text_OwenDefeat: @ 8236A92 .string "The little shrimp is tough!$" -VictoryRoad_B2F_Text_236AAE: @ 8236AAE +VictoryRoad_B2F_Text_OwenPostBattle: @ 8236AAE .string "The rumors I heard, that tough little\n" .string "kid is from PETALBURG CITY.$" -VictoryRoad_B2F_Text_236AF0: @ 8236AF0 +VictoryRoad_B2F_Text_CarolineIntro: @ 8236AF0 .string "You must be getting a little tired.$" -VictoryRoad_B2F_Text_236B14: @ 8236B14 +VictoryRoad_B2F_Text_CarolineDefeat: @ 8236B14 .string "No signs of tiring at all!$" -VictoryRoad_B2F_Text_236B2F: @ 8236B2F +VictoryRoad_B2F_Text_CarolinePostBattle: @ 8236B2F .string "VICTORY ROAD and the POKéMON LEAGUE\n" .string "are long and grueling challenges.\l" .string "Beware of fatigue!$" -VictoryRoad_B2F_Text_236B88: @ 8236B88 +VictoryRoad_B2F_Text_JulieIntro: @ 8236B88 .string "You shouldn't get complacent just\n" .string "because you have a lot of GYM BADGES.\p" .string "There's always going to be someone\n" .string "who's better than you!$" -VictoryRoad_B2F_Text_236C0A: @ 8236C0A +VictoryRoad_B2F_Text_JulieDefeat: @ 8236C0A .string "You're better than me!$" -VictoryRoad_B2F_Text_236C21: @ 8236C21 +VictoryRoad_B2F_Text_JuliePostBattle: @ 8236C21 .string "Gaze on your collected BADGES and\n" .string "remember the TRAINERS you've faced.$" -VictoryRoad_B2F_Text_236C67: @ 8236C67 +VictoryRoad_B2F_Text_FelixIntro: @ 8236C67 .string "I've come this far, but the tension's\n" .string "giving me awful stomach pain…$" -VictoryRoad_B2F_Text_236CAB: @ 8236CAB +VictoryRoad_B2F_Text_FelixDefeat: @ 8236CAB .string "Ooh…\n" .string "It hurts…$" -VictoryRoad_B2F_Text_236CBA: @ 8236CBA +VictoryRoad_B2F_Text_FelixPostBattle: @ 8236CBA .string "I can't help getting all tense knowing\n" .string "that I'm nearing the POKéMON LEAGUE.\p" .string "It's all I can do to feign calm.$" -VictoryRoad_B2F_Text_236D27: @ 8236D27 +VictoryRoad_B2F_Text_DianneIntro: @ 8236D27 .string "The elite among the elite gather in\n" .string "this cave.\p" .string "How are you finding it?$" -VictoryRoad_B2F_Text_236D6E: @ 8236D6E +VictoryRoad_B2F_Text_DianneDefeat: @ 8236D6E .string "Not rattled in the least bit!$" -VictoryRoad_B2F_Text_236D8C: @ 8236D8C +VictoryRoad_B2F_Text_DiannePostBattle: @ 8236D8C .string "You do have guts! I like that!\n" .string "Keep it going!$" diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc index 2ca9c7b06..40b4cf658 100644 --- a/data/scripts/field_poison.inc +++ b/data/scripts/field_poison.inc @@ -16,7 +16,7 @@ EventScript_FieldWhiteOut:: @ 82736D9 special Script_FadeOutMapMusic waitstate fadescreen 1 - call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, EventScript_SetRespawnLavaridgePkmnCenter + call_if_set FLAG_WHITEOUT_TO_LAVARIDGE, EventScript_SetRespawnLavaridgePkmnCenter special SetCB2WhiteOut waitstate end diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc index e39c6eca6..cba1c68ba 100644 --- a/data/scripts/new_game.inc +++ b/data/scripts/new_game.inc @@ -166,7 +166,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE setflag FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN setflag FLAG_HIDE_MT_CHIMNEY_TRAINERS setflag FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY - setflag FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN + setflag FLAG_HIDE_RUSTURF_TUNNEL_BRINEY setflag FLAG_HIDE_ROUTE_116_MR_BRINEY setflag FLAG_HIDE_RUSTURF_TUNNEL_PEEKO setflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT @@ -199,8 +199,8 @@ EventScript_ResetAllMapFlags:: @ 82715DE setflag FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE setflag FLAG_HIDE_ROUTE_104_RIVAL setflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS - setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 - setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2 + setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL + setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_ON_BIKE setflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL setflag FLAG_HIDE_METEOR_FALLS_TEAM_AQUA setflag FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN @@ -237,7 +237,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS setflag FLAG_HIDE_DEOXYS setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION - setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT + setflag FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT setflag FLAG_HIDE_SKY_PILLAR_WALLACE setflag FLAG_HIDE_RAYQUAZA_SKY_TOWER_SUMMIT diff --git a/data/text/braille.inc b/data/text/braille.inc index 13c66c52f..30f9b44d4 100644 --- a/data/text/braille.inc +++ b/data/text/braille.inc @@ -1,4 +1,4 @@ -Underwater_SealedChamber_Braille_2A6B15: @ 82A6B15 +Underwater_SealedChamber_Braille_GoUpHere: @ 82A6B15 .byte 4 .byte 6 .byte 26 @@ -7,7 +7,7 @@ Underwater_SealedChamber_Braille_2A6B15: @ 82A6B15 .byte 9 .braille "GO UP HERE.$" -SealedChamber_OuterRoom_Braille_2A6B27: @ 82A6B27 +SealedChamber_OuterRoom_Braille_ABC: @ 82A6B27 .byte 7 .byte 6 .byte 21 @@ -16,7 +16,7 @@ SealedChamber_OuterRoom_Braille_2A6B27: @ 82A6B27 .byte 9 .braille "ABC$" -SealedChamber_OuterRoom_Braille_2A6B31: @ 82A6B31 +SealedChamber_OuterRoom_Braille_GHI: @ 82A6B31 .byte 7 .byte 6 .byte 21 @@ -25,7 +25,7 @@ SealedChamber_OuterRoom_Braille_2A6B31: @ 82A6B31 .byte 9 .braille "GHI$" -SealedChamber_OuterRoom_Braille_2A6B3B: @ 82A6B3B +SealedChamber_OuterRoom_Braille_MNO: @ 82A6B3B .byte 7 .byte 6 .byte 21 @@ -34,7 +34,7 @@ SealedChamber_OuterRoom_Braille_2A6B3B: @ 82A6B3B .byte 9 .braille "MNO$" -SealedChamber_OuterRoom_Braille_2A6B45: @ 82A6B45 +SealedChamber_OuterRoom_Braille_TUV: @ 82A6B45 .byte 7 .byte 6 .byte 21 @@ -43,7 +43,7 @@ SealedChamber_OuterRoom_Braille_2A6B45: @ 82A6B45 .byte 9 .braille "TUV$" -SealedChamber_OuterRoom_Braille_2A6B4F: @ 82A6B4F +SealedChamber_OuterRoom_Braille_DEF: @ 82A6B4F .byte 7 .byte 6 .byte 21 @@ -52,7 +52,7 @@ SealedChamber_OuterRoom_Braille_2A6B4F: @ 82A6B4F .byte 9 .braille "DEF$" -SealedChamber_OuterRoom_Braille_2A6B59: @ 82A6B59 +SealedChamber_OuterRoom_Braille_JKL: @ 82A6B59 .byte 7 .byte 6 .byte 21 @@ -61,7 +61,7 @@ SealedChamber_OuterRoom_Braille_2A6B59: @ 82A6B59 .byte 9 .braille "JKL$" -SealedChamber_OuterRoom_Braille_2A6B63: @ 82A6B63 +SealedChamber_OuterRoom_Braille_PQRS: @ 82A6B63 .byte 7 .byte 6 .byte 21 @@ -70,7 +70,7 @@ SealedChamber_OuterRoom_Braille_2A6B63: @ 82A6B63 .byte 9 .braille "PQRS$" -SealedChamber_OuterRoom_Braille_2A6B6E: @ 82A6B6E +SealedChamber_OuterRoom_Braille_Period: @ 82A6B6E .byte 9 .byte 6 .byte 19 @@ -79,7 +79,7 @@ SealedChamber_OuterRoom_Braille_2A6B6E: @ 82A6B6E .byte 9 .braille ".$" -SealedChamber_OuterRoom_Braille_2A6B76: @ 82A6B76 +SealedChamber_OuterRoom_Braille_WXYZ: @ 82A6B76 .byte 7 .byte 6 .byte 21 @@ -88,7 +88,7 @@ SealedChamber_OuterRoom_Braille_2A6B76: @ 82A6B76 .byte 9 .braille "WXYZ$" -SealedChamber_OuterRoom_Braille_2A6B81: @ 82A6B81 +SealedChamber_OuterRoom_Braille_Comma: @ 82A6B81 .byte 9 .byte 6 .byte 19 @@ -97,7 +97,7 @@ SealedChamber_OuterRoom_Braille_2A6B81: @ 82A6B81 .byte 9 .braille ",$" -SealedChamber_OuterRoom_Braille_2A6B89: @ 82A6B89 +SealedChamber_OuterRoom_Braille_DigHere: @ 82A6B89 .byte 7 .byte 4 .byte 23 @@ -106,7 +106,7 @@ SealedChamber_OuterRoom_Braille_2A6B89: @ 82A6B89 .byte 7 .braille "DIG HERE.$" -SealedChamber_InnerRoom_Braille_2A6B99: @ 82A6B99 +SealedChamber_InnerRoom_Braille_FirstWailordLastRelicanth: @ 82A6B99 .byte 0 .byte 0 .byte 29 @@ -118,7 +118,7 @@ SealedChamber_InnerRoom_Braille_2A6B99: @ 82A6B99 .braille "LAST COMES\n" .braille "RELICANTH.$" -SealedChamber_InnerRoom_Braille_2A6BCA: @ 82A6BCA +SealedChamber_InnerRoom_Braille_InThisCaveWeHaveLived: @ 82A6BCA .byte 2 .byte 0 .byte 26 @@ -130,7 +130,7 @@ SealedChamber_InnerRoom_Braille_2A6BCA: @ 82A6BCA .braille "HAVE\n" .braille "LIVED.$" -SealedChamber_InnerRoom_Braille_2A6BEC: @ 82A6BEC +SealedChamber_InnerRoom_Braille_WeOweAllToThePokemon: @ 82A6BEC .byte 7 .byte 2 .byte 23 @@ -141,7 +141,7 @@ SealedChamber_InnerRoom_Braille_2A6BEC: @ 82A6BEC .braille "TO THE\n" .braille "POKEMON.$" -SealedChamber_InnerRoom_Braille_2A6C0D: @ 82A6C0D +SealedChamber_InnerRoom_Braille_ButWeSealedThePokemonAway: @ 82A6C0D .byte 3 .byte 0 .byte 25 @@ -153,7 +153,7 @@ SealedChamber_InnerRoom_Braille_2A6C0D: @ 82A6C0D .braille "POKEMON\n" .braille "AWAY.$" -SealedChamber_InnerRoom_Braille_2A6C34: @ 82A6C34 +SealedChamber_InnerRoom_Braille_WeFearedIt: @ 82A6C34 .byte 5 .byte 6 .byte 25 @@ -162,7 +162,7 @@ SealedChamber_InnerRoom_Braille_2A6C34: @ 82A6C34 .byte 9 .braille "WE FEARED IT.$" -SealedChamber_InnerRoom_Braille_2A6C48: @ 82A6C48 +SealedChamber_InnerRoom_Braille_ThoseWithCourageHope: @ 82A6C48 .byte 6 .byte 0 .byte 24 @@ -174,7 +174,7 @@ SealedChamber_InnerRoom_Braille_2A6C48: @ 82A6C48 .braille "THOSE WITH\n" .braille "HOPE.$" -SealedChamber_InnerRoom_Braille_2A6C73: @ 82A6C73 +SealedChamber_InnerRoom_Braille_OpenDoorEternalPokemonWaits: @ 82A6C73 .byte 3 .byte 2 .byte 27 diff --git a/data/text/shoal_cave.inc b/data/text/shoal_cave.inc index 52ab9fc48..4a15e7498 100644 --- a/data/text/shoal_cave.inc +++ b/data/text/shoal_cave.inc @@ -1,4 +1,4 @@ -ShoalCave_LowTideEntranceRoom_Text_2A7E0E: @ 82A7E0E +ShoalCave_LowTideEntranceRoom_Text_AreYouPlanningOnGoingInThere: @ 82A7E0E .string "Are you planning on going deep\n" .string "in there?\p" .string "How about bringing me back some\n" @@ -6,27 +6,27 @@ ShoalCave_LowTideEntranceRoom_Text_2A7E0E: @ 82A7E0E .string "I can make you something good if\n" .string "you bring me the ingredients.$" -ShoalCave_LowTideEntranceRoom_Text_2A7EB3: @ 82A7EB3 +ShoalCave_LowTideEntranceRoom_Text_BringMe4ShoalSaltAndShells: @ 82A7EB3 .string "If you bring me four each of the\n" .string "SHOAL SALT and SHOAL SHELLS,\l" .string "I can make you a SHELL BELL…\p" .string "You can get those ingredients\n" .string "every day.$" -ShoalCave_LowTideEntranceRoom_Text_2A7F37: @ 82A7F37 +ShoalCave_LowTideEntranceRoom_Text_WouldYouLikeShellBell: @ 82A7F37 .string "Oh, hey! SHOAL SALT and SHOAL SHELLS!\n" .string "And enough of them, too!\p" .string "Would you like me to make you\n" .string "a SHELL BELL with them?$" -ShoalCave_LowTideEntranceRoom_Text_2A7FAC: @ 82A7FAC +ShoalCave_LowTideEntranceRoom_Text_MakeShellBellRightAway: @ 82A7FAC .string "All righty, then! I'll make you\n" .string "a SHELL BELL right away.\p" .string "… … … … … … … …\n" .string "… … … … … … … …\p" .string "There! Done!$" -ShoalCave_LowTideEntranceRoom_Text_2A8012: @ 82A8012 +ShoalCave_LowTideEntranceRoom_Text_ExplainShellBell: @ 82A8012 .string "Have a POKéMON hold on to that.\n" .string "It'll love it, that's for certain.\p" .string "Why, the SHELL BELL's chime…\n" @@ -34,22 +34,20 @@ ShoalCave_LowTideEntranceRoom_Text_2A8012: @ 82A8012 .string "You can get its ingredients every day,\n" .string "so I can make you more.$" -ShoalCave_LowTideEntranceRoom_Text_2A80C6: @ 82A80C6 +ShoalCave_LowTideEntranceRoom_Text_WantedToMakeShellBell: @ 82A80C6 .string "Oh… Is that so…\n" .string "I wanted to make a SHELL BELL…$" -ShoalCave_LowTideEntranceRoom_Text_2A80F5: @ 82A80F5 +ShoalCave_LowTideEntranceRoom_Text_NoSpaceInYourBag: @ 82A80F5 .string "You don't have space in your BAG\n" .string "if I were to make it for you.\p" .string "You should make room and come back\n" .string "for a SHELL BELL.$" -ShoalCave_LowTideInnerRoom_Text_2A8169: @ 82A8169 -ShoalCave_LowTideLowerRoom_Text_2A8169: @ 82A8169 -ShoalCave_LowTideStairsRoom_Text_2A8169: @ 82A8169 +ShoalCave_Text_WasShoalSaltNowNothing: @ 82A8169 .string "There was some SHOAL SALT here.\n" .string "But, there's nothing here now.$" -ShoalCave_LowTideInnerRoom_Text_2A81A8: @ 82A81A8 +ShoalCave_Text_WasShoallShellNowNothing: @ 82A81A8 .string "There was a SHOAL SHELL here.\n" .string "But, there's nothing here now.$" diff --git a/graphics/battle_frontier/text.pal b/graphics/battle_interface/text.pal index 574999b72..574999b72 100644..100755 --- a/graphics/battle_frontier/text.pal +++ b/graphics/battle_interface/text.pal diff --git a/include/battle_bg.h b/include/battle_bg.h index dac41c992..167ea5cf7 100644 --- a/include/battle_bg.h +++ b/include/battle_bg.h @@ -2,11 +2,11 @@ #define GUARD_BATTLE_BG_H void BattleInitBgsAndWindows(void); -void sub_80356D0(void); +void InitBattleBgsVideo(void); void LoadBattleMenuWindowGfx(void); void DrawMainBattleBackground(void); void LoadBattleTextboxAndBackground(void); -void sub_8035D74(u8 taskId); +void InitLinkBattleVsScreen(u8 taskId); void DrawBattleEntryBackground(void); bool8 LoadChosenBattleElement(u8 caseId); diff --git a/include/battle_message.h b/include/battle_message.h index 88ccbb90f..1157fbfae 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -213,7 +213,7 @@ struct BattleMsgData void BufferStringBattle(u16 stringID); u32 BattleStringExpandPlaceholdersToDisplayedString(const u8* src); u32 BattleStringExpandPlaceholders(const u8* src, u8* dst); -void BattlePutTextOnWindow(const u8* text, u8 arg1); +void BattlePutTextOnWindow(const u8* text, u8 windowId); void SetPpNumbersPaletteInMoveSelection(void); u8 GetCurrentPpToMaxPpState(u8 currentPp, u8 maxPp); diff --git a/include/constants/coins.h b/include/constants/coins.h new file mode 100644 index 000000000..fd68f3f9e --- /dev/null +++ b/include/constants/coins.h @@ -0,0 +1,6 @@ +#ifndef GUARD_CONSTANTS_COINS_H +#define GUARD_CONSTANTS_COINS_H + +#define MAX_COINS 9999 + +#endif // GUARD_CONSTANTS_COINS_H
\ No newline at end of file diff --git a/include/constants/flags.h b/include/constants/flags.h index e76a9d9d7..0ab22c1ef 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -119,7 +119,7 @@ #define FLAG_OCEANIC_MUSEUM_MET_REPORTER 0x69 #define FLAG_RECEIVED_HM04 0x6A #define FLAG_RECEIVED_HM06 0x6B -#define FLAG_FLANNERY_GIVES_BADGE_INFO 0x6C +#define FLAG_WHITEOUT_TO_LAVARIDGE 0x6C // Set after defeating Flannery, so the player cant white out from poison before receiving Go Goggles #define FLAG_RECEIVED_HM05 0x6D #define FLAG_RECEIVED_HM02 0x6E #define FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT 0x6F @@ -261,7 +261,7 @@ #define FLAG_USED_ROOM_2_KEY 0xF1 #define FLAG_USED_ROOM_4_KEY 0xF2 #define FLAG_USED_ROOM_6_KEY 0xF3 -#define FLAG_MET_PROF_COSMO 0xF4 +#define FLAG_MET_PROF_COZMO 0xF4 #define FLAG_RECEIVED_WAILMER_DOLL 0xF5 #define FLAG_RECEIVED_CHESTO_BERRY_ROUTE_104 0xF6 #define FLAG_DEFEATED_SS_TIDAL_TRAINERS 0xF7 @@ -807,7 +807,7 @@ #define FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE 0x2FC #define FLAG_HIDE_MAUVILLE_CITY_SCOTT 0x2FD #define FLAG_HIDE_VERDANTURF_TOWN_SCOTT 0x2FE -#define FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT 0x2FF +#define FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT 0x2FF #define FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE 0x300 #define FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE 0x301 #define FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE 0x302 @@ -919,7 +919,7 @@ #define FLAG_HIDE_ROUTE_111_DESERT_FOSSIL 0x36C #define FLAG_HIDE_MT_CHIMNEY_TRAINERS 0x36D #define FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT 0x36E -#define FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN 0x36F +#define FLAG_HIDE_RUSTURF_TUNNEL_BRINEY 0x36F #define FLAG_HIDE_RUSTURF_TUNNEL_PEEKO 0x370 #define FLAG_HIDE_BRINEYS_HOUSE_PEEKO 0x371 #define FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA 0x372 @@ -969,8 +969,8 @@ #define FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA 0x39E #define FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA 0x39F #define FLAG_HIDE_FALLARBOR_HOUSE_PROF_COZMO 0x3A0 -#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 0x3A1 -#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2 0x3A2 +#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL 0x3A1 +#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_ON_BIKE 0x3A2 #define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1 0x3A3 #define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2 0x3A4 #define FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL 0x3A5 diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index 6d17fc047..c3ec28406 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -381,7 +381,7 @@ #define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right_Alt 0x27C #define METATILE_TrickHousePuzzle_Arrow_YellowOnWhite_Right 0x298 -// gTileset_BikeShop +// gTileset_BikeShop (also used by New Mauville) #define METATILE_BikeShop_Barrier_Hidden_Top 0x269 #define METATILE_BikeShop_Barrier_Hidden_Bottom 0x271 #define METATILE_BikeShop_Floor_Shadow_Top 0x26D diff --git a/include/event_scripts.h b/include/event_scripts.h index 1a3230b31..1b2759787 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -552,7 +552,7 @@ extern const u8 EventScript_FieldPoison[]; extern const u8 EventScript_EggHatch[]; extern const u8 UnusualWeather_EventScript_EndEventAndCleanup_1[]; extern const u8 IslandCave_EventScript_OpenRegiEntrance[]; -extern const u8 MauvilleCity_EventScript_1DF7BA[]; +extern const u8 MauvilleCity_EventScript_RegisterWallyCall[]; extern const u8 Route119_EventScript_1F49EC[]; extern const u8 LittlerootTown_ProfessorBirchsLab_EventScript_ScottAboardSSTidalCall[]; extern const u8 RustboroCity_Gym_EventScript_RegisterRoxanne[]; diff --git a/include/graphics.h b/include/graphics.h index 37dd77e89..831b202f8 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -3208,7 +3208,7 @@ extern const u32 gBattleTextboxTiles[]; extern const u32 gBattleTextboxTilemap[]; extern const u32 gBattleTextboxPalette[]; extern const u32 gUnknown_08D778F0[]; -extern const u32 gUnknown_08D77B0C[]; +extern const u32 gVsLettersGfx[]; extern const u32 gUnknown_08D77AE4[]; extern const u32 gUnknown_08D779D8[]; extern const u32 gUnknown_08D857A8[]; @@ -4122,7 +4122,7 @@ extern const u32 gUnknown_08D84970[]; extern const u32 gUnknown_08D84F00[]; extern const u32 gUnknown_08D85444[]; extern const u32 gUnknown_08D85358[]; -extern const u32 gUnknown_08D85600[]; +extern const u32 gBattleWindowTextPalette[]; extern const u32 gUnknown_08D854C8[]; extern const u32 gUnknown_08D82F10[]; extern const u32 gUnknown_08D834FC[]; diff --git a/include/save_location.h b/include/save_location.h index 2eb550b1a..6c2ae0e6b 100644 --- a/include/save_location.h +++ b/include/save_location.h @@ -6,6 +6,11 @@ #define POKECENTER_SAVEWARP (1 << 1) #define LOBBY_SAVEWARP (1 << 2) #define UNK_SPECIAL_SAVE_WARP_FLAG_3 (1 << 3) +// +// +// +// +#define CHAMPION_SAVEWARP (1 << 7) void TrySetMapSaveWarpStatus(void); void sub_81AFDA0(void); diff --git a/src/battle_bg.c b/src/battle_bg.c index a08873857..567625a99 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -36,7 +36,7 @@ struct BattleBackground // .rodata static const u16 sUnrefArray[] = {0x0300, 0x0000}; //OamData? -static const struct OamData gUnknown_0831A988 = +static const struct OamData sVsLetter_V_OamData = { .y = 0, .affineMode = 3, @@ -53,7 +53,7 @@ static const struct OamData gUnknown_0831A988 = .affineParam = 0, }; -static const struct OamData gUnknown_0831A990 = +static const struct OamData sVsLetter_S_OamData = { .y = 0, .affineMode = 3, @@ -70,13 +70,13 @@ static const struct OamData gUnknown_0831A990 = .affineParam = 0, }; -static const union AffineAnimCmd gUnknown_0831A998[] = +static const union AffineAnimCmd sVsLetterAffineAnimCmds0[] = { AFFINEANIMCMD_FRAME(0x0080, 0x0080, 0x00, 0x00), AFFINEANIMCMD_END, }; -static const union AffineAnimCmd gUnknown_0831A9A8[] = +static const union AffineAnimCmd sVsLetterAffineAnimCmds1[] = { AFFINEANIMCMD_FRAME(0x0080, 0x0080, 0x00, 0x00), AFFINEANIMCMD_FRAME(0x0018, 0x0018, 0x00, 0x80), @@ -84,37 +84,39 @@ static const union AffineAnimCmd gUnknown_0831A9A8[] = AFFINEANIMCMD_END, }; -static const union AffineAnimCmd * const gUnknown_0831A9C8[] = +static const union AffineAnimCmd *const sVsLetterAffineAnimTable[] = { - gUnknown_0831A998, - gUnknown_0831A9A8, + sVsLetterAffineAnimCmds0, + sVsLetterAffineAnimCmds1, }; -static const struct SpriteTemplate gUnknown_0831A9D0 = +#define TAG_VS_LETTERS 10000 + +static const struct SpriteTemplate sVsLetter_V_SpriteTemplate = { - .tileTag = 0x2710, - .paletteTag = 0x2710, - .oam = &gUnknown_0831A988, + .tileTag = TAG_VS_LETTERS, + .paletteTag = TAG_VS_LETTERS, + .oam = &sVsLetter_V_OamData, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_0831A9C8, + .affineAnims = sVsLetterAffineAnimTable, .callback = nullsub_17 }; -static const struct SpriteTemplate gUnknown_0831A9E8 = +static const struct SpriteTemplate sVsLetter_S_SpriteTemplate = { - .tileTag = 0x2710, - .paletteTag = 0x2710, - .oam = &gUnknown_0831A990, + .tileTag = TAG_VS_LETTERS, + .paletteTag = TAG_VS_LETTERS, + .oam = &sVsLetter_S_OamData, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_0831A9C8, + .affineAnims = sVsLetterAffineAnimTable, .callback = nullsub_17 }; -static const struct CompressedSpriteSheet gUnknown_0831AA00 = +static const struct CompressedSpriteSheet sVsLettersSpriteSheet = { - gUnknown_08D77B0C, 0x1000, 0x2710 + gVsLettersGfx, 0x1000, TAG_VS_LETTERS }; const struct BgTemplate gBattleBgTemplates[] = @@ -689,7 +691,6 @@ static const struct BattleBackground gBattleTerrainTable[] = }, }; -// .text void BattleInitBgsAndWindows(void) { ResetBgsAndClearDma3BusyFlags(0); @@ -710,7 +711,7 @@ void BattleInitBgsAndWindows(void) DeactivateAllTextPrinters(); } -void sub_80356D0(void) +void InitBattleBgsVideo(void) { DisableInterrupts(INTR_FLAG_HBLANK); EnableInterrupts(INTR_FLAG_VBLANK | INTR_FLAG_VCOUNT | INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL); @@ -725,10 +726,11 @@ void LoadBattleMenuWindowGfx(void) { LoadUserWindowBorderGfx(2, 0x12, 0x10); LoadUserWindowBorderGfx(2, 0x22, 0x10); - LoadCompressedPalette(gUnknown_08D85600, 0x50, 0x20); + LoadCompressedPalette(gBattleWindowTextPalette, 0x50, 0x20); if (gBattleTypeFlags & BATTLE_TYPE_ARENA) { + // Load graphics for the Battle Arena referee's mid-battle messages. Menu_LoadStdPalAt(0x70); LoadMessageBoxGfx(0, 0x30, 0x70); gPlttBufferUnfaded[0x76] = 0; @@ -837,86 +839,81 @@ void DrawMainBattleBackground(void) void LoadBattleTextboxAndBackground(void) { - LZDecompressVram(gBattleTextboxTiles, (void*)(VRAM)); + LZDecompressVram(gBattleTextboxTiles, (void*)(BG_CHAR_ADDR(0))); CopyToBgTilemapBuffer(0, gBattleTextboxTilemap, 0, 0); CopyBgTilemapBufferToVram(0); LoadCompressedPalette(gBattleTextboxPalette, 0, 0x40); LoadBattleMenuWindowGfx(); - DrawMainBattleBackground(); } -static void sub_8035AE4(u8 taskId, u8 battlerId, u8 bgId, u8 destX, u8 destY) +static void DrawLinkBattleParticipantPokeballs(u8 taskId, u8 multiplayerId, u8 bgId, u8 destX, u8 destY) { s32 i; - u16 var = 0; - u16 src[6]; + u16 pokeballStatuses = 0; + u16 tiles[6]; if (gBattleTypeFlags & BATTLE_TYPE_MULTI) { if (gTasks[taskId].data[5] != 0) { - switch (battlerId) + switch (multiplayerId) { case 0: - var = 0x3F & gTasks[taskId].data[3]; + pokeballStatuses = 0x3F & gTasks[taskId].data[3]; break; case 1: - var = (0xFC0 & gTasks[taskId].data[4]) >> 6; + pokeballStatuses = (0xFC0 & gTasks[taskId].data[4]) >> 6; break; case 2: - var = (0xFC0 & gTasks[taskId].data[3]) >> 6; + pokeballStatuses = (0xFC0 & gTasks[taskId].data[3]) >> 6; break; case 3: - var = 0x3F & gTasks[taskId].data[4]; + pokeballStatuses = 0x3F & gTasks[taskId].data[4]; break; } } else { - switch (battlerId) + switch (multiplayerId) { case 0: - var = 0x3F & gTasks[taskId].data[3]; + pokeballStatuses = 0x3F & gTasks[taskId].data[3]; break; case 1: - var = 0x3F & gTasks[taskId].data[4]; + pokeballStatuses = 0x3F & gTasks[taskId].data[4]; break; case 2: - var = (0xFC0 & gTasks[taskId].data[3]) >> 6; + pokeballStatuses = (0xFC0 & gTasks[taskId].data[3]) >> 6; break; case 3: - var = (0xFC0 & gTasks[taskId].data[4]) >> 6; + pokeballStatuses = (0xFC0 & gTasks[taskId].data[4]) >> 6; break; } } for (i = 0; i < 3; i++) - { - src[i] = ((var & (3 << (i * 2))) >> (i * 2)) + 0x6001; - } + tiles[i] = ((pokeballStatuses & (3 << (i * 2))) >> (i * 2)) + 0x6001; - CopyToBgTilemapBufferRect_ChangePalette(bgId, src, destX, destY, 3, 1, 0x11); + CopyToBgTilemapBufferRect_ChangePalette(bgId, tiles, destX, destY, 3, 1, 0x11); CopyBgTilemapBufferToVram(bgId); } else { - if (battlerId == gBattleScripting.multiplayerId) - var = gTasks[taskId].data[3]; + if (multiplayerId == gBattleScripting.multiplayerId) + pokeballStatuses = gTasks[taskId].data[3]; else - var = gTasks[taskId].data[4]; + pokeballStatuses = gTasks[taskId].data[4]; for (i = 0; i < 6; i++) - { - src[i] = ((var & (3 << (i * 2))) >> (i * 2)) + 0x6001; - } + tiles[i] = ((pokeballStatuses & (3 << (i * 2))) >> (i * 2)) + 0x6001; - CopyToBgTilemapBufferRect_ChangePalette(bgId, src, destX, destY, 6, 1, 0x11); + CopyToBgTilemapBufferRect_ChangePalette(bgId, tiles, destX, destY, 6, 1, 0x11); CopyBgTilemapBufferToVram(bgId); } } -static void sub_8035C4C(void) +static void DrawLinkBattleVsScreenOutcomeText(void) { if (gBattleOutcome == B_OUTCOME_DREW) { @@ -997,7 +994,7 @@ static void sub_8035C4C(void) } } -void sub_8035D74(u8 taskId) +void InitLinkBattleVsScreen(u8 taskId) { struct LinkPlayer *linkPlayer; u8 *name; @@ -1017,19 +1014,19 @@ void sub_8035D74(u8 taskId) { case 0: BattlePutTextOnWindow(name, 0x11); - sub_8035AE4(taskId, linkPlayer->id, 1, 2, 4); + DrawLinkBattleParticipantPokeballs(taskId, linkPlayer->id, 1, 2, 4); break; case 1: BattlePutTextOnWindow(name, 0x12); - sub_8035AE4(taskId, linkPlayer->id, 2, 2, 4); + DrawLinkBattleParticipantPokeballs(taskId, linkPlayer->id, 2, 2, 4); break; case 2: BattlePutTextOnWindow(name, 0x13); - sub_8035AE4(taskId, linkPlayer->id, 1, 2, 8); + DrawLinkBattleParticipantPokeballs(taskId, linkPlayer->id, 1, 2, 8); break; case 3: BattlePutTextOnWindow(name, 0x14); - sub_8035AE4(taskId, linkPlayer->id, 2, 2, 8); + DrawLinkBattleParticipantPokeballs(taskId, linkPlayer->id, 2, 2, 8); break; } } @@ -1049,16 +1046,16 @@ void sub_8035D74(u8 taskId) name = gLinkPlayers[opponentId].name; BattlePutTextOnWindow(name, 0x10); - sub_8035AE4(taskId, playerId, 1, 2, 7); - sub_8035AE4(taskId, opponentId, 2, 2, 7); + DrawLinkBattleParticipantPokeballs(taskId, playerId, 1, 2, 7); + DrawLinkBattleParticipantPokeballs(taskId, opponentId, 2, 2, 7); } gTasks[taskId].data[0]++; break; case 1: - palId = AllocSpritePalette(0x2710); + palId = AllocSpritePalette(TAG_VS_LETTERS); gPlttBufferUnfaded[palId * 16 + 0x10F] = gPlttBufferFaded[palId * 16 + 0x10F] = 0x7FFF; - gBattleStruct->linkBattleVsSpriteId_V = CreateSprite(&gUnknown_0831A9D0, 111, 80, 0); - gBattleStruct->linkBattleVsSpriteId_S = CreateSprite(&gUnknown_0831A9E8, 129, 80, 0); + gBattleStruct->linkBattleVsSpriteId_V = CreateSprite(&sVsLetter_V_SpriteTemplate, 111, 80, 0); + gBattleStruct->linkBattleVsSpriteId_S = CreateSprite(&sVsLetter_S_SpriteTemplate, 129, 80, 0); gSprites[gBattleStruct->linkBattleVsSpriteId_V].invisible = TRUE; gSprites[gBattleStruct->linkBattleVsSpriteId_S].invisible = TRUE; gTasks[taskId].data[0]++; @@ -1087,7 +1084,7 @@ void sub_8035D74(u8 taskId) else { if (gTasks[taskId].data[5] != 0) - sub_8035C4C(); + DrawLinkBattleVsScreenOutcomeText(); PlaySE(SE_W231); DestroyTask(taskId); @@ -1110,7 +1107,7 @@ void DrawBattleEntryBackground(void) if (gBattleTypeFlags & BATTLE_TYPE_LINK) { LZDecompressVram(gUnknown_08D778F0, (void*)(BG_CHAR_ADDR(1))); - LZDecompressVram(gUnknown_08D77B0C, (void*)(VRAM + 0x10000)); + LZDecompressVram(gVsLettersGfx, (void*)(VRAM + 0x10000)); LoadCompressedPalette(gUnknown_08D77AE4, 0x60, 0x20); SetBgAttribute(1, BG_ATTR_SCREENSIZE, 1); SetGpuReg(REG_OFFSET_BG1CNT, 0x5C04); @@ -1122,7 +1119,7 @@ void DrawBattleEntryBackground(void) SetGpuReg(REG_OFFSET_WINOUT, 0x36); gBattle_BG1_Y = 0xFF5C; gBattle_BG2_Y = 0xFF5C; - LoadCompressedSpriteSheetUsingHeap(&gUnknown_0831AA00); + LoadCompressedSpriteSheetUsingHeap(&sVsLettersSpriteSheet); } else if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_EREADER_TRAINER)) { @@ -1195,7 +1192,7 @@ bool8 LoadChosenBattleElement(u8 caseId) switch (caseId) { case 0: - LZDecompressVram(gBattleTextboxTiles, (void*)(VRAM)); + LZDecompressVram(gBattleTextboxTiles, (void*)(BG_CHAR_ADDR(0))); break; case 1: CopyToBgTilemapBuffer(0, gBattleTextboxTilemap, 0, 0); diff --git a/src/battle_dome.c b/src/battle_dome.c index a7d7a92f1..9c63bba42 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -3414,7 +3414,7 @@ static void Task_ShowOpponentInfo(u8 taskId) LoadCompressedSpriteSheet(sDomeOptionsSpriteSheet); LoadCompressedPalette(gUnknown_08D85358, 0, 0x200); LoadCompressedPalette(gUnknown_08D85444, 0x100, 0x200); - LoadCompressedPalette(gUnknown_08D85600, 0xF0, 0x20); + LoadCompressedPalette(gBattleWindowTextPalette, 0xF0, 0x20); if (r9 == 2) LoadCompressedPalette(gUnknown_08D854C8, 0x50, 0x20); CpuFill32(0, gPlttBufferFaded, 0x400); @@ -5574,7 +5574,7 @@ static void Task_ShowTourneyTree(u8 taskId) DecompressAndLoadBgGfxUsingHeap(3, gUnknown_08D83C3C, 0x2000, 0, 1); LoadCompressedPalette(gUnknown_08D85358, 0, 0x200); LoadCompressedPalette(gUnknown_08D85444, 0x100, 0x200); - LoadCompressedPalette(gUnknown_08D85600, 0xF0, 0x20); + LoadCompressedPalette(gBattleWindowTextPalette, 0xF0, 0x20); CpuFill32(0, gPlttBufferFaded, 0x400); ShowBg(0); ShowBg(1); diff --git a/src/battle_main.c b/src/battle_main.c index ab8c73ed4..196053ad2 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -687,7 +687,7 @@ static void CB2_InitBattleInternal(void) if (gBattleTypeFlags & BATTLE_TYPE_RECORDED) gBattleTerrain = BATTLE_TERRAIN_BUILDING; - sub_80356D0(); + InitBattleBgsVideo(); LoadBattleTextboxAndBackground(); ResetSpriteData(); ResetTasks(); @@ -1024,7 +1024,7 @@ static void CB2_HandleStartBattle(void) ResetBlockReceivedFlags(); sub_8036EB8(2, playerMultiplayerId); SetAllPlayersBerryData(); - taskId = CreateTask(sub_8035D74, 0); + taskId = CreateTask(InitLinkBattleVsScreen, 0); gTasks[taskId].data[1] = 0x10E; gTasks[taskId].data[2] = 0x5A; gTasks[taskId].data[5] = 0; @@ -1226,7 +1226,7 @@ static void CB2_HandleStartMultiPartnerBattle(void) ResetBlockReceivedFlags(); sub_8036EB8(2, playerMultiplayerId); SetAllPlayersBerryData(); - taskId = CreateTask(sub_8035D74, 0); + taskId = CreateTask(InitLinkBattleVsScreen, 0); gTasks[taskId].data[1] = 0x10E; gTasks[taskId].data[2] = 0x5A; gTasks[taskId].data[5] = 0; @@ -1612,7 +1612,7 @@ static void CB2_HandleStartMultiBattle(void) sub_8036EB8(4, playerMultiplayerId); SetAllPlayersBerryData(); SetDeoxysStats(); - var = CreateTask(sub_8035D74, 0); + var = CreateTask(InitLinkBattleVsScreen, 0); gTasks[var].data[1] = 0x10E; gTasks[var].data[2] = 0x5A; gTasks[var].data[5] = 0; @@ -2250,7 +2250,7 @@ void sub_8038D64(void) gBattle_BG3_X = 0; gBattle_BG3_Y = 0; - sub_80356D0(); + InitBattleBgsVideo(); LoadCompressedPalette(gBattleTextboxPalette, 0, 64); LoadBattleMenuWindowGfx(); ResetSpriteData(); @@ -2261,7 +2261,7 @@ void sub_8038D64(void) gReservedSpritePaletteCount = 4; SetVBlankCallback(VBlankCB_Battle); - taskId = CreateTask(sub_8035D74, 0); + taskId = CreateTask(InitLinkBattleVsScreen, 0); gTasks[taskId].data[1] = 0x10E; gTasks[taskId].data[2] = 0x5A; gTasks[taskId].data[5] = 1; @@ -2446,7 +2446,7 @@ static void sub_80392A8(void) gBattle_BG2_Y = 0; gBattle_BG3_X = 0; gBattle_BG3_Y = 0; - sub_80356D0(); + InitBattleBgsVideo(); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); LoadBattleMenuWindowGfx(); diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index a6c0f1ee7..33c5f661b 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -10279,7 +10279,7 @@ static void Cmd_displaydexinfo(void) } break; case 3: - sub_80356D0(); + InitBattleBgsVideo(); LoadBattleTextboxAndBackground(); gBattle_BG3_X = 0x100; gBattleCommunication[0]++; diff --git a/src/coins.c b/src/coins.c index b838c303e..1b9656abd 100644 --- a/src/coins.c +++ b/src/coins.c @@ -6,8 +6,7 @@ #include "string_util.h" #include "menu.h" #include "international_string_util.h" - -#define MAX_COINS 9999 +#include "constants/coins.h" EWRAM_DATA u8 sCoinsWindowId = 0; diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 929539d30..019d48416 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -235,7 +235,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, gBattleTerrain = BATTLE_TERRAIN_PLAIN; - sub_80356D0(); + InitBattleBgsVideo(); LoadBattleTextboxAndBackground(); ResetSpriteData(); ScanlineEffect_Stop(); @@ -341,7 +341,7 @@ static void CB2_EvolutionSceneLoadGraphics(void) gBattleTerrain = BATTLE_TERRAIN_PLAIN; - sub_80356D0(); + InitBattleBgsVideo(); LoadBattleTextboxAndBackground(); ResetSpriteData(); FreeAllSpritePalettes(); diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 64410ff7f..1d57c672c 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -568,7 +568,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior) } if (ShouldDoWallyCall() == TRUE) { - ScriptContext1_SetupScript(MauvilleCity_EventScript_1DF7BA); + ScriptContext1_SetupScript(MauvilleCity_EventScript_RegisterWallyCall); return TRUE; } if (ShouldDoWinonaCall() == TRUE) diff --git a/src/field_specials.c b/src/field_specials.c index b84e4dde9..f03ccc9d7 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1427,7 +1427,9 @@ bool8 Special_AreLeadMonEVsMaxedOut(void) u8 TryUpdateRusturfTunnelState(void) { - if (!FlagGet(FLAG_RUSTURF_TUNNEL_OPENED) && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(RUSTURF_TUNNEL) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(RUSTURF_TUNNEL)) + if (!FlagGet(FLAG_RUSTURF_TUNNEL_OPENED) + && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(RUSTURF_TUNNEL) + && gSaveBlock1Ptr->location.mapNum == MAP_NUM(RUSTURF_TUNNEL)) { if (FlagGet(FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1)) { diff --git a/src/graphics.c b/src/graphics.c index 06bfeed17..17d9a03cb 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -960,7 +960,7 @@ const u32 gUnknown_08D778F0[] = INCBIN_U32("graphics/battle_transitions/vs_frame const u32 gUnknown_08D779D8[] = INCBIN_U32("graphics/battle_transitions/vs_frame.bin.lz"); const u32 gUnknown_08D77AE4[] = INCBIN_U32("graphics/battle_transitions/vs_frame.gbapal.lz"); -const u32 gUnknown_08D77B0C[] = INCBIN_U32("graphics/battle_transitions/vs.4bpp.lz"); +const u32 gVsLettersGfx[] = INCBIN_U32("graphics/battle_transitions/vs.4bpp.lz"); #include "data/graphics/battle_terrain.h" @@ -987,7 +987,7 @@ const u32 gUnknown_08D854C8[] = INCBIN_U32("graphics/battle_frontier/options_pal const u32 gBattleArenaJudgementSymbolsGfx[] = INCBIN_U32("graphics/battle_frontier/arena_judgement_symbols.4bpp.lz"); const u32 gBattleArenaJudgementSymbolsPalette[] = INCBIN_U32("graphics/battle_frontier/arena_judgement_symbols.gbapal.lz"); -const u32 gUnknown_08D85600[] = INCBIN_U32("graphics/battle_frontier/text.gbapal.lz"); +const u32 gBattleWindowTextPalette[] = INCBIN_U32("graphics/battle_interface/text.gbapal.lz"); const u16 gUnknown_08D85620[] = INCBIN_U16("graphics/battle_frontier/text_pp.gbapal"); const u16 gTilesetAnims_BattleDomePals0_0[] = INCBIN_U16("graphics/battle_frontier/dome_anim1.gbapal"); diff --git a/src/save_location.c b/src/save_location.c index b31d1ac9e..62f574300 100644 --- a/src/save_location.c +++ b/src/save_location.c @@ -133,5 +133,5 @@ void sub_81AFDA0(void) void SetChampionSaveWarp(void) { - gSaveBlock2Ptr->specialSaveWarpFlags |= 0x80; + gSaveBlock2Ptr->specialSaveWarpFlags |= CHAMPION_SAVEWARP; } diff --git a/src/union_room.c b/src/union_room.c index 5952b03eb..d22373ea0 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -30,6 +30,7 @@ #include "party_menu.h" #include "pokemon_jump.h" #include "random.h" +#include "save_location.h" #include "script.h" #include "script_pokemon_util_80F87D8.h" #include "sound.h" @@ -1078,7 +1079,7 @@ u32 sub_8013B8C(struct UnkStruct_Group *arg0, s32 id) if (gUnknown_02022C2C == 4 && structPtr->unk.field_0.unk_00.unk_01_2 != 3) { - if (!(gSaveBlock2Ptr->specialSaveWarpFlags & 0x80)) + if (!(gSaveBlock2Ptr->specialSaveWarpFlags & CHAMPION_SAVEWARP)) return 1; else if (structPtr->unk.field_0.unk_00.isChampion) return 0; |