Clean up script labels in marts and Pokémon Centers.

This commit is contained in:
IIMarckus 2016-04-08 19:04:36 -06:00
parent 72790bcbac
commit adc6a3aac7
55 changed files with 322 additions and 352 deletions

View file

@ -3,16 +3,16 @@
; first byte $FE, next byte # of items, last byte $FF ; first byte $FE, next byte # of items, last byte $FF
; Viridian ; Viridian
ViridianMartText6:: ; 2442 (0:2442) ViridianCashierText::
db $FE,4,POKE_BALL,ANTIDOTE,PARLYZ_HEAL,BURN_HEAL,$FF db $FE,4,POKE_BALL,ANTIDOTE,PARLYZ_HEAL,BURN_HEAL,$FF
; Pewter ; Pewter
PewterMartText1:: ; 2449 (0:2449) PewterCashierText::
db $FE,7,POKE_BALL,POTION,ESCAPE_ROPE,ANTIDOTE,BURN_HEAL,AWAKENING db $FE,7,POKE_BALL,POTION,ESCAPE_ROPE,ANTIDOTE,BURN_HEAL,AWAKENING
db PARLYZ_HEAL,$FF db PARLYZ_HEAL,$FF
; Cerulean ; Cerulean
CeruleanMartText1:: ; 2453 (0:2453) CeruleanCashierText::
db $FE,7,POKE_BALL,POTION,REPEL,ANTIDOTE,BURN_HEAL,AWAKENING db $FE,7,POKE_BALL,POTION,REPEL,ANTIDOTE,BURN_HEAL,AWAKENING
db PARLYZ_HEAL,$FF db PARLYZ_HEAL,$FF
@ -20,56 +20,56 @@ CeruleanMartText1:: ; 2453 (0:2453)
db $FE,1,BICYCLE,$FF db $FE,1,BICYCLE,$FF
; Vermilion ; Vermilion
VermilionMartText1:: ; 2461 (0:2461) VermilionCashierText::
db $FE,6,POKE_BALL,SUPER_POTION,ICE_HEAL,AWAKENING,PARLYZ_HEAL db $FE,6,POKE_BALL,SUPER_POTION,ICE_HEAL,AWAKENING,PARLYZ_HEAL
db REPEL,$FF db REPEL,$FF
; Lavender ; Lavender
LavenderMartText1:: ; 246a (0:246a) LavenderCashierText::
db $FE,9,GREAT_BALL,SUPER_POTION,REVIVE,ESCAPE_ROPE,SUPER_REPEL db $FE,9,GREAT_BALL,SUPER_POTION,REVIVE,ESCAPE_ROPE,SUPER_REPEL
db ANTIDOTE,BURN_HEAL,ICE_HEAL,PARLYZ_HEAL,$FF db ANTIDOTE,BURN_HEAL,ICE_HEAL,PARLYZ_HEAL,$FF
; Celadon Dept. Store 2F (1) ; Celadon Dept. Store 2F (1)
CeladonMart2Text1:: ; 2476 (0:2476) CeladonMart2Clerk1Text::
db $FE,9,GREAT_BALL,SUPER_POTION,REVIVE,SUPER_REPEL,ANTIDOTE db $FE,9,GREAT_BALL,SUPER_POTION,REVIVE,SUPER_REPEL,ANTIDOTE
db BURN_HEAL,ICE_HEAL,AWAKENING,PARLYZ_HEAL,$FF db BURN_HEAL,ICE_HEAL,AWAKENING,PARLYZ_HEAL,$FF
; Celadon Dept. Store 2F (2) ; Celadon Dept. Store 2F (2)
CeladonMart2Text2:: ; 2482 (0:2482) CeladonMart2Clerk2Text::
db $FE,9,TM_32,TM_33,TM_02,TM_07,TM_37,TM_01,TM_05,TM_09,TM_17,$FF db $FE,9,TM_32,TM_33,TM_02,TM_07,TM_37,TM_01,TM_05,TM_09,TM_17,$FF
; Celadon Dept. Store 4F ; Celadon Dept. Store 4F
CeladonMart4Text1:: ; 248e (0:248e) CeladonMart4ClerkText::
db $FE,5,POKE_DOLL,FIRE_STONE,THUNDER_STONE,WATER_STONE,LEAF_STONE,$FF db $FE,5,POKE_DOLL,FIRE_STONE,THUNDER_STONE,WATER_STONE,LEAF_STONE,$FF
; Celadon Dept. Store 5F (1) ; Celadon Dept. Store 5F (1)
CeladonMart5Text3:: ; 2496 (0:2496) CeladonMart5Clerk1Text::
db $FE,7,X_ACCURACY,GUARD_SPEC,DIRE_HIT,X_ATTACK,X_DEFEND,X_SPEED db $FE,7,X_ACCURACY,GUARD_SPEC,DIRE_HIT,X_ATTACK,X_DEFEND,X_SPEED
db X_SPECIAL,$FF db X_SPECIAL,$FF
; Celadon Dept. Store 5F (2) ; Celadon Dept. Store 5F (2)
CeladonMart5Text4:: ; 24a0 (0:24a0) CeladonMart5Clerk2Text::
db $FE,5,HP_UP,PROTEIN,IRON,CARBOS,CALCIUM,$FF db $FE,5,HP_UP,PROTEIN,IRON,CARBOS,CALCIUM,$FF
; Fuchsia ; Fuchsia
FuchsiaMartText1:: ; 24a8 (0:24a8) FuchsiaCashierText::
db $FE,6,ULTRA_BALL,GREAT_BALL,SUPER_POTION,REVIVE,FULL_HEAL db $FE,6,ULTRA_BALL,GREAT_BALL,SUPER_POTION,REVIVE,FULL_HEAL
db SUPER_REPEL,$FF db SUPER_REPEL,$FF
; unused? 24b1 ; unused?
db $FE,5,GREAT_BALL,HYPER_POTION,SUPER_POTION,FULL_HEAL,REVIVE,$FF db $FE,5,GREAT_BALL,HYPER_POTION,SUPER_POTION,FULL_HEAL,REVIVE,$FF
; Cinnabar ; Cinnabar
CinnabarMartText1:: ; 24b9 (0:24b9) CinnabarCashierText::
db $FE,7,ULTRA_BALL,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE db $FE,7,ULTRA_BALL,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE
db FULL_HEAL,REVIVE,$FF db FULL_HEAL,REVIVE,$FF
; Saffron ; Saffron
SaffronMartText1:: ; 24c3 (0:24c3) SaffronCashierText::
db $FE,6,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE,FULL_HEAL db $FE,6,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE,FULL_HEAL
db REVIVE,$FF db REVIVE,$FF
; Indigo ; Indigo
IndigoPlateauLobbyText4:: ; 24cc (0:24cc) IndigoCashierText::
db $FE,7,ULTRA_BALL,GREAT_BALL,FULL_RESTORE,MAX_POTION,FULL_HEAL db $FE,7,ULTRA_BALL,GREAT_BALL,FULL_RESTORE,MAX_POTION,FULL_HEAL
db REVIVE,MAX_REPEL,$FF db REVIVE,MAX_REPEL,$FF

View file

@ -1,19 +1,19 @@
CeladonMart1Script: ; 60f86 (18:4f86) CeladonMart1Script:
jp EnableAutoTextBoxDrawing jp EnableAutoTextBoxDrawing
CeladonMart1TextPointers: ; 60f89 (18:4f89) CeladonMart1TextPointers:
dw CeladonMart1Text1 dw CeladonMart1Text1
dw CeladonMart1Text2 dw CeladonMart1Text2
dw CeladonMart1Text3 dw CeladonMart1Text3
CeladonMart1Text1: ; 60f8f (18:4f8f) CeladonMart1Text1:
TX_FAR _CeladonMart1Text1 TX_FAR _CeladonMart1Text1
db "@" db "@"
CeladonMart1Text2: ; 60f94 (18:4f94) CeladonMart1Text2:
TX_FAR _CeladonMart1Text2 TX_FAR _CeladonMart1Text2
db "@" db "@"
CeladonMart1Text3: ; 60f99 (18:4f99) CeladonMart1Text3:
TX_FAR _CeladonMart1Text3 TX_FAR _CeladonMart1Text3
db "@" db "@"

View file

