Mt Moon Square House

This adds the Mt Moon Square House, faithfully recreated from GSC. I haven't yet sorted out the important details regarding the Crater Guard and such, though.

Making the map involved making a new desk tile and making house tile $36 be considered a counter tile. Hopefully there aren't any adverse consequences but I've never seen anything of that nature.

I noticed there are a ton of Clefairy text bits, so I refactored it to be a single line farcalled from `text_7.asm`. This also involved an interesting thing with the Pokemon Fan Club where the Pikachu fan has a Clefairy, so I fixed that too.

I figured that adding the dance was a little difficult right now, so we have Clefairys walking around instead.

I haven't figured out a good place to add the ladders yet (since there should be two entrances) but we'll figure that out eventually. It's plausible that we just make the Crater the southern warp, but I like how out-of-the-way the current one is.

Oh, and I fixed the Crater warps.

Overall, functional, but not finished.
This commit is contained in:
Llinos Evans 2023-05-18 16:08:42 +01:00
parent 9576b04563
commit 0668db0ef0
25 changed files with 83 additions and 28 deletions

View file

@ -23,7 +23,7 @@ CeladonMansion1Text2:
text_end
CeladonMansion1Text3:
text_far _CeladonMansion1Text3
text_far _ClefairyText
text_asm
ld a, CLEFAIRY
jp CeladonMansion1_PlayCryScript

View file

@ -20,13 +20,12 @@ CitrineMartText3:
jp TextScriptEnd
CitrineMartText4:
text_far _CitrineMartText4
text_far _ClefairyText
text_asm
ld a, CLEFAIRY
call PlayCry
call WaitForSoundToFinish
jp TextScriptEnd
; I do want to make a "steroid" item that fixes DVs.
CitrineCashierText::
script_mart ULTRA_BALL, FULL_RESTORE, MAX_REPEL, MAX_REVIVE, ESCAPE_ROPE, HP_UP, PROTEIN, IRON, CARBOS, CALCIUM

View file

@ -15,7 +15,7 @@ CopycatsHouse1FText2:
text_end
CopycatsHouse1FText3:
text_far _CopycatsHouse1FText3
text_far _NurseChanseyText
text_asm
ld a, CHANSEY
call PlayCry

View file

@ -2,8 +2,16 @@ MtMoonSquare_Script:
jp EnableAutoTextBoxDrawing
MtMoonSquare_TextPointers:
dw MtMoonSquareClefairy
dw MtMoonSquareSign
MtMoonSquareClefairy:
text_far _ClefairyText
text_asm
ld a, CLEFAIRY
call PlayCry
jp TextScriptEnd
MtMoonSquareSign:
text "MT MOON SQUARE"
line "Please don't"

View file

@ -0,0 +1,16 @@
MtMoonSquareHouse_Script:
jp EnableAutoTextBoxDrawing
MtMoonSquareHouse_TextPointers:
dw MtMoonSquareHouseGirl
dw MtMoonSquareHouseMart
MtMoonSquareHouseGirl:
text "When the sun goes"
line "down, CLEFAIRY"
cont "come out to play."
done
MtMoonSquareHouseMart::
script_mart FRESH_WATER, SODA_POP, LEMONADE, REPEL, POKE_DOLL