Populate Citrine City

This commit adds NPCs and signs to Citrine, doing some significant worldbuilding in the process. I considered adding an event where Oak greets you like how the Magma/Aqua Admins do on the ORAS Battle Resort, but it seemed a little too on-the-nose, y'know?

There was an issue where you wouldn't be walked out of doors automatically, which was quite immersion-breaking. That was because the door tile IDs weren't defined - this is fixed too.

Some map elements have been altered to facilitate the new changes, and obviously, some map sprite slots have been filled.

Importing and changing the Battle Tent is most likely my next task.
This commit is contained in:
Llinos Evans 2023-05-12 22:30:51 +01:00
parent 2ec8bab272
commit 3b16404a50
11 changed files with 178 additions and 36 deletions

View file

@ -2,5 +2,59 @@ CitrineCity_Script:
jp EnableAutoTextBoxDrawing
CitrineCity_TextPointers:
dw CitrineCityText1
dw CitrineCityText2
dw CitrineCityText3
dw CitrineCityText4
dw CitrineShopSignText
dw PokeCenterSignText
dw CitrineCityBillboard1
dw CitrineCityBillboard2
dw CitrineCityTower
dw CitrineCitySignText
dw CitrineCityDirections
dw CitrineCityCavern
text_end ; unused
CitrineCityText1:
text_far _CitrineCityText1
text_end
CitrineCityText2:
text_far _CitrineCityText2
text_end
CitrineCityText3:
text_far _CitrineCityText3
text_end
CitrineCityText4:
text_far _CitrineCityText4
text_end
CitrineShopSignText:
text_far _CitrineShopSignText
text_end
CitrineCityBillboard1:
text_far _CitrineCityBillboard1
text_end
CitrineCityBillboard2:
text_far _CitrineCityBillboard2
text_end
CitrineCityTower:
text_far _CitrineCityTower
text_end
CitrineCitySignText:
text_far _CitrineCitySignText
text_end
CitrineCityDirections:
text_far _CitrineCityDirections
text_end
CitrineCityCavern:
text_far _CitrineCityCavern
text_end

View file

@ -51,9 +51,9 @@ JamesText:
ld a, [wCurrentMenuItem]
and a
jr nz, .refused
; Proceed from here as if Yes is stated.
; Proceed from here as Yes is stated.
; Here, the menu should pop up and the player picks a Pokemon to juice.
; Here, the party menu pops up and the player picks a Pokemon to juice.
xor a
ld [wUpdateSpritesEnabled], a
ld [wPartyMenuTypeOrMessageID], a