@ -1,21 +1,21 @@
CeladonMart2Script: ; 560f5 (15:60f5) CeladonMart2Script:
jp EnableAutoTextBoxDrawing jp EnableAutoTextBoxDrawing
CeladonMart2TextPointers: ; 560f8 (15:60f8) CeladonMart2TextPointers:
dw CeladonMart2Text1 dw CeladonMart2Clerk1Text
dw CeladonMart2Text2 dw CeladonMart2Clerk2Text
dw CeladonMart2Text3 dw CeladonMart2Text3
dw CeladonMart2Text4 dw CeladonMart2Text4
dw CeladonMart2Text5 dw CeladonMart2Text5
CeladonMart2Text3: ; 56102 (15:6102) CeladonMart2Text3:
TX_FAR _CeladonMart2Text3 TX_FAR _CeladonMart2Text3
db "@" db "@"
CeladonMart2Text4: ; 56107 (15:6107) CeladonMart2Text4:
TX_FAR _CeladonMart2Text4 TX_FAR _CeladonMart2Text4
db "@" db "@"
CeladonMart2Text5: ; 5610c (15:610c) CeladonMart2Text5:
TX_FAR _CeladonMart2Text5 TX_FAR _CeladonMart2Text5
db "@" db "@"

View file

@ -1,7 +1,7 @@
CeladonMart3Script: ; 48225 (12:4225) CeladonMart3Script:
jp EnableAutoTextBoxDrawing jp EnableAutoTextBoxDrawing
CeladonMart3TextPointers: ; 48228 (12:4228) CeladonMart3TextPointers:
dw CeladonMart3Text1 dw CeladonMart3Text1
dw CeladonMart3Text2 dw CeladonMart3Text2
dw CeladonMart3Text3 dw CeladonMart3Text3
@ -20,7 +20,7 @@ CeladonMart3TextPointers: ; 48228 (12:4228)
dw CeladonMart3Text16 dw CeladonMart3Text16
dw CeladonMart3Text17 dw CeladonMart3Text17
CeladonMart3Text1: ; 4824a (12:424a) CeladonMart3Text1:
TX_ASM TX_ASM
CheckEvent EVENT_GOT_TM18 CheckEvent EVENT_GOT_TM18
jr nz, .asm_a5463 jr nz, .asm_a5463
@ -41,67 +41,67 @@ CeladonMart3Text1: ; 4824a (12:424a)
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
TM18PreReceiveText: ; 48278 (12:4278) TM18PreReceiveText:
TX_FAR _TM18PreReceiveText TX_FAR _TM18PreReceiveText
db "@" db "@"
ReceivedTM18Text: ; 4827d (12:427d) ReceivedTM18Text:
TX_FAR _ReceivedTM18Text TX_FAR _ReceivedTM18Text
db $0B, "@" db $0B, "@"
TM18ExplanationText: ; 48283 (12:4283) TM18ExplanationText:
TX_FAR _TM18ExplanationText TX_FAR _TM18ExplanationText
db "@" db "@"
TM18NoRoomText: ; 48288 (12:4288) TM18NoRoomText:
TX_FAR _TM18NoRoomText TX_FAR _TM18NoRoomText
db "@" db "@"
CeladonMart3Text2: ; 4828d (12:428d) CeladonMart3Text2:
TX_FAR _CeladonMart3Text2 TX_FAR _CeladonMart3Text2
db "@" db "@"
CeladonMart3Text3: ; 48292 (12:4292) CeladonMart3Text3:
TX_FAR _CeladonMart3Text3 TX_FAR _CeladonMart3Text3
db "@" db "@"
CeladonMart3Text4: ; 48297 (12:4297) CeladonMart3Text4:
TX_FAR _CeladonMart3Text4 TX_FAR _CeladonMart3Text4
db "@" db "@"
CeladonMart3Text5: ; 4829c (12:429c) CeladonMart3Text5:
TX_FAR _CeladonMart3Text5 TX_FAR _CeladonMart3Text5
db "@" db "@"
CeladonMart3Text12 CeladonMart3Text12
CeladonMart3Text10: ; 482a1 (12:42a1) CeladonMart3Text10:
CeladonMart3Text8: ; 482a1 (12:42a1) CeladonMart3Text8:
CeladonMart3Text6: ; 482a1 (12:42a1) CeladonMart3Text6:
TX_FAR _CeladonMart3Text6 TX_FAR _CeladonMart3Text6
db "@" db "@"
CeladonMart3Text7: ; 482a6 (12:42a6) CeladonMart3Text7:
TX_FAR _CeladonMart3Text7 TX_FAR _CeladonMart3Text7
db "@" db "@"
CeladonMart3Text9: ; 482ab (12:42ab) CeladonMart3Text9:
TX_FAR _CeladonMart3Text9 TX_FAR _CeladonMart3Text9
db "@" db "@"
CeladonMart3Text11: ; 482b0 (12:42b0) CeladonMart3Text11:
TX_FAR _CeladonMart3Text11 TX_FAR _CeladonMart3Text11
db "@" db "@"
CeladonMart3Text13: ; 482b5 (12:42b5) CeladonMart3Text13:
TX_FAR _CeladonMart3Text13 TX_FAR _CeladonMart3Text13
db "@" db "@"
CeladonMart3Text14: ; 482ba (12:42ba) CeladonMart3Text14:
TX_FAR _CeladonMart3Text14 TX_FAR _CeladonMart3Text14
db "@" db "@"
CeladonMart3Text17: ; 482bf (12:42bf) CeladonMart3Text17:
CeladonMart3Text16: ; 482bf (12:42bf) CeladonMart3Text16:
CeladonMart3Text15: ; 482bf (12:42bf) CeladonMart3Text15:
TX_FAR _CeladonMart3Text15 TX_FAR _CeladonMart3Text15
db "@" db "@"

View file

@ -1,20 +1,20 @@
CeladonMart4Script: ; 48356 (12:4356) CeladonMart4Script:
jp EnableAutoTextBoxDrawing jp EnableAutoTextBoxDrawing
CeladonMart4TextPointers: ; 48359 (12:4359) CeladonMart4TextPointers:
dw CeladonMart4Text1 dw CeladonMart4ClerkText
dw CeladonMart4Text2 dw CeladonMart4Text2
dw CeladonMart4Text3 dw CeladonMart4Text3
dw CeladonMart4Text4 dw CeladonMart4Text4
CeladonMart4Text2: ; 48361 (12:4361) CeladonMart4Text2:
TX_FAR _CeladonMart4Text2 TX_FAR _CeladonMart4Text2
db "@" db "@"
CeladonMart4Text3: ; 48366 (12:4366) CeladonMart4Text3:
TX_FAR _CeladonMart4Text3 TX_FAR _CeladonMart4Text3
db "@" db "@"
CeladonMart4Text4: ; 4836b (12:436b) CeladonMart4Text4:
TX_FAR _CeladonMart4Text4 TX_FAR _CeladonMart4Text4
db "@" db "@"

View file

@ -1,21 +1,21 @@
CeladonMart5Script: ; 49069 (12:5069) CeladonMart5Script:
jp EnableAutoTextBoxDrawing jp EnableAutoTextBoxDrawing
CeladonMart5TextPointers: ; 4906c (12:506c) CeladonMart5TextPointers:
dw CeladonMart5Text1 dw CeladonMart5Text1
dw CeladonMart5Text2 dw CeladonMart5Text2
dw CeladonMart5Text3 dw CeladonMart5Clerk1Text
dw CeladonMart5Text4 dw CeladonMart5Clerk2Text
dw CeladonMart5Text5 dw CeladonMart5Text5
CeladonMart5Text1: ; 49076 (12:5076) CeladonMart5Text1:
TX_FAR _CeladonMart5Text1 TX_FAR _CeladonMart5Text1
db "@" db "@"
CeladonMart5Text2: ; 4907b (12:507b) CeladonMart5Text2:
TX_FAR _CeladonMart5Text2 TX_FAR _CeladonMart5Text2
db "@" db "@"
CeladonMart5Text5: ; 49080 (12:5080) CeladonMart5Text5:
TX_FAR _CeladonMart5Text5 TX_FAR _CeladonMart5Text5
db "@" db "@"

View file

