diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-06-11 17:10:37 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-06-11 17:10:37 -0500 |
| commit | 401d6e7f36e86aa246a2c0591195e1f0f01e879f (patch) | |
| tree | 1a8c702fa533d2923c952e9f6b69bb28d657e357 | |
| parent | c979b3bb03b121dd03a800df74144cd69a74601a (diff) | |
More syncing with pokered
from April 8, 2016 to present
49 files changed, 206 insertions, 213 deletions
diff --git a/data/baseStats/ninetails.asm b/data/baseStats/ninetales.asm index 212f6322..212f6322 100644 --- a/data/baseStats/ninetails.asm +++ b/data/baseStats/ninetales.asm diff --git a/data/base_stats.asm b/data/base_stats.asm index 716d1118..23e85e0f 100755 --- a/data/base_stats.asm +++ b/data/base_stats.asm @@ -35,7 +35,7 @@ INCLUDE "data/baseStats/nidoking.asm" INCLUDE "data/baseStats/clefairy.asm" INCLUDE "data/baseStats/clefable.asm" INCLUDE "data/baseStats/vulpix.asm" -INCLUDE "data/baseStats/ninetails.asm" +INCLUDE "data/baseStats/ninetales.asm" INCLUDE "data/baseStats/jigglypuff.asm" INCLUDE "data/baseStats/wigglytuff.asm" INCLUDE "data/baseStats/zubat.asm" diff --git a/data/mart_inventories.asm b/data/mart_inventories.asm index 498d48d2..b821f4d7 100755 --- a/data/mart_inventories.asm +++ b/data/mart_inventories.asm @@ -1,75 +1,64 @@ ; mart inventories are below ; they are texts -; first byte $FE, next byte # of items, last byte $FF ; Viridian -ViridianMartText6:: ; 233b (0:233b) - db $FE,5,POKE_BALL,POTION,ANTIDOTE,PARLYZ_HEAL,BURN_HEAL,$FF +ViridianCashierText:: + TX_MART POKE_BALL,POTION,ANTIDOTE,PARLYZ_HEAL,BURN_HEAL ; Pewter -PewterMartText1:: ; 2343 (0:2343) - db $FE,7,POKE_BALL,POTION,ESCAPE_ROPE,ANTIDOTE,BURN_HEAL,AWAKENING - db PARLYZ_HEAL,$FF +PewterCashierText:: + TX_MART POKE_BALL,POTION,ESCAPE_ROPE,ANTIDOTE,BURN_HEAL,AWAKENING,PARLYZ_HEAL ; Cerulean -CeruleanMartText1:: ; 234d (0:234d) - db $FE,8,POKE_BALL,POTION,ESCAPE_ROPE,REPEL,ANTIDOTE,BURN_HEAL,AWAKENING - db PARLYZ_HEAL,$FF +CeruleanCashierText:: + TX_MART POKE_BALL,POTION,ESCAPE_ROPE,REPEL,ANTIDOTE,BURN_HEAL,AWAKENING,PARLYZ_HEAL -; Bike shop ; 2358 (0:2358) - db $FE,1,BICYCLE,$FF +; Bike shop + TX_MART BICYCLE ; Vermilion -VermilionMartText1:: ; 235c (0:235c) - db $FE,6,POKE_BALL,SUPER_POTION,ICE_HEAL,AWAKENING,PARLYZ_HEAL - db REPEL,$FF +VermilionCashierText:: + TX_MART POKE_BALL,SUPER_POTION,ICE_HEAL,AWAKENING,PARLYZ_HEAL,REPEL ; Lavender -LavenderMartText1:: ; 2365 (0:2365) - db $FE,9,GREAT_BALL,SUPER_POTION,REVIVE,ESCAPE_ROPE,SUPER_REPEL - db ANTIDOTE,BURN_HEAL,ICE_HEAL,PARLYZ_HEAL,$FF +LavenderCashierText:: + TX_MART GREAT_BALL,SUPER_POTION,REVIVE,ESCAPE_ROPE,SUPER_REPEL,ANTIDOTE,BURN_HEAL,ICE_HEAL,PARLYZ_HEAL ; Celadon Dept. Store 2F (1) -CeladonMart2Text1:: ; 2371 (0:2371) - db $FE,9,GREAT_BALL,SUPER_POTION,REVIVE,SUPER_REPEL,ANTIDOTE - db BURN_HEAL,ICE_HEAL,AWAKENING,PARLYZ_HEAL,$FF +CeladonMart2Clerk1Text:: + TX_MART GREAT_BALL,SUPER_POTION,REVIVE,SUPER_REPEL,ANTIDOTE,BURN_HEAL,ICE_HEAL,AWAKENING,PARLYZ_HEAL ; Celadon Dept. Store 2F (2) -CeladonMart2Text2:: ; 237d (0:237d) - db $FE,9,TM_32,TM_33,TM_02,TM_07,TM_37,TM_01,TM_05,TM_09,TM_17,$FF +CeladonMart2Clerk2Text:: + TX_MART TM_32,TM_33,TM_02,TM_07,TM_37,TM_01,TM_05,TM_09,TM_17 ; Celadon Dept. Store 4F -CeladonMart4Text1:: ; 2389 (0:2389) - db $FE,5,POKE_DOLL,FIRE_STONE,THUNDER_STONE,WATER_STONE,LEAF_STONE,$FF +CeladonMart4ClerkText:: + TX_MART POKE_DOLL,FIRE_STONE,THUNDER_STONE,WATER_STONE,LEAF_STONE ; Celadon Dept. Store 5F (1) -CeladonMart5Text3:: ; 2391 (0:2391) - db $FE,7,X_ACCURACY,GUARD_SPEC,DIRE_HIT,X_ATTACK,X_DEFEND,X_SPEED - db X_SPECIAL,$FF +CeladonMart5Clerk1Text:: + TX_MART X_ACCURACY,GUARD_SPEC,DIRE_HIT,X_ATTACK,X_DEFEND,X_SPEED,X_SPECIAL ; Celadon Dept. Store 5F (2) -CeladonMart5Text4:: ; 239b (0:239b) - db $FE,5,HP_UP,PROTEIN,IRON,CARBOS,CALCIUM,$FF +CeladonMart5Clerk2Text:: + TX_MART HP_UP,PROTEIN,IRON,CARBOS,CALCIUM ; Fuchsia -FuchsiaMartText1:: ; 23a3 (0:23a3) - db $FE,6,ULTRA_BALL,GREAT_BALL,HYPER_POTION,REVIVE,FULL_HEAL - db SUPER_REPEL,$FF +FuchsiaCashierText:: + TX_MART ULTRA_BALL,GREAT_BALL,HYPER_POTION,REVIVE,FULL_HEAL,SUPER_REPEL -; unused? 23ac (0:23ac) - db $FE,5,GREAT_BALL,HYPER_POTION,SUPER_POTION,FULL_HEAL,REVIVE,$FF +; unused? + TX_MART GREAT_BALL,HYPER_POTION,SUPER_POTION,FULL_HEAL,REVIVE ; Cinnabar -CinnabarMartText1:: ; 23b4 (0:23b4) - db $FE,7,ULTRA_BALL,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE - db FULL_HEAL,REVIVE,$FF +CinnabarCashierText:: + TX_MART ULTRA_BALL,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE,FULL_HEAL,REVIVE ; Saffron -SaffronMartText1:: ; 23be (0:23be) - db $FE,6,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE,FULL_HEAL - db REVIVE,$FF +SaffronCashierText:: + TX_MART GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE,FULL_HEAL,REVIVE ; Indigo -IndigoPlateauLobbyText4:: ; 23c7 (0:23c7) - db $FE,7,ULTRA_BALL,GREAT_BALL,FULL_RESTORE,MAX_POTION,FULL_HEAL - db REVIVE,MAX_REPEL,$FF +IndigoCashierText:: + TX_MART ULTRA_BALL,GREAT_BALL,FULL_RESTORE,MAX_POTION,FULL_HEAL,REVIVE,MAX_REPEL diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm index 37c998a9..5eeb5ea9 100755 --- a/engine/oak_speech2.asm +++ b/engine/oak_speech2.asm @@ -226,9 +226,16 @@ GetDefaultName: ; 6858 (1:6858) jp CopyData DefaultNamesPlayerList: ; 687d (1:687d) - db "NEW NAME@YELLOW@ASH@JACK@" + db "NEW NAME@" + db "YELLOW@" + db "ASH@" + db "JACK@" + DefaultNamesRivalList: ; 688d (1:688d) - db "NEW NAME@BLUE@GARY@JOHN@" + db "NEW NAME@" + db "BLUE@" + db "GARY@" + db "JOHN@" TextTerminator_6b20: ; 68a5 (1:68a5) db "@" @@ -355,6 +355,15 @@ TX_BILLS_PC EQUS "db $fd" TX_POKEMART_CLERK EQUS "db $fe" TX_POKECENTER_NURSE EQUS "db $ff" +TX_MART: MACRO + db $FE, _NARG + rept _NARG + db \1 + shift + endr + db $FF + ENDM + ; Predef macro. predef_const: MACRO const \1PredefID @@ -406,10 +415,6 @@ tx_pre_jump: MACRO jp PrintPredefTextID ENDM -sound0x0A: macro - db $11 -endm - WALK EQU $FE STAY EQU $FF diff --git a/scripts/blueshouse.asm b/scripts/blueshouse.asm index 161955c1..b727bbd1 100755 --- a/scripts/blueshouse.asm +++ b/scripts/blueshouse.asm @@ -65,7 +65,7 @@ DaisyOfferMapText: GotMapText: TX_FAR _GotMapText - sound0x0A + TX_SFX_KEY_ITEM db "@" DaisyBagFullText: diff --git a/scripts/celadonmart2.asm b/scripts/celadonmart2.asm index b8128c54..c438d6e1 100755 --- a/scripts/celadonmart2.asm +++ b/scripts/celadonmart2.asm @@ -2,8 +2,8 @@ CeladonMart2Script: jp EnableAutoTextBoxDrawing CeladonMart2TextPointers: - dw CeladonMart2Text1 - dw CeladonMart2Text2 + dw CeladonMart2Clerk1Text + dw CeladonMart2Clerk2Text dw CeladonMart2Text3 dw CeladonMart2Text4 dw CeladonMart2Text5 diff --git a/scripts/celadonmart4.asm b/scripts/celadonmart4.asm index f547ca62..18049dc0 100755 --- a/scripts/celadonmart4.asm +++ b/scripts/celadonmart4.asm @@ -2,7 +2,7 @@ CeladonMart4Script: jp EnableAutoTextBoxDrawing CeladonMart4TextPointers: - dw CeladonMart4Text1 + dw CeladonMart4ClerkText dw CeladonMart4Text2 dw CeladonMart4Text3 dw CeladonMart4Text4 diff --git a/scripts/celadonmart5.asm b/scripts/celadonmart5.asm index 92ccb313..f65b42bc 100755 --- a/scripts/celadonmart5.asm +++ b/scripts/celadonmart5.asm @@ -5,8 +5,8 @@ CeladonMart5Script: CeladonMart5TextPointers: dw CeladonMart5Text1 dw CeladonMart5Text2 - dw CeladonMart5Text3 - dw CeladonMart5Text4 + dw CeladonMart5Clerk1Text + dw CeladonMart5Clerk2Text dw CeladonMart5Text5 CeladonMart5Text1: diff --git a/scripts/celadonmartelevator.asm b/scripts/celadonmartelevator.asm index e78d86fc..60e5210c 100755 --- a/scripts/celadonmartelevator.asm +++ b/scripts/celadonmartelevator.asm @@ -32,23 +32,23 @@ CeladonMartElevatorScript_4862a: ret CeladonMartElevatorScript_48631: - ld hl, CeladonMartElavatorFloors + ld hl, CeladonMartElevatorFloors call LoadItemList - ld hl, CeldaonMartElevatorWarpMaps + ld hl, CeladonMartElevatorWarpMaps ld de, wElevatorWarpMaps - ld bc, CeldaonMartElevatorWarpMapsEnd - CeldaonMartElevatorWarpMaps + ld bc, CeladonMartElevatorWarpMapsEnd - CeladonMartElevatorWarpMaps jp CopyData -CeladonMartElavatorFloors: - db $05 ; num elements in list +CeladonMartElevatorFloors: + db 5 ; number of elements in list db FLOOR_1F db FLOOR_2F db FLOOR_3F db FLOOR_4F db FLOOR_5F - db $FF ; terminator + db $FF -CeldaonMartElevatorWarpMaps: +CeladonMartElevatorWarpMaps: ; first byte is warp number ; second byte is map number ; These specify where the player goes after getting out of the elevator. @@ -57,7 +57,7 @@ CeldaonMartElevatorWarpMaps: db $02, CELADON_MART_3 db $02, CELADON_MART_4 db $02, CELADON_MART_5 -CeldaonMartElevatorWarpMapsEnd: +CeladonMartElevatorWarpMapsEnd: CeladonMartElevatorScript_48654: jpba ShakeElevator @@ -68,6 +68,6 @@ CeladonMartElevatorTextPointers: CeladonMartElevatorText1: TX_ASM call CeladonMartElevatorScript_48631 - ld hl, CeldaonMartElevatorWarpMaps + ld hl, CeladonMartElevatorWarpMaps predef DisplayElevatorFloorMenu jp TextScriptEnd diff --git a/scripts/celadonpokecenter.asm b/scripts/celadonpokecenter.asm index b577906a..acbae2ec 100755 --- a/scripts/celadonpokecenter.asm +++ b/scripts/celadonpokecenter.asm @@ -3,16 +3,16 @@ CeladonPokecenterScript: jp EnableAutoTextBoxDrawing CeladonPokecenterTextPointers: - dw CeladonPokecenterText1 + dw CeladonHealNurseText dw CeladonPokecenterText2 dw CeladonPokecenterText3 - dw CeladonPokecenterText4 + dw CeladonTradeNurseText dw CeladonPokecenterText5 -CeladonPokecenterText4: +CeladonTradeNurseText: TX_CABLE_CLUB_RECEPTIONIST -CeladonPokecenterText1: +CeladonHealNurseText: TX_POKECENTER_NURSE CeladonPokecenterText2: diff --git a/scripts/ceruleanmart.asm b/scripts/ceruleanmart.asm index 1a5df5a2..76d83f90 100755 --- a/scripts/ceruleanmart.asm +++ b/scripts/ceruleanmart.asm @@ -2,7 +2,7 @@ CeruleanMartScript: jp EnableAutoTextBoxDrawing CeruleanMartTextPointers: - dw CeruleanMartText1 + dw CeruleanCashierText dw CeruleanMartText2 dw CeruleanMartText3 diff --git a/scripts/ceruleanpokecenter.asm b/scripts/ceruleanpokecenter.asm index 2c9d4419..876d2bbd 100755 --- a/scripts/ceruleanpokecenter.asm +++ b/scripts/ceruleanpokecenter.asm @@ -3,16 +3,16 @@ CeruleanPokecenterScript: jp EnableAutoTextBoxDrawing CeruleanPokecenterTextPointers: - dw CeruleanPokecenterText1 + dw CeruleanHealNurseText dw CeruleanPokecenterText2 dw CeruleanPokecenterText3 - dw CeruleanPokecenterText4 + dw CeruleanTradeNurseText dw CeruleanPokecenterText5 -CeruleanPokecenterText4: +CeruleanTradeNurseText: TX_CABLE_CLUB_RECEPTIONIST -CeruleanPokecenterText1: +CeruleanHealNurseText: TX_POKECENTER_NURSE CeruleanPokecenterText2: diff --git a/scripts/cinnabarmart.asm b/scripts/cinnabarmart.asm index 35e9b4ce..55b82cf0 100755 --- a/scripts/cinnabarmart.asm +++ b/scripts/cinnabarmart.asm @@ -2,7 +2,7 @@ CinnabarMartScript: jp EnableAutoTextBoxDrawing CinnabarMartTextPointers: - dw CinnabarMartText1 + dw CinnabarCashierText dw CinnabarMartText2 dw CinnabarMartText3 diff --git a/scripts/cinnabarpokecenter.asm b/scripts/cinnabarpokecenter.asm index b4305d02..a43e5385 100755 --- a/scripts/cinnabarpokecenter.asm +++ b/scripts/cinnabarpokecenter.asm @@ -3,24 +3,24 @@ CinnabarPokecenterScript: jp EnableAutoTextBoxDrawing CinnabarPokecenterTextPointers: - dw CinnabarPokecenterText1 + dw CinnabarHealNurseText dw CinnabarPokecenterText2 dw CinnabarPokecenterText3 - dw CinnabarPokecenterText4 + dw CinnabarTradeNurseText dw CinnabarPokecenterText5 -CinnabarPokecenterText1: +CinnabarHealNurseText: TX_POKECENTER_NURSE CinnabarPokecenterText2: - TX_FAR _CinnabarPokecenterText1 + TX_FAR _CinnabarPokecenterText2 db "@" CinnabarPokecenterText3: TX_FAR _CinnabarPokecenterText3 db "@" -CinnabarPokecenterText4: +CinnabarTradeNurseText: TX_CABLE_CLUB_RECEPTIONIST CinnabarPokecenterText5: diff --git a/scripts/fuchsiamart.asm b/scripts/fuchsiamart.asm index 46049163..32dbe773 100755 --- a/scripts/fuchsiamart.asm +++ b/scripts/fuchsiamart.asm @@ -3,7 +3,7 @@ FuchsiaMartScript: ret FuchsiaMartTextPointers: - dw FuchsiaMartText1 + dw FuchsiaCashierText dw FuchsiaMartText2 dw FuchsiaMartText3 diff --git a/scripts/fuchsiapokecenter.asm b/scripts/fuchsiapokecenter.asm index 5f7afeb3..50f5ba76 100755 --- a/scripts/fuchsiapokecenter.asm +++ b/scripts/fuchsiapokecenter.asm @@ -3,14 +3,14 @@ FuchsiaPokecenterScript: jp EnableAutoTextBoxDrawing FuchsiaPokecenterTextPointers: - dw FuchsiaPokecenterText1 + dw FuchsiaHealNurseText dw FuchsiaPokecenterText2 dw FuchsiaPokecenterText3 - dw FuchsiaPokecenterText4 + dw FuchsiaTradeNurseText dw FuchsiaPokecenterText5 -FuchsiaPokecenterText1: - db $ff +FuchsiaHealNurseText: + TX_POKECENTER_NURSE FuchsiaPokecenterText2: TX_FAR _FuchsiaPokecenterText1 @@ -20,8 +20,8 @@ FuchsiaPokecenterText3: TX_FAR _FuchsiaPokecenterText3 db "@" -FuchsiaPokecenterText4: - db $f6 +FuchsiaTradeNurseText: + TX_CABLE_CLUB_RECEPTIONIST FuchsiaPokecenterText5: TX_ASM diff --git a/scripts/indigoplateaulobby.asm b/scripts/indigoplateaulobby.asm index 63f228d0..36ed7fd5 100755 --- a/scripts/indigoplateaulobby.asm +++ b/scripts/indigoplateaulobby.asm @@ -15,25 +15,25 @@ IndigoPlateauLobbyScript: ret IndigoPlateauLobbyTextPointers: - dw IndigoPlateauLobbyText1 + dw IndigoHealNurseText dw IndigoPlateauLobbyText2 dw IndigoPlateauLobbyText3 - dw IndigoPlateauLobbyText4 - dw IndigoPlateauLobbyText5 + dw IndigoCashierText + dw IndigoTradeNurseText dw IndigoPlateauLobbyText6 -IndigoPlateauLobbyText1: +IndigoHealNurseText: TX_POKECENTER_NURSE IndigoPlateauLobbyText2: - TX_FAR _IndigoPlateauLobbyText1 + TX_FAR _IndigoPlateauLobbyText2 db "@" IndigoPlateauLobbyText3: TX_FAR _IndigoPlateauLobbyText3 db "@" -IndigoPlateauLobbyText5: +IndigoTradeNurseText: TX_CABLE_CLUB_RECEPTIONIST IndigoPlateauLobbyText6: diff --git a/scripts/lavendermart.asm b/scripts/lavendermart.asm index 915c9662..51b64992 100755 --- a/scripts/lavendermart.asm +++ b/scripts/lavendermart.asm @@ -2,7 +2,7 @@ LavenderMartScript: jp EnableAutoTextBoxDrawing LavenderMartTextPointers: - dw LavenderMartText1 + dw LavenderCashierText dw LavenderMartText2 dw LavenderMartText3 @@ -13,20 +13,20 @@ LavenderMartText2: LavenderMartText3: TX_ASM CheckEvent EVENT_RESCUED_MR_FUJI - jr nz, .asm_c88d4 - ld hl, LavenderMart_5c953 + jr nz, .Nugget + ld hl, .ReviveText call PrintText - jr .asm_6d225 -.asm_c88d4 - ld hl, LavenderMart_5c958 + jr .done +.Nugget + ld hl, .NuggetText call PrintText -.asm_6d225 +.done jp TextScriptEnd -LavenderMart_5c953: - TX_FAR _LavenderMart_5c953 +.ReviveText + TX_FAR _LavenderMartReviveText db "@" -LavenderMart_5c958: - TX_FAR _LavenderMart_5c958 +.NuggetText + TX_FAR _LavenderMartNuggetText db "@" diff --git a/scripts/lavenderpokecenter.asm b/scripts/lavenderpokecenter.asm index e8e23655..67960c1b 100755 --- a/scripts/lavenderpokecenter.asm +++ b/scripts/lavenderpokecenter.asm @@ -3,20 +3,20 @@ LavenderPokecenterScript: jp EnableAutoTextBoxDrawing LavenderPokecenterTextPointers: - dw LavenderPokecenterText1 + dw LavenderHealNurseText dw LavenderPokecenterText2 dw LavenderPokecenterText3 - dw LavenderPokecenterText4 + dw LavenderTradeNurseText dw LavenderPokecenterText5 -LavenderPokecenterText4: +LavenderTradeNurseText: TX_CABLE_CLUB_RECEPTIONIST -LavenderPokecenterText1: +LavenderHealNurseText: TX_POKECENTER_NURSE LavenderPokecenterText2: - TX_FAR _LavenderPokecenterText1 + TX_FAR _LavenderPokecenterText2 db "@" LavenderPokecenterText3: diff --git a/scripts/mtmoonpokecenter.asm b/scripts/mtmoonpokecenter.asm index a2f2c82b..76cc472a 100755 --- a/scripts/mtmoonpokecenter.asm +++ b/scripts/mtmoonpokecenter.asm @@ -3,15 +3,15 @@ MtMoonPokecenterScript: jp EnableAutoTextBoxDrawing MtMoonPokecenterTextPointers: - dw MtMoonPokecenterText1 + dw MtMoonHealNurseText dw MtMoonPokecenterText2 dw MtMoonPokecenterText3 - dw MtMoonPokecenterText4 + dw MagikarpSalesmanText dw MtMoonPokecenterText5 - dw MtMoonPokecenterText6 + dw MtMoonTradeNurseText dw MtMoonPokecenterText7 -MtMoonPokecenterText1: +MtMoonHealNurseText: TX_POKECENTER_NURSE MtMoonPokecenterText2: @@ -22,16 +22,16 @@ MtMoonPokecenterText3: TX_FAR _MtMoonPokecenterText3 db "@" -MtMoonPokecenterText4: +MagikarpSalesmanText: TX_ASM - callab Func_f218c + callab MagikarpSalesman jp TextScriptEnd MtMoonPokecenterText5: TX_FAR _MtMoonPokecenterText5 db "@" -MtMoonPokecenterText6: +MtMoonTradeNurseText: TX_CABLE_CLUB_RECEPTIONIST MtMoonPokecenterText7: diff --git a/scripts/mtmoonpokecenter2.asm b/scripts/mtmoonpokecenter2.asm index f01b7218..6097342b 100755 --- a/scripts/mtmoonpokecenter2.asm +++ b/scripts/mtmoonpokecenter2.asm @@ -1,7 +1,7 @@ -Func_f218c: +MagikarpSalesman: CheckEvent EVENT_BOUGHT_MAGIKARP, 1 jp c, .alreadyBoughtMagikarp - ld hl, MtMoonPokecenterText_4935c + ld hl, .Text1 call PrintText ld a, MONEY_BOX ld [wTextBoxID], a @@ -18,7 +18,7 @@ Func_f218c: ld [hMoney + 1], a call HasEnoughMoney jr nc, .enoughMoney - ld hl, MtMoonPokecenterText_49366 + ld hl, .NoMoneyText jr .printText .enoughMoney lb bc, MAGIKARP, 5 @@ -40,27 +40,27 @@ Func_f218c: SetEvent EVENT_BOUGHT_MAGIKARP jr .done .choseNo - ld hl, MtMoonPokecenterText_49361 + ld hl, .RefuseText jr .printText .alreadyBoughtMagikarp - ld hl, MtMoonPokecenterText_4936b + ld hl, .Text2 .printText call PrintText .done ret -MtMoonPokecenterText_4935c: - TX_FAR _MtMoonPokecenterText_4935c +.Text1 + TX_FAR _MagikarpSalesmanText1 db "@" -MtMoonPokecenterText_49361: - TX_FAR _MtMoonPokecenterText_49361 +.RefuseText + TX_FAR _MagikarpSalesmanNoText db "@" -MtMoonPokecenterText_49366: - TX_FAR _MtMoonPokecenterText_49366 +.NoMoneyText + TX_FAR _MagikarpSalesmanNoMoneyText db "@" -MtMoonPokecenterText_4936b: - TX_FAR _MtMoonPokecenterText_4936b +.Text2 + TX_FAR _MagikarpSalesmanText2 db "@" diff --git a/scripts/pewtermart.asm b/scripts/pewtermart.asm index 33a0a4c2..64915563 100755 --- a/scripts/pewtermart.asm +++ b/scripts/pewtermart.asm @@ -5,26 +5,26 @@ PewterMartScript: ret PewterMartTextPointers: - dw PewterMartText1 + dw PewterCashierText dw PewterMartText2 dw PewterMartText3 PewterMartText2: TX_ASM - ld hl, PewterMartText_74cc6 + ld hl, .Text call PrintText jp TextScriptEnd -PewterMartText_74cc6: - TX_FAR _PewterMartText_74cc6 +.Text + TX_FAR _PewterMartText2 db "@" PewterMartText3: TX_ASM - ld hl, PewterMartText_74cd5 + ld hl, .Text call PrintText jp TextScriptEnd -PewterMartText_74cd5: - TX_FAR _PewterMartText_74cd5 +.Text + TX_FAR _PewterMartText3 db "@" diff --git a/scripts/pewterpokecenter.asm b/scripts/pewterpokecenter.asm index 2d7f8713..78bfc9fa 100755 --- a/scripts/pewterpokecenter.asm +++ b/scripts/pewterpokecenter.asm @@ -6,26 +6,26 @@ PewterPokecenterScript: ret PewterPokecenterTextPointers: - dw PewterPokecenterText1 + dw PewterHealNurseText dw PewterPokecenterText2 - dw PewterPokecenterText3 - dw PewterPokecenterText4 + dw PewterJigglypuffText + dw PewterTradeNurseText dw PewterPokecenterText5 dw PewterPokecenterText6 -PewterPokecenterText1: +PewterHealNurseText: TX_POKECENTER_NURSE PewterPokecenterText2: - TX_FAR _PewterPokecenterText1 + TX_FAR _PewterPokecenterText2 db "@" -PewterPokecenterText3: +PewterJigglypuffText: TX_ASM - callba Func_f1da4 + callba PewterJigglypuff jp TextScriptEnd -PewterPokecenterText4: +PewterTradeNurseText: TX_CABLE_CLUB_RECEPTIONIST PewterPokecenterText5: diff --git a/scripts/pewterpokecenter2.asm b/scripts/pewterpokecenter2.asm index e424071a..9f035fa9 100755 --- a/scripts/pewterpokecenter2.asm +++ b/scripts/pewterpokecenter2.asm @@ -4,13 +4,13 @@ Func_f1d98: ret PewterPokecenterText_f1d9f: - TX_FAR _PewterPokecenterText2 + TX_FAR _PewterPokecenterText3 db "@" -Func_f1da4: +PewterJigglypuff: ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, PewterPokecenterText_f1e19 + ld hl, .Text call PrintText call StopAllMusic ld c, 32 @@ -60,8 +60,8 @@ Func_f1da4: call DisablePikachuFollowingPlayer ret -PewterPokecenterText_f1e19: - TX_FAR _PewterPokecenterText5 +.Text + TX_FAR _PewterJigglypuffText db "@" JigglypuffSpinData: diff --git a/scripts/rocktunnelpokecenter.asm b/scripts/rocktunnelpokecenter.asm index 76336e5f..68c5f31a 100755 --- a/scripts/rocktunnelpokecenter.asm +++ b/scripts/rocktunnelpokecenter.asm @@ -3,24 +3,24 @@ RockTunnelPokecenterScript: jp EnableAutoTextBoxDrawing RockTunnelPokecenterTextPointers: - dw RockTunnelPokecenterText1 + dw RockTunnelHealNurseText dw RockTunnelPokecenterText2 dw RockTunnelPokecenterText3 - dw RockTunnelPokecenterText4 + dw RockTunnelTradeNurseText dw RockTunnelPokecenterText5 -RockTunnelPokecenterText1: +RockTunnelHealNurseText: TX_POKECENTER_NURSE RockTunnelPokecenterText2: - TX_FAR _RockTunnelPokecenterText1 + TX_FAR _RockTunnelPokecenterText2 db "@" RockTunnelPokecenterText3: TX_FAR _RockTunnelPokecenterText3 db "@" -RockTunnelPokecenterText4: +RockTunnelTradeNurseText: TX_CABLE_CLUB_RECEPTIONIST RockTunnelPokecenterText5: diff --git a/scripts/saffronmart.asm b/scripts/saffronmart.asm index 0bc03362..8b140610 100755 --- a/scripts/saffronmart.asm +++ b/scripts/saffronmart.asm @@ -2,7 +2,7 @@ SaffronMartScript: jp EnableAutoTextBoxDrawing SaffronMartTextPointers: - dw SaffronMartText1 + dw SaffronCashierText dw SaffronMartText2 dw SaffronMartText3 diff --git a/scripts/saffronpokecenter.asm b/scripts/saffronpokecenter.asm index 7fde0502..46667927 100755 --- a/scripts/saffronpokecenter.asm +++ b/scripts/saffronpokecenter.asm @@ -3,24 +3,24 @@ SaffronPokecenterScript: jp EnableAutoTextBoxDrawing SaffronPokecenterTextPointers: - dw SaffronPokecenterText1 + dw SaffronHealNurseText dw SaffronPokecenterText2 dw SaffronPokecenterText3 - dw SaffronPokecenterText4 + dw SaffronTradeNurseText dw SaffronPokecenterText5 -SaffronPokecenterText1: +SaffronHealNurseText: TX_POKECENTER_NURSE SaffronPokecenterText2: - TX_FAR _SaffronPokecenterText1 + TX_FAR _SaffronPokecenterText2 db "@" SaffronPokecenterText3: TX_FAR _SaffronPokecenterText3 db "@" -SaffronPokecenterText4: +SaffronTradeNurseText: TX_CABLE_CLUB_RECEPTIONIST SaffronPokecenterText5: diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm index 41ca1e53..eb726831 100755 --- a/scripts/vermiliongym.asm +++ b/scripts/vermiliongym.asm @@ -1,4 +1,4 @@ -VermilionGymScript: ; 5ca26 (17:4a26) +VermilionGymScript: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] diff --git a/scripts/vermilionmart.asm b/scripts/vermilionmart.asm index ec9f7f18..2d4df78d 100755 --- a/scripts/vermilionmart.asm +++ b/scripts/vermilionmart.asm @@ -2,7 +2,7 @@ VermilionMartScript: jp EnableAutoTextBoxDrawing VermilionMartTextPointers: - dw VermilionMartText1 + dw VermilionCashierText dw VermilionMartText2 dw VermilionMartText3 diff --git a/scripts/vermilionpokecenter.asm b/scripts/vermilionpokecenter.asm index 15d9dbd9..af481a16 100755 --- a/scripts/vermilionpokecenter.asm +++ b/scripts/vermilionpokecenter.asm @@ -3,24 +3,24 @@ VermilionPokecenterScript: jp EnableAutoTextBoxDrawing VermilionPokecenterTextPointers: - dw VermilionPokecenterText1 + dw VermilionHealNurseText dw VermilionPokecenterText2 dw VermilionPokecenterText3 - dw VermilionPokecenterText4 + dw VermilionTradeNurseText dw VermilionPokecenterText5 -VermilionPokecenterText1: +VermilionHealNurseText: TX_POKECENTER_NURSE VermilionPokecenterText2: - TX_FAR _VermilionPokecenterText1 + TX_FAR _VermilionPokecenterText2 db "@" VermilionPokecenterText3: TX_FAR _VermilionPokecenterText3 db "@" -VermilionPokecenterText4: +VermilionTradeNurseText: TX_CABLE_CLUB_RECEPTIONIST VermilionPokecenterText5: diff --git a/scripts/viridianmart.asm b/scripts/viridianmart.asm index 64c0eda0..e20ed48e 100755 --- a/scripts/viridianmart.asm +++ b/scripts/viridianmart.asm @@ -12,7 +12,7 @@ ViridianMartScript_1d47d: ld hl, ViridianMartTextPointers jr .asm_1d48c .asm_1d489 - ld hl, ViridianMartTextPointers + $a ; starts at ViridianMartText6 + ld hl, ViridianMartTextPointers + $a ; starts at ViridianCashierText .asm_1d48c ld a, l ld [wMapTextPtr], a @@ -79,7 +79,7 @@ ViridianMartTextPointers: dw ViridianMartText3 dw ViridianMartText4 dw ViridianMartText5 - dw ViridianMartText6 + dw ViridianCashierText dw ViridianMartText2 dw ViridianMartText3 diff --git a/scripts/viridianpokecenter.asm b/scripts/viridianpokecenter.asm index 3bbedf8d..75e6ea6f 100755 --- a/scripts/viridianpokecenter.asm +++ b/scripts/viridianpokecenter.asm @@ -3,24 +3,24 @@ ViridianPokeCenterScript: jp EnableAutoTextBoxDrawing ViridianPokecenterTextPointers: - dw ViridianPokeCenterText1 + dw ViridianHealNurseText dw ViridianPokeCenterText2 dw ViridianPokeCenterText3 - dw ViridianPokeCenterText4 + dw ViridianTradeNurseText dw ViridianPokeCenterText5 -ViridianPokeCenterText1: +ViridianHealNurseText: TX_POKECENTER_NURSE ViridianPokeCenterText2: - TX_FAR _ViridianPokeCenterText1 + TX_FAR _ViridianPokeCenterText2 db "@" ViridianPokeCenterText3: TX_FAR _ViridianPokeCenterText3 db "@" -ViridianPokeCenterText4: +ViridianTradeNurseText: TX_CABLE_CLUB_RECEPTIONIST ViridianPokeCenterText5: @@ -2497,6 +2497,7 @@ INCLUDE "text/maps/reds_house_1f.asm" INCLUDE "text/maps/blues_house.asm" INCLUDE "text/maps/oaks_lab.asm" INCLUDE "text/pokedex_ratings.asm" +INCLUDE "text/maps/viridian_pokecenter.asm" INCLUDE "text/maps/viridian_mart.asm" INCLUDE "text/maps/school.asm" INCLUDE "text/maps/viridian_house.asm" diff --git a/text/maps/cinnabar_pokecenter.asm b/text/maps/cinnabar_pokecenter.asm index 301c9740..cf481764 100644 --- a/text/maps/cinnabar_pokecenter.asm +++ b/text/maps/cinnabar_pokecenter.asm @@ -1,5 +1,4 @@ _CinnabarPokecenterText2:: -_CinnabarPokecenterText1:: text "You can cancel" line "evolution." diff --git a/text/maps/indigo_plateau_lobby.asm b/text/maps/indigo_plateau_lobby.asm index 86cfb562..8487e29a 100644 --- a/text/maps/indigo_plateau_lobby.asm +++ b/text/maps/indigo_plateau_lobby.asm @@ -1,4 +1,4 @@ -_IndigoPlateauLobbyText1:: +_IndigoPlateauLobbyText2:: text "Yo! Champ in" line "making!" diff --git a/text/maps/lavender_mart.asm b/text/maps/lavender_mart.asm index 54519890..222712c6 100644 --- a/text/maps/lavender_mart.asm +++ b/text/maps/lavender_mart.asm @@ -14,13 +14,13 @@ _LavenderMartText2:: line "I can get them?" done -_LavenderMart_5c953:: +_LavenderMartReviveText:: text "You know REVIVE?" line "It revives any" cont "fainted #MON!" done -_LavenderMart_5c958:: +_LavenderMartNuggetText:: text "I found a NUGGET" line "in the mountains." diff --git a/text/maps/lavender_pokecenter.asm b/text/maps/lavender_pokecenter.asm index 5ee5b2f5..3aa7b67d 100644 --- a/text/maps/lavender_pokecenter.asm +++ b/text/maps/lavender_pokecenter.asm @@ -1,6 +1,4 @@ -_LavenderPokecenterText4:: _LavenderPokecenterText2:: -_LavenderPokecenterText1:: text "TEAM ROCKET will" line "do anything for" cont "the sake of gold!" diff --git a/text/maps/mt_moon_pokecenter.asm b/text/maps/mt_moon_pokecenter.asm index f45c5598..ebcada87 100644 --- a/text/maps/mt_moon_pokecenter.asm +++ b/text/maps/mt_moon_pokecenter.asm @@ -20,7 +20,7 @@ _MtMoonPokecenterText5:: db $0 done -_MtMoonPokecenterText_4935c:: +_MagikarpSalesmanText1:: text "MAN: Hello, there!" line "Have I got a deal" cont "just for you!" @@ -31,18 +31,18 @@ _MtMoonPokecenterText_4935c:: cont "What do you say?" done -_MtMoonPokecenterText_49361:: +_MagikarpSalesmanNoText:: text "No? I'm only" line "doing this as a" cont "favor to you!" done -_MtMoonPokecenterText_49366:: +_MagikarpSalesmanNoMoneyText:: text "You'll need more" line "money than that!" done -_MtMoonPokecenterText_4936b:: +_MagikarpSalesmanText2:: text "MAN: Well, I don't" line "give refunds!" done diff --git a/text/maps/pewter_mart.asm b/text/maps/pewter_mart.asm index 29a1f597..4dbc3c02 100644 --- a/text/maps/pewter_mart.asm +++ b/text/maps/pewter_mart.asm @@ -1,4 +1,4 @@ -_PewterMartText_74cc6:: +_PewterMartText2:: text "A shady old man" line "got me to buy" cont "this really weird" @@ -8,7 +8,7 @@ _PewterMartText_74cc6:: line "and it cost ¥500!" done -_PewterMartText_74cd5:: +_PewterMartText3:: text "Good things can" line "happen if you" cont "raise #MON" diff --git a/text/maps/pewter_pokecenter.asm b/text/maps/pewter_pokecenter.asm index cd76b004..968f6af0 100644 --- a/text/maps/pewter_pokecenter.asm +++ b/text/maps/pewter_pokecenter.asm @@ -1,4 +1,4 @@ -_PewterPokecenterText1:: +_PewterPokecenterText2:: text "What!?" para "TEAM ROCKET is" @@ -8,7 +8,7 @@ _PewterPokecenterText1:: para "Scram!" done -_PewterPokecenterText2:: +_PewterPokecenterText3:: text "#MON CENTERS" line "are wonderful!" @@ -21,7 +21,7 @@ _PewterPokecenterText2:: cont "are cured." done -_PewterPokecenterText5:: +_PewterJigglypuffText:: text "JIGGLYPUFF: Puu" line "pupuu!" done diff --git a/text/maps/rock_tunnel_pokecenter.asm b/text/maps/rock_tunnel_pokecenter.asm index ec625e95..0fc249ff 100644 --- a/text/maps/rock_tunnel_pokecenter.asm +++ b/text/maps/rock_tunnel_pokecenter.asm @@ -1,4 +1,4 @@ -_RockTunnelPokecenterText1:: +_RockTunnelPokecenterText2:: text "The element types" line "of #MON make" cont "them stronger" diff --git a/text/maps/saffron_pokecenter.asm b/text/maps/saffron_pokecenter.asm index 8fd47e4f..6548aff8 100644 --- a/text/maps/saffron_pokecenter.asm +++ b/text/maps/saffron_pokecenter.asm @@ -1,4 +1,4 @@ -_SaffronPokecenterText1:: +_SaffronPokecenterText2:: text "#MON growth" line "rates differ from" cont "specie to specie." diff --git a/text/maps/vermilion_pokecenter.asm b/text/maps/vermilion_pokecenter.asm index bbd8842f..c9e9a581 100644 --- a/text/maps/vermilion_pokecenter.asm +++ b/text/maps/vermilion_pokecenter.asm @@ -1,5 +1,4 @@ _VermilionPokecenterText2:: -_VermilionPokecenterText1:: text "Even if they are" line "the same level," cont "#MON can have" diff --git a/text/maps/viridian_mart.asm b/text/maps/viridian_mart.asm index 4cc2ce19..5f4e147c 100644 --- a/text/maps/viridian_mart.asm +++ b/text/maps/viridian_mart.asm @@ -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:: text "Okay! Say hi to" line "PROF.OAK for me!" diff --git a/text/maps/viridian_pokecenter.asm b/text/maps/viridian_pokecenter.asm new file mode 100755 index 00000000..4ac18bf6 --- /dev/null +++ b/text/maps/viridian_pokecenter.asm @@ -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 diff --git a/text/move_names.asm b/text/move_names.asm index 92760d45..a9265f51 100644 --- a/text/move_names.asm +++ b/text/move_names.asm @@ -164,4 +164,3 @@ MoveNames:: ; b0000 (2c:4000) db "SLASH@" db "SUBSTITUTE@" db "STRUGGLE@" - diff --git a/text/oakspeech.asm b/text/oakspeech.asm index 91aaf5c3..5911092c 100644 --- a/text/oakspeech.asm +++ b/text/oakspeech.asm @@ -53,4 +53,3 @@ _OakSpeechText3:: cont "with #MON" cont "awaits! Let's go!" done - diff --git a/text/pokedex.asm b/text/pokedex.asm index 22aa946e..7e84a83d 100644 --- a/text/pokedex.asm +++ b/text/pokedex.asm @@ -1506,4 +1506,3 @@ _MewDexEntry:: next "fine, delicate" next "hair can be seen" dex - |