Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Suggested changes #843

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open

Suggested changes #843

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
d2b8d3f
Update SoulHouse.asm
rjd1922 Apr 7, 2023
4af15c5
Update SoulHouseB3F.asm
rjd1922 Apr 7, 2023
5ed1c79
Update descriptions.asm
rjd1922 Apr 7, 2023
1441f0f
Update CherrygrovePokeCenter1F.asm
rjd1922 Apr 7, 2023
ad2d4d6
Update names.asm
rjd1922 Apr 7, 2023
0b05bd8
Delete back.png
rjd1922 Apr 13, 2023
9b6a89e
Add files via upload
rjd1922 Apr 13, 2023
b183412
Delete front.png
rjd1922 Apr 13, 2023
42085da
Add files via upload
rjd1922 Apr 13, 2023
ddac593
Update FEATURES.md
rjd1922 May 4, 2023
d34030f
Update 009.asm
rjd1922 May 19, 2023
9f84772
Update 009.asm
rjd1922 May 25, 2023
1be28bd
Update wooper.asm
rjd1922 Sep 1, 2023
89c9f3c
Merge branch 'Rangi42:master' into master
rjd1922 Sep 4, 2023
8ab1840
Update staryu.asm
rjd1922 Oct 6, 2023
98452c5
Merge branch 'Rangi42:master' into master
rjd1922 Oct 6, 2023
c51977d
Update starmie.asm
rjd1922 Dec 2, 2023
1a1fbca
Update gastly.asm
rjd1922 Dec 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions data/items/names.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ endc
li "Smoke Ball"
li "Berserk Gene"
li "Light Ball"
li "Stick"
li "Leek"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will need rearranging alphabetically, and renaming the constants+labels.

li "Thick Club"
li "Lucky Punch"
li "Metal Powder"
Expand Down Expand Up @@ -226,7 +226,7 @@ endc
li "Power Band"
li "Power Anklet"
li "Dragon Scale"
li "Up-Grade"
li "Upgrade"
li "Dubious Disc"
li "Protector"
li "Electirizer"
Expand Down
3 changes: 3 additions & 0 deletions data/moves/descriptions.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,9 @@ WillOWispDescription:

StunSporeDescription:
ThunderWaveDescription:
db "A move that"
next "paralyzes the foe.@"

GlareDescription:
db "A move that may"
next "paralyze the foe.@"
Expand Down
12 changes: 6 additions & 6 deletions maps/CherrygrovePokeCenter1F.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,18 @@ CherrygrovePokeCenter1FTeacherScript:
iftrue_jumptextfaceplayer .Text2
jumpthistextfaceplayer

text "The Communication"
line "Center upstairs"
cont "was just built."
text "The Cable Club"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

HGSS also calls it the Communication Center.

line "upstairs was"
cont "just built."

para "But they're still"
line "finishing it up."
done

.Text2:
text "The Communication"
line "Center upstairs"
cont "was just built."
text "The Cable Club"
line "upstairs was"
cont "just built."

para "I traded #mon"
line "there already!"
Expand Down
2 changes: 1 addition & 1 deletion maps/SoulHouse.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ SoulHouse_MapScriptHeader:

def_object_events
object_event 9, 7, SPRITE_AGATHA, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AgathaScript, -1
object_event 4, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_COMMAND, jumptextfaceplayer, MrFujiText, -1 ; TODO: EVENT_SOUL_HOUSE_MR_FUJI
object_event 4, 2, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_COMMAND, jumptextfaceplayer, MrFujiText, -1 ; TODO: EVENT_SOUL_HOUSE_MR_FUJI
itsdarsh marked this conversation as resolved.
Show resolved Hide resolved
object_event 7, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_COMMAND, jumptextfaceplayer, SoulHouseTeacherText, -1
object_event 2, 7, SPRITE_CUTE_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_COMMAND, jumptextfaceplayer, SoulHouseLassText, -1
object_event 1, 5, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_COMMAND, jumptextfaceplayer, SoulHouseGrannyText, -1
Expand Down
2 changes: 1 addition & 1 deletion maps/SoulHouseB3F.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ SoulHouseB3F_MapScriptHeader:
def_bg_events

def_object_events
object_event 4, 13, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseB3FMrFujiScript, EVENT_GOT_SILPHSCOPE2_FROM_MR_FUJI
object_event 4, 13, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseB3FMrFujiScript, EVENT_GOT_SILPHSCOPE2_FROM_MR_FUJI
itemball_event 6, 9, ESCAPE_ROPE, 1, EVENT_SOUL_HOUSE_B3F_ESCAPE_ROPE

object_const_def
Expand Down