@ -1,4 +1,4 @@
CeladonMartElevatorScript: ; 48600 (12:4600) CeladonMartElevatorScript:
ld hl, wCurrentMapScriptFlags ld hl, wCurrentMapScriptFlags
bit 5, [hl] bit 5, [hl]
res 5, [hl] res 5, [hl]
@ -14,7 +14,7 @@ CeladonMartElevatorScript: ; 48600 (12:4600)
ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ret ret
CeladonMartElevatorScript_4861c: ; 4861c (12:461c) CeladonMartElevatorScript_4861c:
ld hl, wWarpEntries ld hl, wWarpEntries
ld a, [wWarpedFromWhichWarp] ld a, [wWarpedFromWhichWarp]
ld b, a ld b, a
@ -22,7 +22,7 @@ CeladonMartElevatorScript_4861c: ; 4861c (12:461c)
ld c, a ld c, a
call CeladonMartElevatorScript_4862a call CeladonMartElevatorScript_4862a
CeladonMartElevatorScript_4862a: ; 4862a (12:462a) CeladonMartElevatorScript_4862a:
inc hl inc hl
inc hl inc hl
ld a, b ld a, b
@ -31,24 +31,24 @@ CeladonMartElevatorScript_4862a: ; 4862a (12:462a)
ld [hli], a ld [hli], a
ret ret
CeladonMartElevatorScript_48631: ; 48631 (12:4631) CeladonMartElevatorScript_48631:
ld hl, CeladonMartElavatorFloors ld hl, CeladonMartElevatorFloors
call LoadItemList call LoadItemList
ld hl, CeldaonMartElevatorWarpMaps ld hl, CeladonMartElevatorWarpMaps
ld de, wElevatorWarpMaps ld de, wElevatorWarpMaps
ld bc, CeldaonMartElevatorWarpMapsEnd - CeldaonMartElevatorWarpMaps ld bc, CeladonMartElevatorWarpMapsEnd - CeladonMartElevatorWarpMaps
jp CopyData jp CopyData
CeladonMartElavatorFloors: ; 48643 (12:4643) CeladonMartElevatorFloors:
db $05 ; num elements in list db 5 ; number of elements in list
db FLOOR_1F db FLOOR_1F
db FLOOR_2F db FLOOR_2F
db FLOOR_3F db FLOOR_3F
db FLOOR_4F db FLOOR_4F
db FLOOR_5F db FLOOR_5F
db $FF ; terminator db $FF
CeldaonMartElevatorWarpMaps: ; 4864a (12:464a) CeladonMartElevatorWarpMaps:
; first byte is warp number ; first byte is warp number
; second byte is map number ; second byte is map number
; These specify where the player goes after getting out of the elevator. ; These specify where the player goes after getting out of the elevator.
@ -57,17 +57,17 @@ CeldaonMartElevatorWarpMaps: ; 4864a (12:464a)
db $02, CELADON_MART_3 db $02, CELADON_MART_3
db $02, CELADON_MART_4 db $02, CELADON_MART_4
db $02, CELADON_MART_5 db $02, CELADON_MART_5
CeldaonMartElevatorWarpMapsEnd: CeladonMartElevatorWarpMapsEnd:
CeladonMartElevatorScript_48654: ; 48654 (12:4654) CeladonMartElevatorScript_48654:
jpba ShakeElevator jpba ShakeElevator
CeladonMartElevatorTextPointers: ; 4865c (12:465c) CeladonMartElevatorTextPointers:
dw CeladonMartElevatorText1 dw CeladonMartElevatorText1
CeladonMartElevatorText1: ; 4865e (12:465e) CeladonMartElevatorText1:
TX_ASM TX_ASM
call CeladonMartElevatorScript_48631 call CeladonMartElevatorScript_48631
ld hl, CeldaonMartElevatorWarpMaps ld hl, CeladonMartElevatorWarpMaps
predef DisplayElevatorFloorMenu predef DisplayElevatorFloorMenu
jp TextScriptEnd jp TextScriptEnd

View file

@ -1,7 +1,7 @@
CeladonMartRoofScript: ; 483d5 (12:43d5) CeladonMartRoofScript:
jp EnableAutoTextBoxDrawing jp EnableAutoTextBoxDrawing
CeladonMartRoofScript_GetDrinksInBag: ; 483d8 (12:43d8) CeladonMartRoofScript_GetDrinksInBag:
; construct a list of all drinks in the player's bag ; construct a list of all drinks in the player's bag
xor a xor a
ld [wFilteredBagItemsCount], a ld [wFilteredBagItemsCount], a
@ -34,13 +34,13 @@ CeladonMartRoofScript_GetDrinksInBag: ; 483d8 (12:43d8)
ld [de], a ld [de], a
ret ret
CeladonMartRoofDrinkList: ; 48408 (12:4408) CeladonMartRoofDrinkList:
db FRESH_WATER db FRESH_WATER
db SODA_POP db SODA_POP
db LEMONADE db LEMONADE
db $00 db $00
CeladonMartRoofScript_GiveDrinkToGirl: ; 4840c (12:440c) CeladonMartRoofScript_GiveDrinkToGirl:
ld hl, wd730 ld hl, wd730
set 6, [hl] set 6, [hl]
ld hl, CeladonMartRoofText_484ee ld hl, CeladonMartRoofText_484ee
@ -130,60 +130,60 @@ CeladonMartRoofScript_GiveDrinkToGirl: ; 4840c (12:440c)
ld hl, CeladonMartRoofText_4852c ld hl, CeladonMartRoofText_4852c
jp PrintText jp PrintText
RemoveItemByIDBank12: ; 484e6 (12:44e6) RemoveItemByIDBank12:
jpba RemoveItemByID jpba RemoveItemByID
CeladonMartRoofText_484ee: ; 484ee (12:44ee) CeladonMartRoofText_484ee:
TX_FAR _CeladonMartRoofText_484ee TX_FAR _CeladonMartRoofText_484ee
db "@" db "@"
CeladonMartRoofText_484f3: ; 484f3 (12:44f3) CeladonMartRoofText_484f3:
TX_FAR _CeladonMartRoofText_484f3 TX_FAR _CeladonMartRoofText_484f3
db $0d db $0d
db "@" db "@"
CeladonMartRoofText_484f9: ; 484f9 (12:44f9) CeladonMartRoofText_484f9:
TX_FAR _CeladonMartRoofText_484f9 TX_FAR _CeladonMartRoofText_484f9
db $0b db $0b
TX_FAR _CeladonMartRoofText_484fe TX_FAR _CeladonMartRoofText_484fe
db $0d db $0d
db "@" db "@"
CeladonMartRoofText_48504: ; 48504 (12:4504) CeladonMartRoofText_48504:
TX_FAR _CeladonMartRoofText_48504 TX_FAR _CeladonMartRoofText_48504
db $0d db $0d
db "@" db "@"
CeladonMartRoofText_4850a: ; 4850a (12:450a) CeladonMartRoofText_4850a:
TX_FAR _CeladonMartRoofText_4850a TX_FAR _CeladonMartRoofText_4850a
db $0b db $0b
TX_FAR _CeladonMartRoofText_4850f TX_FAR _CeladonMartRoofText_4850f
db $0d db $0d
db "@" db "@"
CeladonMartRoofText_48515: ; 48515 (12:4515) CeladonMartRoofText_48515:
TX_FAR _CeladonMartRoofText_48515 TX_FAR _CeladonMartRoofText_48515
db $0d db $0d
db "@" db "@"
ReceivedTM49Text: ; 4851b (12:451b) ReceivedTM49Text:
TX_FAR _ReceivedTM49Text TX_FAR _ReceivedTM49Text
db $0b db $0b
TX_FAR _CeladonMartRoofText_48520 TX_FAR _CeladonMartRoofText_48520
db $0d db $0d
db "@" db "@"
CeladonMartRoofText_48526: ; 48526 (12:4526) CeladonMartRoofText_48526:
TX_FAR _CeladonMartRoofText_48526 TX_FAR _CeladonMartRoofText_48526
db $0d db $0d
db "@" db "@"
CeladonMartRoofText_4852c: ; 4852c (12:452c) CeladonMartRoofText_4852c:
TX_FAR _CeladonMartRoofText_4852c TX_FAR _CeladonMartRoofText_4852c
db $0d db $0d
db "@" db "@"
CeladonMartRoofScript_PrintDrinksInBag: ; 48532 (12:4532) CeladonMartRoofScript_PrintDrinksInBag:
ld hl, wFilteredBagItems ld hl, wFilteredBagItems
xor a xor a
ld [hItemCounter], a ld [hItemCounter], a
@ -205,7 +205,7 @@ CeladonMartRoofScript_PrintDrinksInBag: ; 48532 (12:4532)
pop hl pop hl
jr .loop jr .loop
CeladonMartRoofTextPointers: ; 4855b (12:455b) CeladonMartRoofTextPointers:
dw CeladonMartRoofText1 dw CeladonMartRoofText1
dw CeladonMartRoofText2 dw CeladonMartRoofText2
dw CeladonMartRoofText5 dw CeladonMartRoofText5
@ -213,11 +213,11 @@ CeladonMartRoofTextPointers: ; 4855b (12:455b)
dw CeladonMartRoofText5 dw CeladonMartRoofText5
dw CeladonMartRoofText6 dw CeladonMartRoofText6
CeladonMartRoofText1: ; 48567 (12:4567) CeladonMartRoofText1:
TX_FAR _CeladonMartRoofText1 TX_FAR _CeladonMartRoofText1
db "@" db "@"
CeladonMartRoofText2: ; 4856c (12:456c) CeladonMartRoofText2:
TX_ASM TX_ASM
call CeladonMartRoofScript_GetDrinksInBag call CeladonMartRoofScript_GetDrinksInBag
ld a, [wFilteredBagItemsCount] ld a, [wFilteredBagItemsCount]
@ -239,17 +239,17 @@ CeladonMartRoofText2: ; 4856c (12:456c)
.done .done
jp TextScriptEnd jp TextScriptEnd
CeladonMartRoofText3: ; 48598 (12:4598) CeladonMartRoofText3:
TX_FAR _CeladonMartRoofText_48598 TX_FAR _CeladonMartRoofText_48598
db "@" db "@"
CeladonMartRoofText4: ; 4859d (12:459d) CeladonMartRoofText4:
TX_FAR _CeladonMartRoofText4 TX_FAR _CeladonMartRoofText4
db "@" db "@"
CeladonMartRoofText5: ; 485a2 (12:45a2) CeladonMartRoofText5:
db $f5 db $f5
CeladonMartRoofText6: ; 485a3 (12:45a3) CeladonMartRoofText6:
TX_FAR _CeladonMartRoofText6 TX_FAR _CeladonMartRoofText6
db "@" db "@"

