From 7708f924f243ddb07584c40d0c049a41ee8d916b Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Thu, 22 Aug 2019 20:28:40 -0400 Subject: [PATCH 1/6] LakeOfRage.asm: Rename MovementData --- maps/LakeOfRage.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index 97a7fd855..84e34d478 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -56,7 +56,7 @@ LakeOfRageLanceScript: waitbutton closetext playsound SFX_WARP_TO - applymovement LAKEOFRAGE_LANCE, MovementData_0x70155 + applymovement LAKEOFRAGE_LANCE, LakeOfRageLanceTeleportIntoSkyMovement disappear LAKEOFRAGE_LANCE clearevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE setevent EVENT_DECIDED_TO_HELP_LANCE @@ -238,7 +238,7 @@ LakeOfRageHiddenRareCandy: LakeOfRageHiddenMaxPotion: hiddenitem MAX_POTION, EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION -MovementData_0x70155: +LakeOfRageLanceTeleportIntoSkyMovement: teleport_from step_end From 5c2165592cc170231f0f3d48a5741df2a3501b82 Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Thu, 22 Aug 2019 20:37:12 -0400 Subject: [PATCH 2/6] MahoganyMart1F.asm: Rename MovementData --- maps/MahoganyMart1F.asm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index cd517f930..4d80831e1 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -67,20 +67,20 @@ MahoganyMart1FLanceUncoversStaircaseScript: pause 15 closetext playsound SFX_TACKLE - applymovement MAHOGANYMART1F_DRAGON, MovementData_0x6c3f6 - applymovement MAHOGANYMART1F_BLACK_BELT, MovementData_0x6c3fb + applymovement MAHOGANYMART1F_DRAGON, MahoganyMart1FDragoniteTackleMovement + applymovement MAHOGANYMART1F_BLACK_BELT, MahoganyMart1FBlackBeltKnockedBackMovement pause 15 disappear MAHOGANYMART1F_DRAGON pause 15 - applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c407 + applymovement MAHOGANYMART1F_LANCE, MahoganyMart1FLanceApproachPlayerMovement opentext writetext MahoganyMart1FLanceRadioText waitbutton closetext follow MAHOGANYMART1F_LANCE, PLAYER - applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c40a - applymovement MAHOGANYMART1F_PHARMACIST, MovementData_0x6c403 - applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c40e + applymovement MAHOGANYMART1F_LANCE, MahoganyMart1FLanceApproachPharmacistMovement + applymovement MAHOGANYMART1F_PHARMACIST, MahoganyMart1FPharmacistShovedAsideMovement + applymovement MAHOGANYMART1F_LANCE, MahoganyMart1FLanceApproachHiddenStairsMovement stopfollow opentext writetext MahoganyMart1FLanceStairsText @@ -96,7 +96,7 @@ MahoganyMart1FLanceUncoversStaircaseScript: writetext MahoganyMart1FLanceSplitUpText waitbutton closetext - applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c412 + applymovement MAHOGANYMART1F_LANCE, MahoganyMart1FLanceGoDownStairsMovement playsound SFX_EXIT_BUILDING disappear MAHOGANYMART1F_LANCE setscene SCENE_MAHOGANYMART1F_NOTHING @@ -110,14 +110,14 @@ MahogayMart1FGrannyScript: closetext end -MovementData_0x6c3f6: +MahoganyMart1FDragoniteTackleMovement: fix_facing big_step LEFT big_step RIGHT remove_fixed_facing step_end -MovementData_0x6c3fb: +MahoganyMart1FBlackBeltKnockedBackMovement: fix_facing big_step LEFT remove_fixed_facing @@ -127,30 +127,30 @@ MovementData_0x6c3fb: turn_head RIGHT step_end -MovementData_0x6c403: +MahoganyMart1FPharmacistShovedAsideMovement: fix_facing big_step LEFT remove_fixed_facing step_end -MovementData_0x6c407: +MahoganyMart1FLanceApproachPlayerMovement: slow_step LEFT turn_head DOWN step_end -MovementData_0x6c40a: +MahoganyMart1FLanceApproachPharmacistMovement: slow_step RIGHT slow_step UP slow_step UP step_end -MovementData_0x6c40e: +MahoganyMart1FLanceApproachHiddenStairsMovement: slow_step UP slow_step RIGHT slow_step RIGHT step_end -MovementData_0x6c412: +MahoganyMart1FLanceGoDownStairsMovement: slow_step RIGHT step_end From 4feaa5afbd06f12349f65ec2701fb4966bb222f2 Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Thu, 22 Aug 2019 20:39:23 -0400 Subject: [PATCH 3/6] MahoganyMart1F.asm: Typo: "Mahogay" --> "Mahogany" --- maps/MahoganyMart1F.asm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 4d80831e1..6ee50dd7c 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -29,7 +29,7 @@ MahoganyMart1F_MapScripts: changeblock 6, 2, $1e ; stairs return -MahogayMart1FPharmacistScript: +MahoganyMart1FPharmacistScript: faceplayer opentext checkevent EVENT_DECIDED_TO_HELP_LANCE @@ -39,23 +39,23 @@ MahogayMart1FPharmacistScript: end .LanceEntered: - writetext MahogayMart1FPharmacistText_LanceEntered + writetext MahoganyMart1FPharmacistText_LanceEntered waitbutton closetext end -MahogayMart1FBlackBeltScript: +MahoganyMart1FBlackBeltScript: faceplayer opentext checkevent EVENT_DECIDED_TO_HELP_LANCE iftrue .LanceEntered - writetext MahogayMart1FBlackBeltText + writetext MahoganyMart1FBlackBeltText waitbutton closetext end .LanceEntered: - writetext MahogayMart1FBlackBeltText_LanceEntered + writetext MahoganyMart1FBlackBeltText_LanceEntered waitbutton closetext end @@ -103,7 +103,7 @@ MahoganyMart1FLanceUncoversStaircaseScript: waitsfx end -MahogayMart1FGrannyScript: +MahoganyMart1FGrannyScript: faceplayer opentext pokemart MARTTYPE_STANDARD, MART_MAHOGANY_2 @@ -164,13 +164,13 @@ UnknownText_0x6c414: line "eat in MAHOGANY!" done -MahogayMart1FPharmacistText_LanceEntered: +MahoganyMart1FPharmacistText_LanceEntered: text "Arrgh… You found" line "the secret stair-" cont "way…" done -MahogayMart1FBlackBeltText: +MahoganyMart1FBlackBeltText: text "Heheh! The experi-" line "ment worked like a" cont "charm." @@ -182,7 +182,7 @@ MahogayMart1FBlackBeltText: line "moneymakers." done -MahogayMart1FBlackBeltText_LanceEntered: +MahoganyMart1FBlackBeltText_LanceEntered: text "Urrgh…" para "That guy's dragon" @@ -231,8 +231,8 @@ MahoganyMart1F_MapEvents: db 0 ; bg events db 5 ; object events - object_event 4, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahogayMart1FPharmacistScript, EVENT_TEAM_ROCKET_BASE_POPULATION - object_event 1, 6, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahogayMart1FBlackBeltScript, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event 4, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyMart1FPharmacistScript, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event 1, 6, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyMart1FBlackBeltScript, EVENT_TEAM_ROCKET_BASE_POPULATION object_event 4, 6, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE object_event 3, 6, SPRITE_DRAGON, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE - object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahogayMart1FGrannyScript, EVENT_MAHOGANY_MART_OWNERS + object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyMart1FGrannyScript, EVENT_MAHOGANY_MART_OWNERS From b10aa879e9ec1622b39e38bafe64b4558425418a Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Thu, 22 Aug 2019 20:42:17 -0400 Subject: [PATCH 4/6] MahoganyMart1F.asm: Rename an NPC constant "MAHOGANYMART1F_DRAGON" --> "MAHOGANYMART1F_DRAGONITE" --- maps/MahoganyMart1F.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 6ee50dd7c..5fcc85f21 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -2,7 +2,7 @@ const MAHOGANYMART1F_PHARMACIST const MAHOGANYMART1F_BLACK_BELT const MAHOGANYMART1F_LANCE - const MAHOGANYMART1F_DRAGON + const MAHOGANYMART1F_DRAGONITE const MAHOGANYMART1F_GRANNY MahoganyMart1F_MapScripts: @@ -67,10 +67,10 @@ MahoganyMart1FLanceUncoversStaircaseScript: pause 15 closetext playsound SFX_TACKLE - applymovement MAHOGANYMART1F_DRAGON, MahoganyMart1FDragoniteTackleMovement + applymovement MAHOGANYMART1F_DRAGONITE, MahoganyMart1FDragoniteTackleMovement applymovement MAHOGANYMART1F_BLACK_BELT, MahoganyMart1FBlackBeltKnockedBackMovement pause 15 - disappear MAHOGANYMART1F_DRAGON + disappear MAHOGANYMART1F_DRAGONITE pause 15 applymovement MAHOGANYMART1F_LANCE, MahoganyMart1FLanceApproachPlayerMovement opentext From b907eeeab0bfec7796ffa246a9984903d1bbaab4 Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Thu, 22 Aug 2019 20:48:32 -0400 Subject: [PATCH 5/6] MountMortarB1F.asm: Rename an NPC constant "MOUNTMORTARB1F_BLACK_BELT" --> "MOUNTMORTARB1F_KIYO" --- maps/MountMortarB1F.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 7cf4f6ce0..e0ff14831 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -2,7 +2,7 @@ const MOUNTMORTARB1F_POKE_BALL1 const MOUNTMORTARB1F_POKE_BALL2 const MOUNTMORTARB1F_BOULDER - const MOUNTMORTARB1F_BLACK_BELT + const MOUNTMORTARB1F_KIYO const MOUNTMORTARB1F_POKE_BALL3 const MOUNTMORTARB1F_POKE_BALL4 const MOUNTMORTARB1F_POKE_BALL5 From 3234cb1117db197f29443ee797e3eddb7a12293f Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Thu, 22 Aug 2019 20:54:45 -0400 Subject: [PATCH 6/6] VioletPokecenter1F.asm: Rename an NPC constant "VIOLETPOKECENTER1F_SCIENTIST" --> "VIOLETPOKECENTER1F_ELMS_AIDE" --- maps/VioletPokecenter1F.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm index 67d7d17ec..4558a4b47 100644 --- a/maps/VioletPokecenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -3,7 +3,7 @@ const VIOLETPOKECENTER1F_GAMEBOY_KID const VIOLETPOKECENTER1F_GENTLEMAN const VIOLETPOKECENTER1F_YOUNGSTER - const VIOLETPOKECENTER1F_SCIENTIST + const VIOLETPOKECENTER1F_ELMS_AIDE VioletPokecenter1F_MapScripts: db 0 ; scene scripts @@ -37,18 +37,18 @@ VioletPokecenter1F_ElmsAideScript: readvar VAR_FACING ifequal UP, .AideWalksAroundPlayer turnobject PLAYER, DOWN - applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideWalksStraightOutOfPokecenter + applymovement VIOLETPOKECENTER1F_ELMS_AIDE, MovementData_AideWalksStraightOutOfPokecenter playsound SFX_EXIT_BUILDING - disappear VIOLETPOKECENTER1F_SCIENTIST + disappear VIOLETPOKECENTER1F_ELMS_AIDE waitsfx end .AideWalksAroundPlayer: - applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideWalksLeftToExitPokecenter + applymovement VIOLETPOKECENTER1F_ELMS_AIDE, MovementData_AideWalksLeftToExitPokecenter turnobject PLAYER, DOWN - applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideFinishesLeavingPokecenter + applymovement VIOLETPOKECENTER1F_ELMS_AIDE, MovementData_AideFinishesLeavingPokecenter playsound SFX_EXIT_BUILDING - disappear VIOLETPOKECENTER1F_SCIENTIST + disappear VIOLETPOKECENTER1F_ELMS_AIDE waitsfx end