diff options
| -rw-r--r-- | charmap.asm | 4 | ||||
| -rw-r--r-- | constants.asm | 3 | ||||
| -rw-r--r-- | constants/misc_constants.asm | 15 | ||||
| -rwxr-xr-x | constants/text_constants.asm | 15 | ||||
| -rw-r--r-- | home.asm | 160 | ||||
| -rw-r--r-- | macros.asm | 6 | ||||
| -rwxr-xr-x | main.asm | 8 | ||||
| -rwxr-xr-x | scripts/celadongamecorner.asm | 2 | ||||
| -rwxr-xr-x | scripts/celadonmartroof.asm | 2 | ||||
| -rwxr-xr-x | scripts/viridianmart.asm | 2 | ||||
| -rw-r--r-- | text.asm | 328 | ||||
| -rw-r--r-- | text/maps/hall_of_fame.asm | 6 |
12 files changed, 282 insertions, 269 deletions
diff --git a/charmap.asm b/charmap.asm index e4368d40..8f57a130 100644 --- a/charmap.asm +++ b/charmap.asm @@ -147,12 +147,14 @@ charmap "ゅ", $E1 charmap "ょ", $E2 charmap "ー", $E3 -charmap "<pkmn>", $4a ; PkMn +charmap "<pkmn>", $4A ; PkMn charmap "@", $50 charmap "<PLAYER>", $52 charmap "<RIVAL>", $53 charmap "#", $54 ;charmap "POKé", $54 +charmap "<TARGET>", $59 +charmap "<USER>", $5A charmap "′", $71 charmap "″", $73 charmap "…", $75 diff --git a/constants.asm b/constants.asm index b4e27a91..554f89ca 100644 --- a/constants.asm +++ b/constants.asm @@ -29,4 +29,5 @@ INCLUDE "constants/tilesets.asm" INCLUDE "constants/starter_mons.asm" INCLUDE "constants/event_constants.asm" INCLUDE "constants/event_macros.asm" -INCLUDE "constants/pikachu_emotion_constants.asm"
\ No newline at end of file +INCLUDE "constants/pikachu_emotion_constants.asm" +INCLUDE "constants/text_constants.asm" diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 4538c353..e5d27d1b 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -172,21 +172,6 @@ FLAG_RESET EQU 0 FLAG_SET EQU 1 FLAG_TEST EQU 2 -; special text IDs -TEXT_MON_FAINTED EQU $d0 -TEXT_BLACKED_OUT EQU $d1 -TEXT_REPEL_WORE_OFF EQU $d2 -TEXT_SAFARI_GAME_OVER EQU $d3 - -; PrintNumber -BIT_MONEY_SIGN EQU 5 -BIT_LEFT_ALIGN EQU 6 -BIT_LEADING_ZEROES EQU 7 - -MONEY_SIGH EQU (1 << BIT_MONEY_SIGN) -LEFT_ALIGN EQU (1 << BIT_LEFT_ALIGN) -LEADING_ZEROES EQU (1 << BIT_LEADING_ZEROES) - ; HP bar HP_BAR_GREEN EQU 0 HP_BAR_YELLOW EQU 1 diff --git a/constants/text_constants.asm b/constants/text_constants.asm new file mode 100755 index 00000000..4479e90e --- /dev/null +++ b/constants/text_constants.asm @@ -0,0 +1,15 @@ +; special text IDs +TEXT_MON_FAINTED EQU $d0 +TEXT_BLACKED_OUT EQU $d1 +TEXT_REPEL_WORE_OFF EQU $d2 +TEXT_SAFARI_GAME_OVER EQU $d3 +TEXT_PIKACHU_ANIM EQU $d4 + +; PrintNumber +BIT_MONEY_SIGN EQU 5 +BIT_LEFT_ALIGN EQU 6 +BIT_LEADING_ZEROES EQU 7 + +MONEY_SIGN EQU (1 << BIT_MONEY_SIGN) +LEFT_ALIGN EQU (1 << BIT_LEFT_ALIGN) +LEADING_ZEROES EQU (1 << BIT_LEADING_ZEROES) @@ -117,12 +117,12 @@ PlayPikachuPCM:: ; 0150 (0:0150) .playSingleSample dec a jr nz, .playSingleSample - + rept 7 call LoadNextSoundClipSample call PlaySoundClipSample endr - + call LoadNextSoundClipSample dec bc ld a, c @@ -140,7 +140,7 @@ LoadNextSoundClipSample:: ; 0199 (0:0199) ld [rNR32], a sla d ret - + PlaySoundClipSample:: ; 01a5 (0:01a5) ld a, $3 .loop @@ -164,7 +164,7 @@ Joypad:: ; 01b9 (0:01b9) ReadJoypad:: ; 01c8 (0:01c8) homecall_jump ReadJoypad_ - + INCLUDE "home/overworld.asm" CheckForUserInterruption:: ; 10ba (0:10ba) @@ -391,8 +391,8 @@ GetCryData:: ; 11a5 (0:11a5) ld [wTempoModifier], a call BankswitchBack - ; Cry headers have 3 channels, - ; and start from index $14, + ; Cry headers have 3 channels, + ; and start from index $14, ; so add 3 times the cry id. ld a, b ld c, $14 @@ -411,7 +411,7 @@ DisplayPartyMenu:: ; 11c8 (0:11c8) call PartyMenuInit call DrawPartyMenu jp HandlePartyMenuInput - + GoBackToPartyMenu:: ; 11dd (0:11dd) ld a, [hTilesetType] push af @@ -538,13 +538,13 @@ HandlePartyMenuInput:: ; 1226 (0:1226) PartyMenuText_12cc:: ; 12cc (0:12cc) TX_FAR _SleepingPikachuText1 ; 28:411b db "@" - + DrawPartyMenu:: ; 12d1 (0:12d1) ld hl, DrawPartyMenu_ ; 4:5875 jr DrawPartyMenuCommon RedrawPartyMenu:: ; 12d6 (0:12d6) - ld hl, RedrawPartyMenu_ ; 4:5886 + ld hl, RedrawPartyMenu_ ; 4:5886 DrawPartyMenuCommon:: ; 12d9 (0:12d9) ld b, BANK(RedrawPartyMenu_) @@ -586,7 +586,7 @@ PrintLevel:: ; 1303 (0:1303) ld [hli], a ld c, 2 ; number of digits ld a, [wLoadedMonLevel] ; level - cp a, 100 + cp 100 jr c, PrintLevelCommon ; if level at least 100, write over the ":L" tile dec hl @@ -634,16 +634,16 @@ GetMonHeader:: ; 132f (0:132f) ld [wd11e], a ld de, FossilKabutopsPic ld b, $66 ; size of Kabutops fossil and Ghost sprites - cp a, FOSSIL_KABUTOPS ; Kabutops fossil + cp FOSSIL_KABUTOPS ; Kabutops fossil jr z, .specialID ld de, GhostPic - cp a, MON_GHOST ; Ghost + cp MON_GHOST ; Ghost jr z, .specialID ld de, FossilAerodactylPic ld b, $77 ; size of Aerodactyl fossil sprite - cp a, FOSSIL_AERODACTYL ; Aerodactyl fossil + cp FOSSIL_AERODACTYL ; Aerodactyl fossil jr z, .specialID - ;cp a, MEW + ;cp MEW ;jr z, .mew predef IndexToPokedex ; convert pokemon ID in [wd11e] to pokedex number ld a, [wd11e] @@ -760,7 +760,7 @@ PrintBCDDigit:: ; 13e4 (0:13e4) .skipCurrencySymbol res 7, b ; unset 7 to indicate that a nonzero digit has been reached .outputDigit - add a, "0" + add "0" ld [hli], a jp PrintLetterDelay .zeroDigit @@ -1065,7 +1065,7 @@ ResetPlayerSpriteData_ClearSpriteData:: ; 27ba (0:27ba) ld bc, $10 xor a call FillMemory ; XXX why replaced with call + ret? - ret + ret ;jp FillMemory FadeOutAudio:: ; 27c2 (0:27c2) @@ -1143,15 +1143,15 @@ DisplayTextID:: ; 2817 (0:2817) ld [wSpriteIndex], a and a jp z, DisplayStartMenu - cp a, $d4 ; new yellow asm + cp TEXT_PIKACHU_ANIM ; new yellow asm jp z, DisplayUnknownText_29c6 - cp a, TEXT_SAFARI_GAME_OVER + cp TEXT_SAFARI_GAME_OVER jp z, DisplaySafariGameOverText - cp a, TEXT_MON_FAINTED + cp TEXT_MON_FAINTED jp z, DisplayPokemonFaintedText - cp a, TEXT_BLACKED_OUT + cp TEXT_BLACKED_OUT jp z, DisplayPlayerBlackedOutText - cp a, TEXT_REPEL_WORE_OFF + cp TEXT_REPEL_WORE_OFF jp z, DisplayRepelWoreOffText ld a, [wNumSprites] ld e, a @@ -1189,24 +1189,24 @@ DisplayTextID:: ; 2817 (0:2817) ld l, a ; hl = address of the text ld a, [hl] ; a = first byte of text ; check first byte of text for special cases - cp a, $fe ; Pokemart NPC + cp $fe ; Pokemart NPC jp z, DisplayPokemartDialogue - cp a, $ff ; Pokemon Center NPC + cp $ff ; Pokemon Center NPC jp z, DisplayPokemonCenterDialogue - cp a, $fc ; Item Storage PC + cp $fc ; Item Storage PC jp z, FuncTX_ItemStoragePC - cp a, $fd ; Bill's PC + cp $fd ; Bill's PC jp z, FuncTX_BillsPC - cp a, $f9 ; Pokemon Center PC + cp $f9 ; Pokemon Center PC jp z, FuncTX_PokemonCenterPC - cp a, $f5 ; Vending Machine + cp $f5 ; Vending Machine jr nz, .notVendingMachine callba VendingMachineMenu ; jump banks to vending machine routine jr AfterDisplayingTextID .notVendingMachine - cp a, $f7 ; slot machine - jp z, FuncTX_SlotMachine - cp a, $f6 ; cable connection NPC in Pokemon Center + cp $f7 ; slot machine + jp z, FuncTX_GameCornerPrizeMenu + cp $f6 ; cable connection NPC in Pokemon Center jr nz, .notSpecialCase callab CableClubNPC jr AfterDisplayingTextID @@ -1289,7 +1289,7 @@ LoadItemList:: ; 293d (0:293d) ld a, [hli] ld [de], a inc de - cp a, $ff + cp $ff jr nz, .loop ret @@ -1352,7 +1352,7 @@ RepelWoreOffText:: ; 29c1 (0:29c1) DisplayUnknownText_29c6:: ; 29c6 (0:29c6) callab Func_fd004 ; 3f:5004 jp CloseTextDisplay - + INCLUDE "engine/menu/start_menu.asm" ; function to count how many bits are set in a string of bytes @@ -1462,7 +1462,7 @@ DisplayListMenuID:: ; 2ae0 (0:2ae0) ld a, 1 ; max menu item ID is 1 if the list has less than 2 entries ld [wMenuWatchMovingOutOfBounds], a ld a, [wListCount] - cp a, 2 ; does the list have less than 2 entries? + cp 2 ; does the list have less than 2 entries? jr c, .setMenuVariables ld a, 2 ; max menu item ID is 2 if the list has at least 2 entries .setMenuVariables @@ -1532,7 +1532,7 @@ DisplayListMenuIDLoop:: ; 2b4d (0:2b4d) ld a, c ld [wWhichPokemon], a ld a, [wListMenuID] - cp a, ITEMLISTMENU + cp ITEMLISTMENU jr nz, .skipMultiplying ; if it's an item menu sla c ; item entries are 2 bytes long, so multiply by 2 @@ -1553,7 +1553,7 @@ DisplayListMenuIDLoop:: ; 2b4d (0:2b4d) call GetItemPrice pop hl ld a, [wListMenuID] - cp a, ITEMLISTMENU + cp ITEMLISTMENU jr nz, .skipGettingQuantity ; if it's an item menu inc hl @@ -1599,7 +1599,7 @@ DisplayListMenuIDLoop:: ; 2b4d (0:2b4d) jr z, .upPressed .downPressed ld a, [hl] - add a, 3 + add 3 ld b, a ld a, [wListCount] cp b ; will going down scroll past the Cancel button? @@ -1618,7 +1618,7 @@ DisplayChooseQuantityMenu:: ; 2c51 (0:2c51) coord hl, 15, 9 lb bc, 1, 3 ; height and width ld a, [wListMenuID] - cp a, PRICEDITEMLISTMENU + cp PRICEDITEMLISTMENU jr nz, .drawTextBox ; text box dimensions/coordinates for quantity and price coord hl, 7, 9 @@ -1627,7 +1627,7 @@ DisplayChooseQuantityMenu:: ; 2c51 (0:2c51) call TextBoxBorder coord hl, 16, 10 ld a, [wListMenuID] - cp a, PRICEDITEMLISTMENU + cp PRICEDITEMLISTMENU jr nz, .printInitialQuantity coord hl, 8, 10 .printInitialQuantity @@ -1671,7 +1671,7 @@ DisplayChooseQuantityMenu:: ; 2c51 (0:2c51) .handleNewQuantity coord hl, 17, 10 ld a, [wListMenuID] - cp a, PRICEDITEMLISTMENU + cp PRICEDITEMLISTMENU jr nz, .printQuantity .printPrice ld c, $03 @@ -1764,7 +1764,7 @@ PrintListMenuEntries:: ; 2d52 (0:2d52) ld a, [wListScrollOffset] ld c, a ld a, [wListMenuID] - cp a, ITEMLISTMENU + cp ITEMLISTMENU ld a, c jr nz, .skipMultiplying ; if it's an item menu @@ -1784,7 +1784,7 @@ PrintListMenuEntries:: ; 2d52 (0:2d52) ld [wWhichPokemon], a ld a, [de] ld [wd11e], a - cp a, $ff + cp $ff jp z, .printCancelMenuItem push bc push de @@ -1794,7 +1794,7 @@ PrintListMenuEntries:: ; 2d52 (0:2d52) ld a, [wListMenuID] and a jr z, .pokemonPCMenu - cp a, $01 + cp $01 jr z, .movesMenu .itemMenu call GetItemName @@ -1882,7 +1882,7 @@ PrintListMenuEntries:: ; 2d52 (0:2d52) pop de inc de ld a, [wListMenuID] - cp a, ITEMLISTMENU + cp ITEMLISTMENU jr nz, .nextListEntry .printItemQuantity ld a, [wd11e] @@ -2054,9 +2054,9 @@ HiddenPrefix:: ; 2f33 (0:2f33) ; sets carry if item is HM, clears carry if item is not HM ; Input: a = item ID IsItemHM:: ; 2f35 (0:2f35) - cp a, HM_01 + cp HM_01 jr c, .notHM - cp a, TM_01 + cp TM_01 ret .notHM and a @@ -2123,7 +2123,7 @@ ChooseFlyDestination:: ; 2f9a (0:2f9a) Func_2fa7:: ; 2fa7 (0:2fa7) homecall Func_e8a5e ret - + SerialFunction:: ; 2fb7 (0:2fb7) ld a, [wUnknownSerialFlag_d49a] bit 0, a @@ -2147,7 +2147,7 @@ SerialFunction:: ; 2fb7 (0:2fb7) ld a, START_TRANSFER_INTERNAL_CLOCK ld [rSC], a ret - + ; causes the text box to close without waiting for a button press after displaying text DisableWaitingAfterTextDisplay:: ; 2fde (0:2fde) ld a, $01 @@ -2208,7 +2208,7 @@ IsKeyItem:: ; 3000 (0:3000) ; INPUT: ; [wTextBoxID] = text box ID DisplayTextBoxID:: ; 3010 (0:3010) - homecall_sf DisplayTextBoxID_ + homecall_sf DisplayTextBoxID_ ret UpdateGBCPal_BGP:: ; 3021 (0:3021) @@ -2232,7 +2232,7 @@ UpdateGBCPal_BGP:: ; 3021 (0:3021) .notGBC pop af ret - + UpdateGBCPal_OBP0:: ; 3040 (0:3040) push af ld a, [hGBC] @@ -2257,7 +2257,7 @@ UpdateGBCPal_OBP0:: ; 3040 (0:3040) .notGBC pop af ret - + UpdateGBCPal_OBP1:: ; 3061 (0:3061) push af ld a, [hGBC] @@ -2282,7 +2282,7 @@ UpdateGBCPal_OBP1:: ; 3061 (0:3061) .notGBC pop af ret - + Func_3082:: ; 3082 (0:3082) ld a, [H_LOADEDROMBANK] push af @@ -2332,7 +2332,7 @@ RunNPCMovementScript:: ; 30ae (0:30ae) pop af call BankswitchCommon ret - + .NPCMovementScriptPointerTables dw PalletMovementScriptPointerTable dw PewterMuseumGuyMovementScriptPointerTable @@ -2811,7 +2811,7 @@ FuncTX_BillsPC:: ; 33f9 (0:33f9) ld hl, BillsPC_ jr bankswitchAndContinue -FuncTX_SlotMachine:: ; 3403 (0:3403) +FuncTX_GameCornerPrizeMenu:: ; 3403 (0:3403) ; XXX find a better name for this function ; special_F7 ld b, BANK(CeladonPrizeMenu) @@ -2842,7 +2842,7 @@ IsItemInBag:: ; 3422 (0:3422) ld a, b and a ret - + IsSurfingPikachuInParty:: ; 342a (0:342a) ; set bit 6 of wd472 if true ; also calls Func_3467, which is a bankswitch to IsStarterPikachuInOurParty @@ -2884,7 +2884,7 @@ IsSurfingPikachuInParty:: ; 342a (0:342a) jr nz, .loop call Func_3467 ret - + Func_3467:: ; 3467 (0:3467) push hl push bc @@ -2896,7 +2896,7 @@ Func_3467:: ; 3467 (0:3467) set 7, a ld [wd472], a ret - + DisplayPokedex:: ; 347d (0:347d) ld [wd11e], a jpba _DisplayPokedex @@ -2939,7 +2939,7 @@ SpriteFunc_34a1:: ; 34a1 (0:34a1) dec h ld [hl], c ret - + ; tests if the player's coordinates are in a specified array ; INPUT: ; hl = address of array @@ -2958,7 +2958,7 @@ CheckCoords:: ; 34c4 (0:34c4) ld [wCoordIndex], a .loop ld a, [hli] - cp a, $ff ; reached terminator? + cp $ff ; reached terminator? jr z, .notInArray push hl ld hl, wCoordIndex @@ -3077,7 +3077,7 @@ GetSpriteMovementByte1Pointer:: ; 354b (0:354b) ld h, $C2 ld a, [H_SPRITEINDEX] swap a - add a, 6 + add 6 ld l, a ret @@ -3145,7 +3145,7 @@ IsFightingJessieJames:: ; 359e (0:359e) ld [hli], a ld [hl], d ret - + GetTrainerName:: ; 35bb (0:35bb) jpba GetTrainerName_ @@ -3249,7 +3249,7 @@ MoveSprite_:: ; 3640 (0:3640) ld [hli], a inc de inc c - cp a, $FF ; have we reached the end of the movement data? + cp $FF ; have we reached the end of the movement data? jr nz, .loop ld a, c @@ -3265,7 +3265,7 @@ MoveSprite_:: ; 3640 (0:3640) dec a ld [wJoyIgnore], a ld [wWastedByteCD3A], a - ret + ret ; divides [hDividend2] by [hDivisor2] and stores the quotient in [hQuotient2] DivideBytes:: ; 366e (0:366e) @@ -3485,7 +3485,7 @@ GetName:: ; 3762 (0:3762) ld e, l .nextChar ld a, [hli] - cp a, "@" + cp "@" jr nz, .nextChar inc c ;entry counter ld a, b ;wanted entry @@ -3571,9 +3571,9 @@ CopyString:: ; 3816 (0:3816) ; Just copies [hJoyPressed] to [hJoy5]. ; 2. Get currently pressed buttons at low sample rate with delay ; ([hJoy7] == 1, [hJoy6] != 0) -; If the user holds down buttons for more than half a second, +; If the user holds down buttons for more than half a second, ; report buttons as being pressed up to 12 times per second thereafter. -; If the user holds down buttons for less than half a second, +; If the user holds down buttons for less than half a second, ; report only one button press. ; 3. Same as 2, but report no buttons as pressed if A or B is held down. ; ([hJoy7] == 1, [hJoy6] == 0) @@ -3634,7 +3634,7 @@ WaitForTextScrollButtonPress:: ; 3852 (0:3852) push bc callab TownMapSpriteBlinkingAnimation ; 1c:5753 pop bc - pop de + pop de .skipAnimation coord hl, 18, 16 call HandleDownArrowBlinkTiming @@ -3744,7 +3744,7 @@ PrintLetterDelay:: ; 38c8 (0:38c8) ret ; Copies [hl, bc) to [de, bc - hl). -; In other words, the source data is from hl up to but not including bc, +; In other words, the source data is from hl up to but not including bc, ; and the destination is de. CopyDataUntil:: ; 3908 (0:3908) ld a, [hli] @@ -4207,7 +4207,7 @@ PlaceMenuCursor:: ; 3b6d (0:3b6d) jr nz, .oldMenuItemLoop .checkForArrow1 ld a, [hl] - cp a, "▶" ; was an arrow next to the previously selected menu item? + cp "▶" ; was an arrow next to the previously selected menu item? jr nz, .skipClearingArrow .clearArrow ld a, [wTileBehindCursor] @@ -4231,7 +4231,7 @@ PlaceMenuCursor:: ; 3b6d (0:3b6d) jr nz, .currentMenuItemLoop .checkForArrow2 ld a, [hl] - cp a, "▶" ; has the right arrow already been placed? + cp "▶" ; has the right arrow already been placed? jr z, .skipSavingTile ; if so, don't lose the saved tile ld [wTileBehindCursor], a ; save tile before overwriting with right arrow .skipSavingTile @@ -4247,7 +4247,7 @@ PlaceMenuCursor:: ; 3b6d (0:3b6d) ; This is used to mark a menu cursor other than the one currently being ; manipulated. In the case of submenus, this is used to show the location of -; the menu cursor in the parent menu. In the case of swapping items in list, +; the menu cursor in the parent menu. In the case of swapping items in list, ; this is used to mark the item that was first chosen to be swapped. PlaceUnfilledArrowMenuCursor:: ; 3bd9 (0:3bd9) ld b, a @@ -4271,7 +4271,7 @@ EraseMenuCursor:: ; 3be6 (0:3be6) ; This toggles a blinking down arrow at hl on and off after a delay has passed. ; This is often called even when no blinking is occurring. ; The reason is that most functions that call this initialize H_DOWNARROWBLINKCNT1 to 0. -; The effect is that if the tile at hl is initialized with a down arrow, +; The effect is that if the tile at hl is initialized with a down arrow, ; this function will toggle that down arrow on and off, but if the tile isn't ; initliazed with a down arrow, this function does nothing. ; That allows this to be called without worrying about if a down arrow should @@ -4291,7 +4291,7 @@ HandleDownArrowBlinkTiming:: ; 3bf1 (0:3bf1) dec a ld [H_DOWNARROWBLINKCNT2], a ret nz - ld a, " " + ld a, " " ld [hl], a ld a, $ff ld [H_DOWNARROWBLINKCNT1], a @@ -4357,7 +4357,7 @@ FarPrintText:: ; 3c4c (0:3c4c) pop af call BankswitchCommon ret - + PrintNumber:: ; 3c5b (0:3c5b) ; Print the c-digit, b-byte value at de. ; Allows 2 to 7 digits. For 1-digit numbers, add @@ -4562,7 +4562,7 @@ endm ret .NextDigit: ; 3d85 (0:3d85) -; Increment unless the number is left-aligned, +; Increment unless the number is left-aligned, ; leading zeroes are not printed, and no digits ; have been printed yet. bit BIT_LEADING_ZEROES, d @@ -4717,7 +4717,7 @@ ReloadMapSpriteTilePatterns:: ; 3e1e (0:3e1e) GiveItem:: ; 3e3f (0:3e3f) -; Give player quantity c of item b, +; Give player quantity c of item b, ; and copy the item's name to wcf4b. ; Return carry on success. ld a, b @@ -4760,7 +4760,7 @@ BankswitchCommon:: ; 3e7e (0:3e7e) ld [H_LOADEDROMBANK], a ld [MBC1RomBank], a ret - + Bankswitch:: ; 3e84 (0:3e84) ; self-contained bankswitch, use this when not in the home bank ; switches to the bank in b @@ -4787,7 +4787,7 @@ SwitchSRAMBankAndLatchClockData:: ; 3e99 (0:3e99) pop af ld [MBC1SRamBank], a ret - + PrepareRTCDataAndDisableSRAM:: ; 3ea9 (0:3ea9) push af ld a, $0 @@ -4795,7 +4795,7 @@ PrepareRTCDataAndDisableSRAM:: ; 3ea9 (0:3ea9) ld [MBC1SRamEnable], a pop af ret - + INCLUDE "home/predef.asm" UpdateCinnabarGymGateTileBlocks:: ; 3ef0 (0:3ef0) @@ -4863,8 +4863,8 @@ SetMapTextPointer:: ; 3f54 (0:3f54) ret TextPredefs:: ; 3f67 (0:3f67) -const_value = 1 - +const_value = 1 + add_tx_pre CardKeySuccessText ; 01 add_tx_pre CardKeyFailText ; 02 add_tx_pre RedBedroomPCText ; 03 @@ -350,9 +350,13 @@ TX_FAR: MACRO dab \1 ENDM - +TX_VENDING_MACHINE EQUS "db $f5" TX_CABLE_CLUB_RECEPTIONIST EQUS "db $f6" TX_PRIZE_VENDOR EQUS "db $f7" +TX_POKECENTER_PC EQUS "db $f9" +TX_PLAYERS_PC EQUS "db $fc" +TX_BILLS_PC EQUS "db $fd" +TX_POKEMART_CLERK EQUS "db $fe" TX_POKECENTER_NURSE EQUS "db $ff" ; Predef macro. @@ -955,7 +955,13 @@ INCLUDE "scripts/celadonmart5.asm" INCLUDE "data/mapObjects/celadonmart5.asm" CeladonMart5Blocks: INCBIN "maps/celadonmart5.blk" - dr $49107,$492a9 + +INCLUDE "data/mapHeaders/celadonprizeroom.asm" +INCLUDE "scripts/celadonprizeroom.asm" +INCLUDE "data/mapObjects/celadonprizeroom.asm" +CeladonPrizeRoomBlocks: +INCBIN "maps/celadonprizeroom.blk" + dr $49168,$492a9 INCLUDE "data/mapHeaders/mtmoonpokecenter.asm" INCLUDE "scripts/mtmoonpokecenter.asm" diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index 9af229c6..0013be1b 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -491,7 +491,7 @@ CeladonGameCornerScript_48f1e: ; 48f1e (12:4f1e) call PlaceString coord hl, 12, 3 ld de, wPlayerMoney - ld c, 3 | MONEY_SIGH | LEADING_ZEROES + ld c, 3 | MONEY_SIGN | LEADING_ZEROES call PrintBCDNumber coord hl, 12, 4 ld de, GameCornerCoinText diff --git a/scripts/celadonmartroof.asm b/scripts/celadonmartroof.asm index b129753d..4d819be7 100755 --- a/scripts/celadonmartroof.asm +++ b/scripts/celadonmartroof.asm @@ -252,7 +252,7 @@ CeladonMartRoofText4: ; 4859d (12:459d) db "@" CeladonMartRoofText5: ; 485a2 (12:45a2) - db $f5 + TX_VENDING_MACHINE CeladonMartRoofText6: ; 485a3 (12:45a3) TX_FAR _CeladonMartRoofText6 diff --git a/scripts/viridianmart.asm b/scripts/viridianmart.asm index 05e566fb..b69e24c2 100755 --- a/scripts/viridianmart.asm +++ b/scripts/viridianmart.asm @@ -93,7 +93,7 @@ ViridianMartText4: ; 1d4f5 (7:54f5) ViridianMartText5: ; 1d4fa (7:54fa) TX_FAR ViridianMartParcelQuestText - db $11 + TX_SFX_KEY_ITEM db "@" ViridianMartText2: ; 1d500 (7:5500) @@ -1,4 +1,4 @@ - +INCLUDE "constants/text_constants.asm" TEXT_1 EQU $26 TEXT_2 EQU $27 TEXT_3 EQU $28 @@ -21,7 +21,7 @@ _CardKeySuccessText1:: text "Bingo!@@" _CardKeySuccessText2:: - db $0 + text "" line "The CARD KEY" cont "opened the door!" done @@ -75,7 +75,7 @@ _PokeCenterSignText:: done _FoundItemText:: - text $52, " found" + text "<PLAYER> found" line "@" TX_RAM wcf4b text "!@@" @@ -92,7 +92,7 @@ _OaksAideHiText:: para "If you caught @" TX_NUM hOaksAideRequirement, 1, 3 - db $0 + text "" line "kinds of #MON," cont "I'm supposed to" cont "give you an" @@ -100,7 +100,7 @@ _OaksAideHiText:: TX_RAM wOaksAideRewardItemName text "!" - para "So, ", $52, "! Have" + para "So, <PLAYER>! Have" line "you caught at" cont "least @" TX_NUM hOaksAideRequirement, 1, 3 @@ -113,7 +113,7 @@ _OaksAideUhOhText:: line "Uh-oh! You have" cont "caught only @" TX_NUM hOaksAideNumMonsOwned, 1, 3 - db $0 + text "" cont "kinds of #MON!" para "You need @" @@ -130,7 +130,7 @@ _OaksAideComeBackText:: para "When you get @" TX_NUM hOaksAideRequirement, 1, 3 - db $0 + text "" line "kinds, come back" cont "for @" TX_RAM wOaksAideRewardItemName @@ -149,7 +149,7 @@ _OaksAideHereYouGoText:: prompt _OaksAideGotItemText:: - text $52, " got the" + text "<PLAYER> got the" line "@" TX_RAM wOaksAideRewardItemName text "!@@" @@ -241,10 +241,10 @@ _AIBattleWithdrawText:: _AIBattleUseItemText:: TX_RAM wTrainerName - db $0 + text "" line "used @" TX_RAM wcd6d - db $0 + text "" cont "on @" TX_RAM wEnemyMonNick text "!" @@ -268,7 +268,7 @@ _TradeWentToText:: done _TradeForText:: - text "For ", $52, "'s" + text "For <PLAYER>'s" line "@" TX_RAM wcf4b text "," @@ -306,11 +306,11 @@ _TradeWillTradeText:: text " will" line "trade @" TX_RAM wcd6d - db $0 + text "" done _TradeforText:: - text "for ", $52, "'s" + text "for <PLAYER>'s" line "@" TX_RAM wcf4b text "." @@ -362,7 +362,7 @@ _YeahText:: _DexSeenOwnedText:: text "#DEX Seen:@" TX_NUM wDexRatingNumMonsSeen, 1, 3 - db $0 + text "" line " Owned:@" TX_NUM wDexRatingNumMonsOwned, 1, 3 db "@" @@ -373,27 +373,27 @@ _DexRatingText:: _GymStatueText1:: TX_RAM wGymCityName - db $0 + text "" line "#MON GYM" cont "LEADER: @" TX_RAM wGymLeaderName - db $0 + text "" para "WINNING TRAINERS:" - line $53 + line "<RIVAL>" done _GymStatueText2:: TX_RAM wGymCityName - db $0 + text "" line "#MON GYM" cont "LEADER: @" TX_RAM wGymLeaderName - db $0 + text "" para "WINNING TRAINERS:" - line $53 - cont $52 + line "<RIVAL>" + cont "<PLAYER>" done _ViridianCityPokecenterGuyText:: @@ -596,14 +596,14 @@ _CinnabarGymQuizIntroText:: para "Then get it right!" line "Here we go!" - db $51 + para "" done _CinnabarGymQuizShortIntroText:: text "#MON Quiz!" line "Test your skill!" - db $51 + para "" done _CinnabarQuizQuestionsText1:: @@ -666,7 +666,7 @@ _BillsHouseMonitorText:: done _BillsHouseInitiatedText:: - text $52, " initiated" + text "<PLAYER> initiated" line "TELEPORTER's Cell" cont "Separator!@@" @@ -840,7 +840,7 @@ _IndigoPlateauHQText:: done _RedBedroomSNESText:: - text $52, " is" + text "<PLAYER> is" line "playing the SNES!" cont "...Okay!" cont "It's time to go!" @@ -1019,31 +1019,31 @@ _VermilionGymTrashFailText:: cont "locks were reset!@@" _FoundHiddenItemText:: - text $52, " found" + text "<PLAYER> found" line "@" TX_RAM wcd6d text "!@@" _HiddenItemBagFullText:: - text "But, ", $52, " has" + text "But, <PLAYER> has" line "no more room for" cont "other items!" done _FoundHiddenCoinsText:: - text $52, " found" + text "<PLAYER> found" line "@" - TX_BCD hCoins, $c2 + TX_BCD hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN text " coins!@@" _FoundHiddenCoins2Text:: - text $52, " found" + text "<PLAYER> found" line "@" - TX_BCD hCoins, $c2 + TX_BCD hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN text " coins!@@" _DroppedHiddenCoinsText:: - db $0 + text "" para "Oops! Dropped" line "some coins!" done @@ -1097,48 +1097,48 @@ _OutOfSafariBallsText:: _WildRanText:: text "Wild @" TX_RAM wEnemyMonNick - db $0 + text "" line "ran!" prompt _EnemyRanText:: text "Enemy @" TX_RAM wEnemyMonNick - db $0 + text "" line "ran!" prompt _HurtByPoisonText:: - text $5a, "'s" + text "<USER>'s" line "hurt by poison!" prompt _HurtByBurnText:: - text $5a, "'s" + text "<USER>'s" line "hurt by the burn!" prompt _HurtByLeechSeedText:: text "LEECH SEED saps" - line $5a, "!" + line "<USER>!" prompt _EnemyMonFaintedText:: text "Enemy @" TX_RAM wEnemyMonNick - db $0 + text "" line "fainted!" prompt _MoneyForWinningText:: - text $52, " got ¥@" - TX_BCD wAmountMoneyWon, $c3 - db $0 + text "<PLAYER> got ¥@" + TX_BCD wAmountMoneyWon, 3 | LEADING_ZEROES | LEFT_ALIGN + text "" line "for winning!" prompt _TrainerDefeatedText:: - text $52, " defeated" + text "<PLAYER> defeated" line "@" TX_RAM wTrainerName text "!" @@ -1146,7 +1146,7 @@ _TrainerDefeatedText:: _PlayerMonFaintedText:: TX_RAM wBattleMonNick - db $0 + text "" line "fainted!" prompt @@ -1155,20 +1155,20 @@ _UseNextMonText:: done _Sony1WinText:: - text $53, ": Yeah! Am" + text "<RIVAL>: Yeah! Am" line "I great or what?" prompt _PlayerBlackedOutText2:: - text $52, " is out of" + text "<PLAYER> is out of" line "useable #MON!" - para $52, " blacked" + para "<PLAYER> blacked" line "out!" prompt _LinkBattleLostText:: - text $52, " lost to" + text "<PLAYER> lost to" line "@" TX_RAM wTrainerName text "!" @@ -1182,7 +1182,7 @@ _TrainerAboutToUseText:: TX_RAM wEnemyMonNick text "!" - para "Will ", $52 + para "Will <PLAYER>" line "change #MON?" done @@ -1247,7 +1247,7 @@ _NoMovesLeftText:: _MultiHitText:: text "Hit the enemy" line "@" - TX_NUM wPlayerNumHits,1,1 + TX_NUM wPlayerNumHits, 1, 1 text " times!" prompt @@ -1263,42 +1263,42 @@ _GetOutText:: prompt _FastAsleepText:: - text $5A + text "<USER>" line "is fast asleep!" prompt _WokeUpText:: - text $5A + text "<USER>" line "woke up!" prompt _IsFrozenText:: - text $5A + text "<USER>" line "is frozen solid!" prompt _FullyParalyzedText:: - text $5A,"'s" + text "<USER>'s" line "fully paralyzed!" prompt _FlinchedText:: - text $5A + text "<USER>" line "flinched!" prompt _MustRechargeText:: - text $5A + text "<USER>" line "must recharge!" prompt _DisabledNoMoreText:: - text $5A,"'s" + text "<USER>'s" line "disabled no more!" prompt _IsConfusedText:: - text $5A + text "<USER>" line "is confused!" prompt @@ -1308,37 +1308,37 @@ _HurtItselfText:: prompt _ConfusedNoMoreText:: - text $5A,"'s" + text "<USER>'s" line "confused no more!" prompt _SavingEnergyText:: - text $5A + text "<USER>" line "is saving energy!" prompt _UnleashedEnergyText:: - text $5A + text "<USER>" line "unleashed energy!" prompt _ThrashingAboutText:: - text $5A,"'s" + text "<USER>'s" line "thrashing about!" done _AttackContinuesText:: - text $5A,"'s" + text "<USER>'s" line "attack continues!" done _CantMoveText:: - text $5A + text "<USER>" line "can't move!" prompt _MoveIsDisabledText:: - text $5a, "'s" + text "<USER>'s" line "@" TX_RAM wcd6d text " is" @@ -1346,14 +1346,14 @@ _MoveIsDisabledText:: prompt _MonName1Text:: - text $5a, "@@" + text "<USER>@@" _Used1Text:: - db $0 + text "" line "used @@" _Used2Text:: - db $0 + text "" line "used @@" _InsteadText:: @@ -1385,24 +1385,24 @@ _ExclamationPoint5Text:: done _AttackMissedText:: - text $5a, "'s" + text "<USER>'s" line "attack missed!" prompt _KeptGoingAndCrashedText:: - text $5a + text "<USER>" line "kept going and" cont "crashed!" prompt _UnaffectedText:: - text $59, "'s" + text "<TARGET>'s" line "unaffected!" prompt _DoesntAffectMonText:: text "It doesn't affect" - line $59, "!" + line "<TARGET>!" prompt _CriticalHitText:: @@ -1439,23 +1439,23 @@ _TurnedAwayText:: _IgnoredOrdersText:: TX_RAM wBattleMonNick - db $0 + text "" line "ignored orders!" prompt _SubstituteTookDamageText:: text "The SUBSTITUTE" line "took damage for" - cont $59, "!" + cont "<TARGET>!" prompt _SubstituteBrokeText:: - text $59, "'s" + text "<TARGET>'s" line "SUBSTITUTE broke!" prompt _BuildingRageText:: - text $5a, "'s" + text "<USER>'s" line "RAGE is building!" prompt @@ -1508,21 +1508,21 @@ _NotVeryEffectiveText:: _SafariZoneEatingText:: text "Wild @" TX_RAM wEnemyMonNick - db $0 + text "" line "is eating!" prompt _SafariZoneAngryText:: text "Wild @" TX_RAM wEnemyMonNick - db $0 + text "" line "is angry!" prompt _WildMonAppearedText:: text "Wild @" TX_RAM wEnemyMonNick - db $0 + text "" line "appeared!" prompt @@ -1530,7 +1530,7 @@ _HookedMonAttackedText:: text "The hooked" line "@" TX_RAM wEnemyMonNick - db $0 + text "" cont "attacked!" prompt @@ -1539,7 +1539,7 @@ SECTION "Text 3", ROMX, BANK[TEXT_3] _EnemyAppearedText:: TX_RAM wEnemyMonNick - db $0 + text "" line "appeared!" prompt @@ -1592,15 +1592,15 @@ _GoodText:: text "good!@@" _ComeBackText:: - db $0 + text "" line "Come back!" done ; money related _PickUpPayDayMoneyText:: - text $52, " picked up" + text "<PLAYER> picked up" line "¥@" - TX_BCD wTotalPayDayMoney, $c3 + TX_BCD wTotalPayDayMoney, 3 | LEADING_ZEROES | LEFT_ALIGN text "!" prompt @@ -1645,7 +1645,7 @@ _PartyMenuSwapMonText:: _PotionText:: TX_RAM wcd6d - db $0 + text "" line "recovered by @" TX_NUM wHPBarHPDifference, 2, 3 text "!" @@ -1677,7 +1677,7 @@ _IceHealText:: _AwakeningText:: TX_RAM wcd6d - db $0 + text "" line "woke up!" done @@ -1689,7 +1689,7 @@ _FullHealText:: _ReviveText:: TX_RAM wcd6d - db $0 + text "" line "is revitalized!" done @@ -1697,11 +1697,11 @@ _RareCandyText:: TX_RAM wcd6d text " grew" line "to level @" - TX_NUM wCurEnemyLVL, $1,$3 + TX_NUM wCurEnemyLVL, 1, 3 text "!@@" _TurnedOnPC1Text:: - text $52, " turned on" + text "<PLAYER> turned on" line "the PC." prompt @@ -1729,7 +1729,7 @@ _AccessedMyPCText:: prompt _TurnedOnPC2Text:: - text $52, " turned on" + text "<PLAYER> turned on" line "the PC." prompt @@ -1865,7 +1865,7 @@ _CantTakeMonText:: prompt _PikachuUnhappyText:: - TX_RAM $cd6d + TX_RAM wcd6d text " looks" line "unhappy about it!" prompt @@ -1970,13 +1970,13 @@ _DoYouWantToNicknameText:: _YourNameIsText:: text "Right! So your" - line "name is ", $52, "!" + line "name is <PLAYER>!" prompt _HisNameIsText:: text "That's right! I" line "remember now! His" - cont "name is ", $53, "!" + cont "name is <RIVAL>!" prompt _WillBeTradedText:: @@ -2049,19 +2049,19 @@ _ColosseumTotalL50Text:: prompt _ColosseumHeightText:: - TX_RAM $CD6D + TX_RAM wcd6d text " is over" line "6′8″ tall!" prompt _ColosseumWeightText:: - TX_RAM $CD6D + TX_RAM wcd6d text " weighs" line "over 44 pounds!" prompt _ColosseumEvolvedText:: - TX_RAM $CD6D + TX_RAM wcd6d text " is an" line "evolved #MON!" prompt @@ -2092,12 +2092,12 @@ _ColosseumVersionText:: prompt _Char00Text:: - TX_NUM hSpriteIndexOrTextID,1,2 + TX_NUM hSpriteIndexOrTextID, 1, 2 text " error." done _Char55Text:: - text $4B,"@@" + text $4B, "@@" _NoPokemonText:: text "There are no" @@ -2183,7 +2183,7 @@ _SavingText:: done _GameSavedText:: - text $52, " saved" + text "<PLAYER> saved" line "the game!" done @@ -2203,7 +2203,7 @@ _WhenYouChangeBoxText:: _ChooseABoxText:: text "Choose a" - line $4a, " BOX.@@" + line "<pkmn> BOX.@@" _EvolvedText:: TX_RAM wcf4b @@ -2211,7 +2211,7 @@ _EvolvedText:: done _IntoText:: - db $0 + text "" line "into @" TX_RAM wcd6d text "!" @@ -2220,7 +2220,7 @@ _IntoText:: _StoppedEvolvingText:: text "Huh? @" TX_RAM wcf4b - db $0 + text "" line "stopped evolving!" prompt @@ -2230,47 +2230,47 @@ SECTION "Text 5", ROMX, BANK[TEXT_5] _IsEvolvingText:: text "What? @" TX_RAM wcf4b - db $0 + text "" line "is evolving!" done _FellAsleepText:: - text $59 + text "<TARGET>" line "fell asleep!" prompt _AlreadyAsleepText:: - text $59, "'s" + text "<TARGET>'s" line "already asleep!" prompt _PoisonedText:: - text $59 + text "<TARGET>" line "was poisoned!" prompt _BadlyPoisonedText:: - text $59, "'s" + text "<TARGET>'s" line "badly poisoned!" prompt _BurnedText:: - text $59 + text "<TARGET>" line "was burned!" prompt _FrozenText:: - text $59 + text "<TARGET>" line "was frozen solid!" prompt _FireDefrostedText:: text "Fire defrosted" - line $59, "!" + line "<TARGET>!" prompt _MonsStatsRoseText:: - text $5a, "'s" + text "<USER>'s" line "@" TX_RAM wcf4b text "@@" @@ -2283,7 +2283,7 @@ _RoseText:: prompt _MonsStatsFellText:: - text $59, "'s" + text "<TARGET>'s" line "@" TX_RAM wcf4b text "@@" @@ -2296,60 +2296,60 @@ _FellText:: prompt _RanFromBattleText:: - text $5a + text "<USER>" line "ran from battle!" prompt _RanAwayScaredText:: - text $59 + text "<TARGET>" line "ran away scared!" prompt _WasBlownAwayText:: - text $59 + text "<TARGET>" line "was blown away!" prompt _ChargeMoveEffectText:: - text $5a, "@@" + text "<USER>@@" _MadeWhirlwindText:: - db $0 + text "" line "made a whirlwind!" prompt _TookInSunlightText:: - db $0 + text "" line "took in sunlight!" prompt _LoweredItsHeadText:: - db $0 + text "" line "lowered its head!" prompt _SkyAttackGlowingText:: - db $0 + text "" line "is glowing!" prompt _FlewUpHighText:: - db $0 + text "" line "flew up high!" prompt _DugAHoleText:: - db $0 + text "" line "dug a hole!" prompt _BecameConfusedText:: - text $59 + text "<TARGET>" line "became confused!" prompt _MimicLearnedMoveText:: - text $5a + text "<USER>" line "learned" cont "@" TX_RAM wcd6d @@ -2357,7 +2357,7 @@ _MimicLearnedMoveText:: prompt _MoveWasDisabledText:: - text $59, "'s" + text "<TARGET>'s" line "@" TX_RAM wcd6d text " was" @@ -2378,16 +2378,16 @@ _ButItFailedText:: _DidntAffectText:: text "It didn't affect" - line $59, "!" + line "<TARGET>!" prompt _IsUnaffectedText:: - text $59 + text "<TARGET>" line "is unaffected!" prompt _ParalyzedMayNotAttackText:: - text $59, "'s" + text "<TARGET>'s" line "paralyzed! It may" cont "not attack!" prompt @@ -2398,7 +2398,7 @@ _SubstituteText:: prompt _HasSubstituteText:: - text $5a + text "<USER>" line "has a SUBSTITUTE!" prompt @@ -2408,23 +2408,23 @@ _TooWeakSubstituteText:: prompt _WasSeededText:: - text $59 + text "<TARGET>" line "was seeded!" prompt _EvadedAttackText:: - text $59 + text "<TARGET>" line "evaded attack!" prompt _HitWithRecoilText:: - text $5a, "'s" + text "<USER>'s" line "hit with recoil!" prompt _ConvertedTypeText:: text "Converted type to" - line $59, "'s!" + line "<TARGET>'s!" prompt _StatusChangesEliminatedText:: @@ -2433,28 +2433,28 @@ _StatusChangesEliminatedText:: prompt _GettingPumpedText:: - text $5a, "'s" + text "<USER>'s" line "getting pumped!" prompt _StartedSleepingEffect:: - text $5a + text "<USER>" line "started sleeping!" done _FellAsleepBecameHealthyText:: - text $5a + text "<USER>" line "fell asleep and" cont "became healthy!" done _RegainedHealthText:: - text $5a + text "<USER>" line "regained health!" prompt _TransformedText:: - text $5a + text "<USER>" line "transformed into" cont "@" TX_RAM wcd6d @@ -2462,18 +2462,18 @@ _TransformedText:: prompt _LightScreenProtectedText:: - text $5a, "'s" + text "<USER>'s" line "protected against" cont "special attacks!" prompt _ReflectGainedArmorText:: - text $5a + text "<USER>" line "gained armor!" prompt _ShroudedInMistText:: - text $5a, "'s" + text "<USER>'s" line "shrouded in mist!" prompt @@ -2484,11 +2484,11 @@ _CoinsScatteredText:: _SuckedHealthText:: text "Sucked health from" - line $59, "!" + line "<TARGET>!" prompt _DreamWasEatenText:: - text $59, "'s" + text "<TARGET>'s" line "dream was eaten!" prompt @@ -2619,15 +2619,15 @@ _PokemartGreetingText:: _PokemonFaintedText:: TX_RAM wcd6d - db $0 + text "" line "fainted!" done _PlayerBlackedOutText:: - text $52, " is out of" + text "<PLAYER> is out of" line "useable #MON!" - para $52, " blacked" + para "<PLAYER> blacked" line "out!" prompt @@ -2645,7 +2645,7 @@ _PokemartTellBuyPriceText:: text "?" line "That will be" cont "¥@" - TX_BCD hMoney, $c3 + TX_BCD hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN text ". OK?" done @@ -2672,7 +2672,7 @@ _PokemonSellingGreetingText:: _PokemartTellSellPriceText:: text "I can pay you" line "¥@" - TX_BCD hMoney, $c3 + TX_BCD hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN text " for that." done @@ -2716,7 +2716,7 @@ _AbandonLearningText:: _DidNotLearnText:: TX_RAM wLearnMoveMonName - db $0 + text "" line "did not learn" cont "@" TX_RAM wcf4b @@ -2733,7 +2733,7 @@ _TryingToLearnText:: para "But, @" TX_RAM wLearnMoveMonName - db $0 + text "" line "can't learn more" cont "than 4 moves!" @@ -2751,7 +2751,7 @@ _PoofText:: text " Poof!@@" _ForgotAndText:: - db $0 + text "" para "@" TX_RAM wLearnMoveMonName text " forgot" @@ -2912,7 +2912,7 @@ _CyclingIsFunText:: prompt _GotMonText:: - text $52, " got" + text "<PLAYER> got" line "@" TX_RAM wcd6d text "!@@" @@ -3009,7 +3009,7 @@ _ItemUseBallText06:: text "!@@" _SurfingGotOnText:: - text $52, " got on" + text "<PLAYER> got on" line "@" TX_RAM wcd6d text "!" @@ -3022,7 +3022,7 @@ _SurfingNoPlaceToGetOffText:: _RefusingText:: TX_RAM wcd6d - db $0 + text "" line "is refusing!" prompt @@ -3040,12 +3040,12 @@ _VitaminNoEffectText:: prompt _ThrewBaitText:: - text $52, " threw" + text "<PLAYER> threw" line "some BAIT." done _ThrewRockText:: - text $52, " threw a" + text "<PLAYER> threw a" line "ROCK." done @@ -3063,13 +3063,13 @@ _FluteWokeUpText:: prompt _PlayedFluteHadEffectText:: - text $52, " played the" + text "<PLAYER> played the" line "# FLUTE.@@" _CoinCaseNumCoinsText:: text "Coins" line "@" - TX_BCD wPlayerCoins, $c2 + TX_BCD wPlayerCoins, 2 | LEADING_ZEROES | LEFT_ALIGN text " " prompt @@ -3126,7 +3126,7 @@ _TeachMachineMoveText:: para "Teach @" TX_RAM wcf4b - db $0 + text "" line "to a #MON?" done @@ -3145,7 +3145,7 @@ _MonCannotLearnMachineMoveText:: prompt _ItemUseNotTimeText:: - text "OAK: ", $52, "!" + text "OAK: <PLAYER>!" line "This isn't the" cont "time to use that! " prompt @@ -3193,7 +3193,7 @@ _DontHavePokemonText:: prompt _ItemUseText001:: - text $52," used@@" + text "<PLAYER> used@@" _ItemUseText002:: TX_RAM wcf4b @@ -3201,7 +3201,7 @@ _ItemUseText002:: done _GotOnBicycleText1:: - text $52, " got on the@@" + text "<PLAYER> got on the@@" _GotOnBicycleText2:: TX_RAM wcf4b @@ -3209,7 +3209,7 @@ _GotOnBicycleText2:: prompt _GotOffBicycleText1:: - text $52, " got off@@" + text "<PLAYER> got off@@" _GotOffBicycleText2:: text "the @" @@ -3250,7 +3250,7 @@ _ConnectCableText:: prompt _TradedForText:: - text $52, " traded" + text "<PLAYER> traded" line "@" TX_RAM wInGameTradeGiveMonName text " for" @@ -3302,7 +3302,7 @@ _WannaTrade2Text:: para "your @" TX_RAM wInGameTradeGiveMonName - db $0 + text "" line "for @" TX_RAM wInGameTradeReceiveMonName text "?" diff --git a/text/maps/hall_of_fame.asm b/text/maps/hall_of_fame.asm index e4b8de4f..cbb0e52b 100644 --- a/text/maps/hall_of_fame.asm +++ b/text/maps/hall_of_fame.asm @@ -1,7 +1,7 @@ _HallofFameRoomText1:: text "OAK: Er-hem!" line "Congratulations," - cont $52, "!" + cont "<PLAYER>!" para "This floor is the" line "#MON HALL OF" @@ -16,13 +16,13 @@ _HallofFameRoomText1:: line "also recorded in" cont "the HALL OF FAME!" - para $52, "! You have" + para "<PLAYER>! You have" line "endeavored hard" cont "to become the new" cont "LEAGUE champion!" para "Congratulations," - line $52, ", you and" + line "<PLAYER>, you and" cont "your #MON are" cont "HALL OF FAMERs!" done |