View file

@ -1,23 +1,23 @@
CeladonPokecenterScript: ; 488b8 (12:48b8) CeladonPokecenterScript:
call Serial_TryEstablishingExternallyClockedConnection call Serial_TryEstablishingExternallyClockedConnection
jp EnableAutoTextBoxDrawing jp EnableAutoTextBoxDrawing
CeladonPokecenterTextPointers: ; 488be (12:48be) CeladonPokecenterTextPointers:
dw CeladonPokecenterText1 dw CeladonHealNurseText
dw CeladonPokecenterText2 dw CeladonPokecenterText2
dw CeladonPokecenterText3 dw CeladonPokecenterText3
dw CeladonPokecenterText4 dw CeladonTradeNurseText
CeladonPokecenterText4: ; 488c6 (12:48c6) CeladonTradeNurseText:
db $f6 db $f6
CeladonPokecenterText1: ; 488c7 (12:48c7) CeladonHealNurseText:
db $ff db $ff
CeladonPokecenterText2: ; 488c8 (12:48c8) CeladonPokecenterText2:
TX_FAR _CeladonPokecenterText2 TX_FAR _CeladonPokecenterText2
db "@" db "@"
CeladonPokecenterText3: ; 488cd (12:48cd) CeladonPokecenterText3:
TX_FAR _CeladonPokecenterText3 TX_FAR _CeladonPokecenterText3
db "@" db "@"

View file

@ -1,15 +1,15 @@
CeruleanMartScript: ; 5c895 (17:4895) CeruleanMartScript:
jp EnableAutoTextBoxDrawing jp EnableAutoTextBoxDrawing
CeruleanMartTextPointers: ; 5c898 (17:4898) CeruleanMartTextPointers:
dw CeruleanMartText1 dw CeruleanCashierText
dw CeruleanMartText2 dw CeruleanMartText2
dw CeruleanMartText3 dw CeruleanMartText3
CeruleanMartText2: ; 5c89e (17:489e) CeruleanMartText2:
TX_FAR _CeruleanMartText2 TX_FAR _CeruleanMartText2
db "@" db "@"
CeruleanMartText3: ; 5c8a3 (17:48a3) CeruleanMartText3:
TX_FAR _CeruleanMartText3 TX_FAR _CeruleanMartText3
db "@" db "@"

View file

@ -1,23 +1,23 @@
CeruleanPokecenterScript: ; 5c645 (17:4645) CeruleanPokecenterScript:
call Serial_TryEstablishingExternallyClockedConnection call Serial_TryEstablishingExternallyClockedConnection
jp EnableAutoTextBoxDrawing jp EnableAutoTextBoxDrawing
CeruleanPokecenterTextPointers: ; 5c64b (17:464b) CeruleanPokecenterTextPointers:
dw CeruleanPokecenterText1 dw CeruleanHealNurseText
dw CeruleanPokecenterText2 dw CeruleanPokecenterText2
dw CeruleanPokecenterText3 dw CeruleanPokecenterText3
dw CeruleanPokecenterText4 dw CeruleanTradeNurseText
CeruleanPokecenterText4: ; 5c653 (17:4653) CeruleanTradeNurseText:
db $f6 db $f6
CeruleanPokecenterText1: ; 5c654 (17:4654) CeruleanHealNurseText:
db $ff db $ff
CeruleanPokecenterText2: ; 5c655 (17:4655) CeruleanPokecenterText2:
TX_FAR _CeruleanPokecenterText1 TX_FAR _CeruleanPokecenterText2
db "@" db "@"
CeruleanPokecenterText3: ; 5c65a (17:465a) CeruleanPokecenterText3:
TX_FAR _CeruleanPokecenterText3 TX_FAR _CeruleanPokecenterText3
db "@" db "@"

View file

@ -1,15 +1,15 @@
CinnabarMartScript: ; 75e7e (1d:5e7e) CinnabarMartScript:
jp EnableAutoTextBoxDrawing jp EnableAutoTextBoxDrawing
CinnabarMartTextPointers: ; 75e81 (1d:5e81) CinnabarMartTextPointers:
dw CinnabarMartText1 dw CinnabarCashierText
dw CinnabarMartText2 dw CinnabarMartText2
dw CinnabarMartText3 dw CinnabarMartText3
CinnabarMartText2: ; 75e87 (1d:5e87) CinnabarMartText2:
TX_FAR _CinnabarMartText2 TX_FAR _CinnabarMartText2
db "@" db "@"
CinnabarMartText3: ; 75e8c (1d:5e8c) CinnabarMartText3:
TX_FAR _CinnabarMartText3 TX_FAR _CinnabarMartText3
db "@" db "@"

View file

@ -1,23 +1,23 @@
CinnabarPokecenterScript: ; 75e2c (1d:5e2c) CinnabarPokecenterScript:
call Serial_TryEstablishingExternallyClockedConnection call Serial_TryEstablishingExternallyClockedConnection
jp EnableAutoTextBoxDrawing jp EnableAutoTextBoxDrawing
CinnabarPokecenterTextPointers: ; 75e32 (1d:5e32) CinnabarPokecenterTextPointers:
dw CinnabarPokecenterText1 dw CinnabarHealNurseText
dw CinnabarPokecenterText2 dw CinnabarPokecenterText2
dw CinnabarPokecenterText3 dw CinnabarPokecenterText3
dw CinnabarPokecenterText4 dw CinnabarTradeNurseText
CinnabarPokecenterText1: ; 75e3a (1d:5e3a) CinnabarHealNurseText:
db $ff db $ff
CinnabarPokecenterText2: ; 75e3b (1d:5e3b) CinnabarPokecenterText2:
TX_FAR _CinnabarPokecenterText1 TX_FAR _CinnabarPokecenterText2
db "@" db "@"
CinnabarPokecenterText3: ; 75e40 (1d:5e40) CinnabarPokecenterText3:
TX_FAR _CinnabarPokecenterText3 TX_FAR _CinnabarPokecenterText3
db "@" db "@"
CinnabarPokecenterText4: ; 75e45 (1d:5e45) CinnabarTradeNurseText:
db $f6 db $f6

View file

@ -1,15 +1,15 @@
FuchsiaMartScript: ; 1dd88 (7:5d88) FuchsiaMartScript:
jp EnableAutoTextBoxDrawing jp EnableAutoTextBoxDrawing
FuchsiaMartTextPointers: ; 1dd8b (7:5d8b) FuchsiaMartTextPointers:
dw FuchsiaMartText1 dw FuchsiaCashierText
dw FuchsiaMartText2 dw FuchsiaMartText2
dw FuchsiaMartText3 dw FuchsiaMartText3
FuchsiaMartText2: ; 1dd91 (7:5d91) FuchsiaMartText2:
TX_FAR _FuchsiaMartText2 TX_FAR _FuchsiaMartText2
db "@" db "@"
FuchsiaMartText3: ; 1dd96 (7:5d96) FuchsiaMartText3:
TX_FAR _FuchsiaMartText3 TX_FAR _FuchsiaMartText3
db "@" db "@"

View file

@ -1,23 +1,23 @@
FuchsiaPokecenterScript: ; 75063 (1d:5063) FuchsiaPokecenterScript:
call Serial_TryEstablishingExternallyClockedConnection call Serial_TryEstablishingExternallyClockedConnection
jp EnableAutoTextBoxDrawing jp EnableAutoTextBoxDrawing
FuchsiaPokecenterTextPointers: ; 75069 (1d:5069) FuchsiaPokecenterTextPointers:
dw FuchsiaPokecenterText1 dw FuchsiaHealNurseText
dw FuchsiaPokecenterText2 dw FuchsiaPokecenterText2
dw FuchsiaPokecenterText3 dw FuchsiaPokecenterText3
dw FuchsiaPokecenterText4 dw FuchsiaTradeNurseText
FuchsiaPokecenterText1: ; 75071 (1d:5071) FuchsiaHealNurseText:
db $ff db $ff
FuchsiaPokecenterText2: ; 75072 (1d:5072) FuchsiaPokecenterText2:
TX_FAR _FuchsiaPokecenterText1 TX_FAR _FuchsiaPokecenterText1
db "@" db "@"
FuchsiaPokecenterText3: ; 75077 (1d:5077) FuchsiaPokecenterText3:
TX_FAR _FuchsiaPokecenterText3 TX_FAR _FuchsiaPokecenterText3
db "@" db "@"
FuchsiaPokecenterText4: ; 7507c (1d:507c) FuchsiaTradeNurseText:
db $f6 db $f6

View file

@ -1,4 +1,4 @@
IndigoPlateauLobbyScript: ; 19c5b (6:5c5b) IndigoPlateauLobbyScript:
call Serial_TryEstablishingExternallyClockedConnection call Serial_TryEstablishingExternallyClockedConnection
call EnableAutoTextBoxDrawing call EnableAutoTextBoxDrawing
ld hl, wCurrentMapScriptFlags ld hl, wCurrentMapScriptFlags
@ -14,23 +14,23 @@ IndigoPlateauLobbyScript: ; 19c5b (6:5c5b)
ResetEventRange ELITE4_EVENTS_START, EVENT_LANCES_ROOM_LOCK_DOOR ResetEventRange ELITE4_EVENTS_START, EVENT_LANCES_ROOM_LOCK_DOOR
ret ret
IndigoPlateauLobbyTextPointers: ; 19c7f (6:5c7f) IndigoPlateauLobbyTextPointers:
dw IndigoPlateauLobbyText1 dw IndigoHealNurseText
dw IndigoPlateauLobbyText2 dw IndigoPlateauLobbyText2
dw IndigoPlateauLobbyText3 dw IndigoPlateauLobbyText3
dw IndigoPlateauLobbyText4 dw IndigoCashierText
dw IndigoPlateauLobbyText5 dw IndigoTradeNurseText
IndigoPlateauLobbyText1: ; 19c89 (6:5c89) IndigoHealNurseText:
db $ff db $ff
IndigoPlateauLobbyText2: ; 19c8a (6:5c8a) IndigoPlateauLobbyText2:
TX_FAR _IndigoPlateauLobbyText1 TX_FAR _IndigoPlateauLobbyText2
db "@" db "@"
IndigoPlateauLobbyText3: ; 19c8f (6:5c8f) IndigoPlateauLobbyText3:
TX_FAR _IndigoPlateauLobbyText3 TX_FAR _IndigoPlateauLobbyText3
db "@" db "@"
IndigoPlateauLobbyText5: ; 19c94 (6:5c94) IndigoTradeNurseText:
db $f6 db $f6

View file

@ -1,32 +1,32 @@
LavenderMartScript: ; 5c92c (17:492c) LavenderMartScript:
jp EnableAutoTextBoxDrawing jp EnableAutoTextBoxDrawing
LavenderMartTextPointers: ; 5c92f (17:492f) LavenderMartTextPointers:
dw LavenderMartText1 dw LavenderCashierText
dw LavenderMartText2 dw LavenderMartText2
dw LavenderMartText3 dw LavenderMartText3
LavenderMartText2: ; 5c935 (17:4935) LavenderMartText2:
TX_FAR _LavenderMartText2 TX_FAR _LavenderMartText2
db "@" db "@"
LavenderMartText3: ; 5c93a (17:493a) LavenderMartText3:
TX_ASM TX_ASM
CheckEvent EVENT_RESCUED_MR_FUJI CheckEvent EVENT_RESCUED_MR_FUJI
jr nz, .asm_c88d4 jr nz, .Nugget
ld hl, LavenderMart_5c953 ld hl, .ReviveText
call PrintText call PrintText
jr .asm_6d225 jr .done
.asm_c88d4 .Nugget
ld hl, LavenderMart_5c958 ld hl, .NuggetText
call PrintText call PrintText
.asm_6d225 .done
jp TextScriptEnd jp TextScriptEnd
LavenderMart_5c953: ; 5c953 (17:4953) .ReviveText
TX_FAR _LavenderMart_5c953 TX_FAR _LavenderMartReviveText
db "@" db "@"
LavenderMart_5c958: ; 5c958 (17:4958) .NuggetText
TX_FAR _LavenderMart_5c958 TX_FAR _LavenderMartNuggetText
db "@" db "@"

View file

@ -1,23 +1,23 @@
LavenderPokecenterScript: ; 5c8da (17:48da) LavenderPokecenterScript:
call Serial_TryEstablishingExternallyClockedConnection call Serial_TryEstablishingExternallyClockedConnection
jp EnableAutoTextBoxDrawing jp EnableAutoTextBoxDrawing
LavenderPokecenterTextPointers: ; 5c8e0 (17:48e0) LavenderPokecenterTextPointers:
dw LavenderPokecenterText1 dw LavenderHealNurseText
dw LavenderPokecenterText2 dw LavenderPokecenterText2
dw LavenderPokecenterText3 dw LavenderPokecenterText3
dw LavenderPokecenterText4 dw LavenderTradeNurseText
LavenderPokecenterText4: ; 5c8e8 (17:48e8) LavenderTradeNurseText:
db $f6 db $f6
LavenderPokecenterText1: ; 5c8e9 (17:48e9) LavenderHealNurseText:
db $ff db $ff
LavenderPokecenterText2: ; 5c8ea (17:48ea) LavenderPokecenterText2:
TX_FAR _LavenderPokecenterText1 TX_FAR _LavenderPokecenterText2
db "@" db "@"
LavenderPokecenterText3: ; 5c8ef (17:48ef) LavenderPokecenterText3:
TX_FAR _LavenderPokecenterText3 TX_FAR _LavenderPokecenterText3
db "@" db "@"

View file

@ -1,31 +1,31 @@
MtMoonPokecenterScript: ; 492cf (12:52cf) MtMoonPokecenterScript:
call Serial_TryEstablishingExternallyClockedConnection call Serial_TryEstablishingExternallyClockedConnection
jp EnableAutoTextBoxDrawing jp EnableAutoTextBoxDrawing
MtMoonPokecenterTextPointers: ; 492d5 (12:52d5) MtMoonPokecenterTextPointers:
dw MtMoonPokecenterText1 dw MtMoonHealNurseText
dw MtMoonPokecenterText2 dw MtMoonPokecenterText2
dw MtMoonPokecenterText3 dw MtMoonPokecenterText3
dw MtMoonPokecenterText4 dw MagikarpSalesmanText
dw MtMoonPokecenterText5 dw MtMoonPokecenterText5
dw MtMoonPokecenterText6 dw MtMoonTradeNurseText
MtMoonPokecenterText1: ; 492e1 (12:52e1) MtMoonHealNurseText:
db $ff db $ff
MtMoonPokecenterText2: ; 492e2 (12:52e2) MtMoonPokecenterText2:
TX_FAR _MtMoonPokecenterText1 TX_FAR _MtMoonPokecenterText1
db "@" db "@"
MtMoonPokecenterText3: ; 492e7 (12:52e7) MtMoonPokecenterText3:
TX_FAR _MtMoonPokecenterText3 TX_FAR _MtMoonPokecenterText3
db "@" db "@"
MtMoonPokecenterText4: ; 492ec (12:52ec) MagikarpSalesmanText:
TX_ASM TX_ASM
CheckEvent EVENT_BOUGHT_MAGIKARP, 1 CheckEvent EVENT_BOUGHT_MAGIKARP, 1
jp c, .alreadyBoughtMagikarp jp c, .alreadyBoughtMagikarp
ld hl, MtMoonPokecenterText_4935c ld hl, .Text1
call PrintText call PrintText
ld a, MONEY_BOX ld a, MONEY_BOX
ld [wTextBoxID], a ld [wTextBoxID], a
@ -40,7 +40,7 @@ MtMoonPokecenterText4: ; 492ec (12:52ec)
ld [hMoney + 1], a ld [hMoney + 1], a
call HasEnoughMoney call HasEnoughMoney
jr nc, .enoughMoney jr nc, .enoughMoney
ld hl, MtMoonPokecenterText_49366 ld hl, .NoMoneyText
jr .printText jr .printText
.enoughMoney .enoughMoney
lb bc, MAGIKARP, 5 lb bc, MAGIKARP, 5
@ -61,34 +61,34 @@ MtMoonPokecenterText4: ; 492ec (12:52ec)
SetEvent EVENT_BOUGHT_MAGIKARP SetEvent EVENT_BOUGHT_MAGIKARP
jr .done jr .done
.choseNo .choseNo
ld hl, MtMoonPokecenterText_49361 ld hl, .RefuseText
jr .printText jr .printText
.alreadyBoughtMagikarp .alreadyBoughtMagikarp
ld hl, MtMoonPokecenterText_4936b ld hl, .Text2
.printText .printText
call PrintText call PrintText
.done .done
jp TextScriptEnd jp TextScriptEnd
MtMoonPokecenterText_4935c: ; 4935c (12:535c) .Text1
TX_FAR _MtMoonPokecenterText_4935c TX_FAR _MagikarpSalesmanText1
db "@" db "@"
MtMoonPokecenterText_49361: ; 49361 (12:5361) .RefuseText
TX_FAR _MtMoonPokecenterText_49361 TX_FAR _MagikarpSalesmanNoText
db "@" db "@"
MtMoonPokecenterText_49366: ; 49366 (12:5366) .NoMoneyText
TX_FAR _MtMoonPokecenterText_49366 TX_FAR _MagikarpSalesmanNoMoneyText
db "@" db "@"
MtMoonPokecenterText_4936b: ; 4936b (12:536b) .Text2
TX_FAR _MtMoonPokecenterText_4936b TX_FAR _MagikarpSalesmanText2
db "@" db "@"
MtMoonPokecenterText5: ; 49370 (12:5370) MtMoonPokecenterText5:
TX_FAR _MtMoonPokecenterText5 TX_FAR _MtMoonPokecenterText5
db "@" db "@"
MtMoonPokecenterText6: ; 49375 (12:5375) MtMoonTradeNurseText:
db $f6 db $f6

View file

@ -1,30 +1,28 @@
PewterMartScript: ; 74cad (1d:4cad) PewterMartScript:
call EnableAutoTextBoxDrawing call EnableAutoTextBoxDrawing
ld a, $1 ld a, $1
ld [wAutoTextBoxDrawingControl], a ld [wAutoTextBoxDrawingControl], a
ret ret
PewterMartTextPointers: ; 74cb6 (1d:4cb6) PewterMartTextPointers:
dw PewterMartText1 dw PewterCashierText
dw PewterMartText2 dw PewterMartText2
dw PewterMartText3 dw PewterMartText3
PewterMartText2: ; 74cbc (1d:4cbc) PewterMartText2:
TX_ASM TX_ASM
ld hl, PewterMartText_74cc6 ld hl, .Text
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
.Text
PewterMartText_74cc6: ; 74cc6 (1d:4cc6) TX_FAR _PewterMartText2
TX_FAR _PewterMartText_74cc6
db "@" db "@"
PewterMartText3: ; 74ccb (1d:4ccb) PewterMartText3:
TX_ASM TX_ASM
ld hl, PewterMartText_74cd5 ld hl, .Text
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
.Text
PewterMartText_74cd5: ; 74cd5 (1d:4cd5) TX_FAR _PewterMartText3
TX_FAR _PewterMartText_74cd5
db "@" db "@"

View file

@ -1,25 +1,25 @@
PewterPokecenterScript: ; 5c587 (17:4587) PewterPokecenterScript:
call Serial_TryEstablishingExternallyClockedConnection call Serial_TryEstablishingExternallyClockedConnection
jp EnableAutoTextBoxDrawing jp EnableAutoTextBoxDrawing
PewterPokecenterTextPointers: ; 5c58d (17:458d) PewterPokecenterTextPointers:
dw PewterPokecenterText1 dw PewterHealNurseText
dw PewterPokecenterText2 dw PewterPokecenterText2
dw PewterPokecenterText3 dw PewterJigglypuffText
dw PewterPokecenterText4 dw PewterTradeNurseText
PewterPokecenterText1: ; 5c595 (17:4595) PewterHealNurseText:
db $ff db $ff
PewterPokecenterText2: ; 5c596 (17:4596) PewterPokecenterText2:
TX_FAR _PewterPokecenterText1 TX_FAR _PewterPokecenterText2
db "@" db "@"
PewterPokecenterText3: ; 5c59b (17:459b) PewterJigglypuffText:
TX_ASM TX_ASM
ld a, $1 ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, PewterPokecenterText5 ld hl, .Text
call PrintText call PrintText
ld a, $ff ld a, $ff
call PlaySound call PlaySound
@ -70,16 +70,16 @@ PewterPokecenterText3: ; 5c59b (17:459b)
call PlayDefaultMusic call PlayDefaultMusic
jp TextScriptEnd jp TextScriptEnd
PewterPokecenterText5: ; 5c603 (17:4603) .Text
TX_FAR _PewterPokecenterText5 TX_FAR _PewterJigglypuffText
db "@" db "@"
JigglypuffFacingDirections: ; 5c608 (17:4608) JigglypuffFacingDirections:
db $30 | SPRITE_FACING_DOWN db $30 | SPRITE_FACING_DOWN
db $30 | SPRITE_FACING_LEFT db $30 | SPRITE_FACING_LEFT
db $30 | SPRITE_FACING_UP db $30 | SPRITE_FACING_UP
db $30 | SPRITE_FACING_RIGHT db $30 | SPRITE_FACING_RIGHT
JigglypuffFacingDirectionsEnd: JigglypuffFacingDirectionsEnd:
PewterPokecenterText4: ; 5c60c (17:460c) PewterTradeNurseText:
db $f6 db $f6

View file

@ -1,23 +1,23 @@
RockTunnelPokecenterScript: ; 493ba (12:53ba) RockTunnelPokecenterScript:
call Serial_TryEstablishingExternallyClockedConnection call Serial_TryEstablishingExternallyClockedConnection
jp EnableAutoTextBoxDrawing jp EnableAutoTextBoxDrawing
RockTunnelPokecenterTextPointers: ; 493c0 (12:53c0) RockTunnelPokecenterTextPointers:
dw RockTunnelPokecenterText1 dw RockTunnelHealNurseText
dw RockTunnelPokecenterText2 dw RockTunnelPokecenterText2
dw RockTunnelPokecenterText3 dw RockTunnelPokecenterText3
dw RockTunnelPokecenterText4 dw RockTunnelTradeNurseText
RockTunnelPokecenterText1: ; 493c8 (12:53c8) RockTunnelHealNurseText:
db $ff db $ff
RockTunnelPokecenterText2: ; 493c9 (12:53c9) RockTunnelPokecenterText2:
TX_FAR _RockTunnelPokecenterText1 TX_FAR _RockTunnelPokecenterText2
db "@" db "@"
RockTunnelPokecenterText3: ; 493ce (12:53ce) RockTunnelPokecenterText3:
TX_FAR _RockTunnelPokecenterText3 TX_FAR _RockTunnelPokecenterText3
db "@" db "@"
RockTunnelPokecenterText4: ; 493d3 (12:53d3) RockTunnelTradeNurseText:
db $f6 db $f6

View file

@ -1,15 +1,15 @@
SaffronMartScript: ; 5d409 (17:5409) SaffronMartScript:
jp EnableAutoTextBoxDrawing jp EnableAutoTextBoxDrawing
SaffronMartTextPointers: ; 5d40c (17:540c) SaffronMartTextPointers:
dw SaffronMartText1 dw SaffronCashierText
dw SaffronMartText2 dw SaffronMartText2
dw SaffronMartText3 dw SaffronMartText3
SaffronMartText2: ; 5d412 (17:5412) SaffronMartText2:
TX_FAR _SaffronMartText2 TX_FAR _SaffronMartText2
db "@" db "@"
SaffronMartText3: ; 5d417 (17:5417) SaffronMartText3:
TX_FAR _SaffronMartText3 TX_FAR _SaffronMartText3
db "@" db "@"

View file

@ -1,23 +1,23 @@
SaffronPokecenterScript: ; 5d535 (17:5535) SaffronPokecenterScript:
call Serial_TryEstablishingExternallyClockedConnection call Serial_TryEstablishingExternallyClockedConnection
jp EnableAutoTextBoxDrawing jp EnableAutoTextBoxDrawing
SaffronPokecenterTextPointers: ; 5d53b (17:553b) SaffronPokecenterTextPointers:
dw SaffronPokecenterText1 dw SaffronHealNurseText
dw SaffronPokecenterText2 dw SaffronPokecenterText2
dw SaffronPokecenterText3 dw SaffronPokecenterText3
dw SaffronPokecenterText4 dw SaffronTradeNurseText
SaffronPokecenterText1: ; 5d543 (17:5543) SaffronHealNurseText:
db $ff db $ff
SaffronPokecenterText2: ; 5d544 (17:5544) SaffronPokecenterText2:
TX_FAR _SaffronPokecenterText1 TX_FAR _SaffronPokecenterText2
db "@" db "@"
SaffronPokecenterText3: ; 5d549 (17:5549) SaffronPokecenterText3:
TX_FAR _SaffronPokecenterText3 TX_FAR _SaffronPokecenterText3
db "@" db "@"
SaffronPokecenterText4: ; 5d54e (17:554e) SaffronTradeNurseText:
db $f6 db $f6

View file

@ -1,15 +1,15 @@
VermilionMartScript: ; 5c9e1 (17:49e1) VermilionMartScript:
jp EnableAutoTextBoxDrawing jp EnableAutoTextBoxDrawing
VermilionMartTextPointers: ; 5c9e4 (17:49e4) VermilionMartTextPointers:
dw VermilionMartText1 dw VermilionCashierText
dw VermilionMartText2 dw VermilionMartText2
dw VermilionMartText3 dw VermilionMartText3
VermilionMartText2: ; 5c9ea (17:49ea) VermilionMartText2:
TX_FAR _VermilionMartText2 TX_FAR _VermilionMartText2
db "@" db "@"
VermilionMartText3: ; 5c9ef (17:49ef) VermilionMartText3:
TX_FAR _VermilionMartText3 TX_FAR _VermilionMartText3
db "@" db "@"

View file

@ -1,23 +1,23 @@
VermilionPokecenterScript: ; 5c98f (17:498f) VermilionPokecenterScript:
call Serial_TryEstablishingExternallyClockedConnection call Serial_TryEstablishingExternallyClockedConnection
jp EnableAutoTextBoxDrawing jp EnableAutoTextBoxDrawing
VermilionPokecenterTextPointers: ; 5c995 (17:4995) VermilionPokecenterTextPointers:
dw VermilionPokecenterText1 dw VermilionHealNurseText
dw VermilionPokecenterText2 dw VermilionPokecenterText2
dw VermilionPokecenterText3 dw VermilionPokecenterText3
dw VermilionPokecenterText4 dw VermilionTradeNurseText
VermilionPokecenterText1: ; 5c99d (17:499d) VermilionHealNurseText:
db $ff db $ff
VermilionPokecenterText2: ; 5c99e (17:499e) VermilionPokecenterText2:
TX_FAR _VermilionPokecenterText1 TX_FAR _VermilionPokecenterText2
db "@" db "@"
VermilionPokecenterText3: ; 5c9a3 (17:49a3) VermilionPokecenterText3:
TX_FAR _VermilionPokecenterText3 TX_FAR _VermilionPokecenterText3
db "@" db "@"
VermilionPokecenterText4: ; 5c9a8 (17:49a8) VermilionTradeNurseText:
db $f6 db $f6

View file

@ -1,11 +1,11 @@
ViridianMartScript: ; 1d46e (7:546e) ViridianMartScript:
call ViridianMartScript_1d47d call ViridianMartScript_1d47d
call EnableAutoTextBoxDrawing call EnableAutoTextBoxDrawing
ld hl, ViridianMartScriptPointers ld hl, ViridianMartScriptPointers
ld a, [wViridianMarketCurScript] ld a, [wViridianMarketCurScript]
jp CallFunctionInTable jp CallFunctionInTable
ViridianMartScript_1d47d: ; 1d47d (7:547d) ViridianMartScript_1d47d:
CheckEvent EVENT_OAK_GOT_PARCEL CheckEvent EVENT_OAK_GOT_PARCEL
jr nz, .asm_1d489 jr nz, .asm_1d489
ld hl, ViridianMartTextPointers ld hl, ViridianMartTextPointers
@ -19,12 +19,12 @@ ViridianMartScript_1d47d: ; 1d47d (7:547d)
ld [wMapTextPtr+1], a ld [wMapTextPtr+1], a
ret ret
ViridianMartScriptPointers: ; 1d495 (7:5495) ViridianMartScriptPointers:
dw ViridianMartScript0 dw ViridianMartScript0
dw ViridianMartScript1 dw ViridianMartScript1
dw ViridianMartScript2 dw ViridianMartScript2
ViridianMartScript0: ; 1d49b (7:549b) ViridianMartScript0:
call UpdateSprites call UpdateSprites
ld a, $4 ld a, $4
ld [hSpriteIndexOrTextID], a ld [hSpriteIndexOrTextID], a
@ -39,12 +39,12 @@ ViridianMartScript0: ; 1d49b (7:549b)
ld [wViridianMarketCurScript], a ld [wViridianMarketCurScript], a
ret ret
RLEMovement1d4bb: ; 1d4bb (7:54bb) RLEMovement1d4bb:
db D_LEFT, $01 db D_LEFT, $01
db D_UP, $02 db D_UP, $02
db $ff db $ff
ViridianMartScript1: ; 1d4c0 (7:54c0) ViridianMartScript1:
ld a, [wSimulatedJoypadStatesIndex] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
@ -58,36 +58,36 @@ ViridianMartScript1: ; 1d4c0 (7:54c0)
ld a, $2 ld a, $2
ld [wViridianMarketCurScript], a ld [wViridianMarketCurScript], a
; fallthrough ; fallthrough
ViridianMartScript2: ; 1d4df (7:54df) ViridianMartScript2:
ret ret
ViridianMartTextPointers: ; 1d4e0 (7:54e0) ViridianMartTextPointers:
dw ViridianMartText1 dw ViridianMartText1
dw ViridianMartText2 dw ViridianMartText2
dw ViridianMartText3 dw ViridianMartText3
dw ViridianMartText4 dw ViridianMartText4
dw ViridianMartText5 dw ViridianMartText5
dw ViridianMartText6 dw ViridianCashierText
dw ViridianMartText2 dw ViridianMartText2
dw ViridianMartText3 dw ViridianMartText3
ViridianMartText1: ; 1d4f0 (7:54f0) ViridianMartText1:
TX_FAR _ViridianMartText1 TX_FAR _ViridianMartText1
db "@" db "@"
ViridianMartText4: ; 1d4f5 (7:54f5) ViridianMartText4:
TX_FAR _ViridianMartText4 TX_FAR _ViridianMartText4
db "@" db "@"
ViridianMartText5: ; 1d4fa (7:54fa) ViridianMartText5:
TX_FAR ViridianMartParcelQuestText TX_FAR ViridianMartParcelQuestText
db $11 db $11
db "@" db "@"
ViridianMartText2: ; 1d500 (7:5500) ViridianMartText2:
TX_FAR _ViridianMartText2 TX_FAR _ViridianMartText2
db "@" db "@"
ViridianMartText3: ; 1d505 (7:5505) ViridianMartText3:
TX_FAR _ViridianMartText3 TX_FAR _ViridianMartText3
db "@" db "@"

View file

@ -1,23 +1,23 @@
ViridianPokeCenterScript: ; 4425d (11:425d) ViridianPokeCenterScript:
call Serial_TryEstablishingExternallyClockedConnection call Serial_TryEstablishingExternallyClockedConnection
jp EnableAutoTextBoxDrawing jp EnableAutoTextBoxDrawing
ViridianPokecenterTextPointers: ; 44263 (11:4263) ViridianPokecenterTextPointers:
dw ViridianPokeCenterText1 dw ViridianHealNurseText
dw ViridianPokeCenterText2 dw ViridianPokeCenterText2
dw ViridianPokeCenterText3 dw ViridianPokeCenterText3
dw ViridianPokeCenterText4 dw ViridianTradeNurseText
ViridianPokeCenterText1: ; 4426b (11:426b) ViridianHealNurseText:
db $ff db $ff
ViridianPokeCenterText2: ; 4426c (11:426c) ViridianPokeCenterText2:
TX_FAR _ViridianPokeCenterText1 TX_FAR _ViridianPokeCenterText2
db "@" db "@"
ViridianPokeCenterText3: ; 44271 (11:4271) ViridianPokeCenterText3:
TX_FAR _ViridianPokeCenterText3 TX_FAR _ViridianPokeCenterText3
db "@" db "@"
ViridianPokeCenterText4: ; 44276 (11:4276) ViridianTradeNurseText:
db $f6 db $f6

View file

@ -2339,6 +2339,7 @@ _ColosseumText1::
INCLUDE "text/maps/reds_house_1f.asm" INCLUDE "text/maps/reds_house_1f.asm"
INCLUDE "text/maps/blues_house.asm" INCLUDE "text/maps/blues_house.asm"
INCLUDE "text/maps/oaks_lab.asm" INCLUDE "text/maps/oaks_lab.asm"
INCLUDE "text/maps/viridian_pokecenter.asm"
INCLUDE "text/maps/viridian_mart.asm" INCLUDE "text/maps/viridian_mart.asm"
INCLUDE "text/maps/school.asm" INCLUDE "text/maps/school.asm"
INCLUDE "text/maps/viridian_house.asm" INCLUDE "text/maps/viridian_house.asm"

View file

@ -29,4 +29,3 @@ _CeladonMart1Text3::
text "1F: SERVICE" text "1F: SERVICE"
line " COUNTER" line " COUNTER"
done done

View file

@ -20,4 +20,3 @@ _CeladonMart2Text5::
para "2F: TRAINER'S" para "2F: TRAINER'S"
line " MARKET" line " MARKET"
done done

View file

@ -96,4 +96,3 @@ _CeladonMart3Text15::
text "Red and Blue!" text "Red and Blue!"
line "Both are #MON!" line "Both are #MON!"
done done

View file

@ -24,4 +24,3 @@ _CeladonMart4Text4::
line "Element STONEs on" line "Element STONEs on"
cont "sale now!" cont "sale now!"
done done

View file

@ -26,4 +26,3 @@ _CeladonMart5Text2::
_CeladonMart5Text5:: _CeladonMart5Text5::
text "5F: DRUG STORE" text "5F: DRUG STORE"
done done

View file

@ -136,4 +136,3 @@ _VendingMachineText6::
_VendingMachineText7:: _VendingMachineText7::
text "Not thirsty!" text "Not thirsty!"
done done

View file

@ -10,4 +10,3 @@ _CeladonPokecenterText3::
line "CYCLING ROAD from" line "CYCLING ROAD from"
cont "FUCHSIA!" cont "FUCHSIA!"
done done

View file

@ -17,4 +17,3 @@ _CeruleanMartText3::
line "make #MON go" line "make #MON go"
cont "up one level!" cont "up one level!"
done done

View file

@ -1,4 +1,4 @@
_CeruleanPokecenterText1:: _CeruleanPokecenterText2::
text "That BILL!" text "That BILL!"
para "I heard that" para "I heard that"
@ -22,4 +22,3 @@ _CeruleanPokecenterText3::
line "to boast about" line "to boast about"
cont "their #MON?" cont "their #MON?"
done done

View file

@ -8,4 +8,3 @@ _CinnabarMartText3::
text "It never hurts to" text "It never hurts to"
line "have extra items!" line "have extra items!"
done done

View file

@ -1,5 +1,4 @@
_CinnabarPokecenterText2:: _CinnabarPokecenterText2::
_CinnabarPokecenterText1::
text "You can cancel" text "You can cancel"
line "evolution." line "evolution."
@ -20,4 +19,3 @@ _CinnabarPokecenterText3::
para "I think it's" para "I think it's"
line "worth a try!" line "worth a try!"
done done

View file

@ -12,4 +12,3 @@ _FuchsiaMartText3::
cont "up a #MON in" cont "up a #MON in"
cont "battle!" cont "battle!"
done done

View file

@ -18,4 +18,3 @@ _FuchsiaPokecenterText3::
cont "The HQ governs" cont "The HQ governs"
cont "all trainers." cont "all trainers."
done done

View file

@ -1,4 +1,4 @@
_IndigoPlateauLobbyText1:: _IndigoPlateauLobbyText2::
text "Yo! Champ in" text "Yo! Champ in"
line "making!" line "making!"
@ -23,4 +23,3 @@ _IndigoPlateauLobbyText3::
cont "next trainer!" cont "next trainer!"
cont "Good luck!" cont "Good luck!"
done done

View file

@ -14,13 +14,13 @@ _LavenderMartText2::
line "I can get them?" line "I can get them?"
done done
_LavenderMart_5c953:: _LavenderMartReviveText::
text "You know REVIVE?" text "You know REVIVE?"
line "It revives any" line "It revives any"
cont "fainted #MON!" cont "fainted #MON!"
done done
_LavenderMart_5c958:: _LavenderMartNuggetText::
text "I found a NUGGET" text "I found a NUGGET"
line "in the mountains." line "in the mountains."
@ -28,4 +28,3 @@ _LavenderMart_5c958::
line "useless, but it" line "useless, but it"
cont "sold for ¥5000!" cont "sold for ¥5000!"
done done

View file

@ -1,6 +1,4 @@
_LavenderPokecenterText4::
_LavenderPokecenterText2:: _LavenderPokecenterText2::
_LavenderPokecenterText1::
text "TEAM ROCKET will" text "TEAM ROCKET will"
line "do anything for" line "do anything for"
cont "the sake of gold!" cont "the sake of gold!"
@ -12,4 +10,3 @@ _LavenderPokecenterText3::
cont "to escape from" cont "to escape from"
cont "TEAM ROCKET!" cont "TEAM ROCKET!"
done done

View file

@ -16,7 +16,7 @@ _MtMoonPokecenterText3::
cont "news!" cont "news!"
done done
_MtMoonPokecenterText_4935c:: _MagikarpSalesmanText1::
text "MAN: Hello, there!" text "MAN: Hello, there!"
line "Have I got a deal" line "Have I got a deal"
cont "just for you!" cont "just for you!"
@ -27,18 +27,18 @@ _MtMoonPokecenterText_4935c::
cont "What do you say?" cont "What do you say?"
done done
_MtMoonPokecenterText_49361:: _MagikarpSalesmanNoText::
text "No? I'm only" text "No? I'm only"
line "doing this as a" line "doing this as a"
cont "favor to you!" cont "favor to you!"
done done
_MtMoonPokecenterText_49366:: _MagikarpSalesmanNoMoneyText::
text "You'll need more" text "You'll need more"
line "money than that!" line "money than that!"
done done
_MtMoonPokecenterText_4936b:: _MagikarpSalesmanText2::
text "MAN: Well, I don't" text "MAN: Well, I don't"
line "give refunds!" line "give refunds!"
done done
@ -46,4 +46,3 @@ _MtMoonPokecenterText_4936b::
_MtMoonPokecenterText5:: _MtMoonPokecenterText5::
db $0 db $0
done done

View file

@ -1,4 +1,4 @@
_PewterMartText_74cc6:: _PewterMartText2::
text "A shady, old man" text "A shady, old man"
line "got me to buy" line "got me to buy"
cont "this really weird" cont "this really weird"
@ -8,11 +8,10 @@ _PewterMartText_74cc6::
line "and it cost ¥500!" line "and it cost ¥500!"
done done
_PewterMartText_74cd5:: _PewterMartText3::
text "Good things can" text "Good things can"
line "happen if you" line "happen if you"
cont "raise #MON" cont "raise #MON"
cont "diligently, even" cont "diligently, even"
cont "the weak ones!" cont "the weak ones!"
done done

View file

@ -1,4 +1,4 @@
_PewterPokecenterText1:: _PewterPokecenterText2::
text "What!?" text "What!?"
para "TEAM ROCKET is" para "TEAM ROCKET is"
@ -8,7 +8,7 @@ _PewterPokecenterText1::
para "Scram!" para "Scram!"
done done
_PewterPokecenterText5:: _PewterJigglypuffText::
text "JIGGLYPUFF: Puu" text "JIGGLYPUFF: Puu"
line "pupuu!" line "pupuu!"
done done

View file

@ -1,4 +1,4 @@
_RockTunnelPokecenterText1:: _RockTunnelPokecenterText2::
text "The element types" text "The element types"
line "of #MON make" line "of #MON make"
cont "them stronger" cont "them stronger"
@ -11,4 +11,3 @@ _RockTunnelPokecenterText3::
text "I sold a useless" text "I sold a useless"
line "NUGGET for ¥5000!" line "NUGGET for ¥5000!"
done done

View file

@ -11,4 +11,3 @@ _SaffronMartText3::
line "but it revives" line "but it revives"
cont "fainted #MON!" cont "fainted #MON!"
done done

View file

@ -1,4 +1,4 @@
_SaffronPokecenterText1:: _SaffronPokecenterText2::
text "#MON growth" text "#MON growth"
line "rates differ from" line "rates differ from"
cont "specie to specie." cont "specie to specie."
@ -10,4 +10,3 @@ _SaffronPokecenterText3::
cont "why it attracted" cont "why it attracted"
cont "TEAM ROCKET!" cont "TEAM ROCKET!"
done done

View file

@ -21,4 +21,3 @@ _VermilionMartText3::
cont "evil. It depends" cont "evil. It depends"
cont "on the trainer." cont "on the trainer."
done done

View file

@ -1,5 +1,4 @@
_VermilionPokecenterText2:: _VermilionPokecenterText2::
_VermilionPokecenterText1::
text "Even if they are" text "Even if they are"
line "the same level," line "the same level,"
cont "#MON can have" cont "#MON can have"
@ -18,4 +17,3 @@ _VermilionPokecenterText3::
cont "fainted while we" cont "fainted while we"
cont "were walking!" cont "were walking!"
done done

View file

@ -1,21 +1,3 @@
_ViridianPokeCenterText2::
_ViridianPokeCenterText1::
text "You can use that"
line "PC in the corner."
para "The receptionist"
line "told me. So kind!"
done
_ViridianPokeCenterText3::
text "There's a #MON"
line "CENTER in every"
cont "town ahead."
para "They don't charge"
line "any money either!"
done
_ViridianMartText1:: _ViridianMartText1::
text "Okay! Say hi to" text "Okay! Say hi to"
line "PROF.OAK for me!" line "PROF.OAK for me!"

View file

@ -0,0 +1,16 @@
_ViridianPokeCenterText2::
text "You can use that"
line "PC in the corner."
para "The receptionist"
line "told me. So kind!"
done
_ViridianPokeCenterText3::
text "There's a #MON"
line "CENTER in every"
cont "town ahead."
para "They don't charge"
line "any money either!"
done