Merge pull request #259 from Rangi42/master

Port pokecrystal's formatting of text commands and special characters
This commit is contained in:
Rangi 2020-07-05 19:58:21 -04:00 committed by GitHub
commit c57c93d2b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
442 changed files with 8821 additions and 8731 deletions

38
.gitignore vendored
View file

@ -1,13 +1,12 @@
# precompiled python
*.pyc
# compiled object file
# compiled objects
*.o
# no binaries
*.exe
# compiled graphics
*.1bpp
*.2bpp
*.pic
# roms
# compiled roms
*.gbc
*.gb
@ -15,22 +14,17 @@
*.map
*.sym
# converted image data
*.2bpp
*.1bpp
*.pic
# tool binaries
*.exe
# swap files for vim
.*.swp
# precompiled python
*.pyc
*$py.class
# no data from extras/
*.json
# for any of the poor souls with save game files in their working directory
# save game files
*.sgm
*.sav
*.sys
# for vim configuration
# url: http://www.vim.org/scripts/script.php?script_id=441
.lvimrc
*.rtc
*.sn*
*.sa*
*.sg1

View file

@ -17,7 +17,11 @@ pokeblue_obj := $(rom_obj:.o=_blue.o)
### Build tools
MD5 := md5sum -c
ifeq (,$(shell which sha1sum))
SHA1 := shasum
else
SHA1 := sha1sum
endif
RGBDS ?=
RGBASM ?= $(RGBDS)rgbasm
@ -47,9 +51,8 @@ tidy:
rm -f $(roms) $(pokered_obj) $(pokeblue_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym) rgbdscheck.o
$(MAKE) clean -C tools/
# For contributors to make sure a change didn't affect the original contents of the ROMs.
compare: $(roms)
@$(MD5) roms.md5
@$(SHA1) -c roms.sha1
tools:
$(MAKE) -C tools/
@ -103,12 +106,12 @@ pokeblue_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON BLUE"
gfx/battle/attack_anim_1.2bpp: tools/gfx += --trim-whitespace
gfx/battle/attack_anim_2.2bpp: tools/gfx += --trim-whitespace
gfx/intro_credits/blue_jigglypuff_1.2bpp: $(RGBGFX) += -h
gfx/intro_credits/blue_jigglypuff_2.2bpp: $(RGBGFX) += -h
gfx/intro_credits/blue_jigglypuff_3.2bpp: $(RGBGFX) += -h
gfx/intro_credits/red_nidorino_1.2bpp: $(RGBGFX) += -h
gfx/intro_credits/red_nidorino_2.2bpp: $(RGBGFX) += -h
gfx/intro_credits/red_nidorino_3.2bpp: $(RGBGFX) += -h
gfx/intro_credits/blue_jigglypuff_1.2bpp: rgbgfx += -h
gfx/intro_credits/blue_jigglypuff_2.2bpp: rgbgfx += -h
gfx/intro_credits/blue_jigglypuff_3.2bpp: rgbgfx += -h
gfx/intro_credits/red_nidorino_1.2bpp: rgbgfx += -h
gfx/intro_credits/red_nidorino_2.2bpp: rgbgfx += -h
gfx/intro_credits/red_nidorino_3.2bpp: rgbgfx += -h
gfx/intro_credits/the_end.2bpp: tools/gfx += --interleave --png=$<
@ -131,7 +134,7 @@ gfx/trade/game_boy.2bpp: tools/gfx += --remove-duplicates
tools/gfx $(tools/gfx) -o $@ $@)
%.1bpp: %.png
$(RGBGFX) -d1 $(rgbgfx) -o $@ $<
$(RGBGFX) $(rgbgfx) -d1 -o $@ $<
$(if $(tools/gfx),\
tools/gfx $(tools/gfx) -d1 -o $@ $@)

View file

@ -1,27 +1,30 @@
# Pokémon Red and Blue
# Pokémon Red and Blue [![Build Status][travis-badge]][travis]
This is a disassembly of Pokémon Red and Blue.
It builds the following roms:
It builds the following ROMs:
* Pokemon Red (UE) [S][!].gb `md5: 3d45c1ee9abd5738df46d2bdda8b57dc`
* Pokemon Blue (UE) [S][!].gb `md5: 50927e843568814f7ed45ec4f944bd8b`
- Pokemon Red (UE) [S][!].gb `sha1: ea9bcae617fdf159b045185467ae58b2e4a48b9a`
- Pokemon Blue (UE) [S][!].gb `sha1: d7037c83e1ae5b39bde3c30787637ba1d4c48ce2`
To set up the repository, see [**INSTALL.md**](INSTALL.md).
## See also
* Disassembly of [**Pokémon Yellow**][pokeyellow]
* Disassembly of [**Pokémon Gold**][pokegold]
* Disassembly of [**Pokémon Crystal**][pokecrystal]
* Disassembly of [**Pokémon Pinball**][pokepinball]
* Disassembly of [**Pokémon TCG**][poketcg]
* Disassembly of [**Pokémon Ruby**][pokeruby]
* Disassembly of [**Pokémon Fire Red**][pokefirered]
* Disassembly of [**Pokémon Emerald**][pokeemerald]
* Discord: [**pret**][Discord]
* irc: **irc.freenode.net** [**#pret**][irc]
- **Discord:** [pret][discord]
- **IRC:** [freenode#pret][irc]
Other disassembly projects:
- [**Pokémon Yellow**][pokeyellow]
- [**Pokémon Gold/Silver**][pokegold]
- [**Pokémon Crystal**][pokecrystal]
- [**Pokémon Pinball**][pokepinball]
- [**Pokémon TCG**][poketcg]
- [**Pokémon Ruby**][pokeruby]
- [**Pokémon FireRed**][pokefirered]
- [**Pokémon Emerald**][pokeemerald]
[pokeyellow]: https://github.com/pret/pokeyellow
[pokegold]: https://github.com/pret/pokegold
@ -31,5 +34,7 @@ To set up the repository, see [**INSTALL.md**](INSTALL.md).
[pokeruby]: https://github.com/pret/pokeruby
[pokefirered]: https://github.com/pret/pokefirered
[pokeemerald]: https://github.com/pret/pokeemerald
[Discord]: https://discord.gg/d5dubZ3
[discord]: https://discord.gg/d5dubZ3
[irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret
[travis]: https://travis-ci.org/pret/pokered
[travis-badge]: https://travis-ci.org/pret/pokered.svg?branch=master

View file

@ -1,173 +1,94 @@
charmap "ガ", $05
charmap "ギ", $06
charmap "グ", $07
charmap "ゲ", $08
charmap "ゴ", $09
charmap "ザ", $0A
charmap "ジ", $0B
charmap "ズ", $0C
charmap "ゼ", $0D
charmap "ゾ", $0E
charmap "ダ", $0F
charmap "ヂ", $10
charmap "ヅ", $11
charmap "デ", $12
charmap "ド", $13
charmap "バ", $19
charmap "ビ", $1A
charmap "ブ", $1B
charmap "ボ", $1C
charmap "が", $26
charmap "ぎ", $27
charmap "ぐ", $28
charmap "げ", $29
charmap "ご", $2A
charmap "ざ", $2B
charmap "じ", $2C
charmap "ず", $2D
charmap "ぜ", $2E
charmap "ぞ", $2F
charmap "だ", $30
charmap "ぢ", $31
charmap "づ", $32
charmap "で", $33
charmap "ど", $34
charmap "ば", $3A
charmap "び", $3B
charmap "ぶ", $3C
charmap "べ", $3D
charmap "ぼ", $3E
charmap "パ", $40
charmap "ピ", $41
charmap "プ", $42
charmap "ポ", $43
charmap "ぱ", $44
charmap "ぴ", $45
charmap "ぷ", $46
charmap "ぺ", $47
charmap "ぽ", $48
charmap "ア", $80
charmap "イ", $81
charmap "ウ", $82
charmap "エ", $83
charmap "ォ", $84
charmap "カ", $85
charmap "キ", $86
charmap "ク", $87
charmap "ケ", $88
charmap "コ", $89
charmap "サ", $8A
charmap "シ", $8B
charmap "ス", $8C
charmap "セ", $8D
charmap "ソ", $8E
charmap "タ", $8F
charmap "チ", $90
charmap "ツ", $91
charmap "テ", $92
charmap "ト", $93
charmap "ナ", $94
charmap "ニ", $95
charmap "ヌ", $96
charmap "ネ", $97
charmap "", $98
charmap "ハ", $99
charmap "ヒ", $9A
charmap "フ", $9B
charmap "ホ", $9C
charmap "マ", $9D
charmap "ミ", $9E
charmap "ム", $9F
charmap "メ", $A0
charmap "モ", $A1
charmap "ヤ", $A2
charmap "ユ", $A3
charmap "ヨ", $A4
charmap "ラ", $A5
charmap "ル", $A6
charmap "レ", $A7
charmap "ロ", $A8
charmap "ワ", $A9
charmap "ヲ", $AA
charmap "ン", $AB
charmap "ッ", $AC
charmap "ャ", $AD
charmap "ュ", $AE
charmap "ョ", $AF
charmap "ィ", $B0
charmap "あ", $B1
charmap "い", $B2
charmap "う", $B3
charmap "え", $B4
charmap "お", $B5
charmap "か", $B6
charmap "き", $B7
charmap "く", $B8
charmap "け", $B9
charmap "こ", $BA
charmap "さ", $BB
charmap "し", $BC
charmap "す", $BD
charmap "せ", $BE
charmap "そ", $BF
charmap "た", $C0
charmap "ち", $C1
charmap "つ", $C2
charmap "て", $C3
charmap "と", $C4
charmap "な", $C5
charmap "に", $C6
charmap "ぬ", $C7
charmap "ね", $C8
charmap "の", $C9
charmap "は", $CA
charmap "ひ", $CB
charmap "ふ", $CC
charmap "へ", $CD
charmap "ほ", $CE
charmap "ま", $CF
charmap "み", $D0
charmap "む", $D1
charmap "め", $D2
charmap "も", $D3
charmap "や", $D4
charmap "ゆ", $D5
charmap "よ", $D6
charmap "ら", $D7
charmap "り", $D8
charmap "る", $D9
charmap "れ", $DA
charmap "ろ", $DB
charmap "わ", $DC
charmap "を", $DD
charmap "ん", $DE
charmap "っ", $DF
charmap "ゃ", $E0
charmap "ゅ", $E1
charmap "ょ", $E2
charmap "ー", $E3
; $00-$17 are TX_* constants (see macros/scripts/text.asm)
charmap "<pkmn>", $4A ; PkMn
charmap "@", $50
charmap "<PLAYER>", $52
charmap "<RIVAL>", $53
charmap "#", $54
;charmap "POKé", $54
; Control characters (see home/text.asm)
charmap "<NULL>", $00
charmap "<PAGE>", $49
charmap "<PKMN>", $4a ; "<PK><MN>"
charmap "<_CONT>", $4b ; implements "<CONT>"
charmap "<SCROLL>", $4c
charmap "<NEXT>", $4e
charmap "<LINE>", $4f
charmap "@", $50 ; string terminator
charmap "<PARA>", $51
charmap "<PLAYER>", $52 ; wPlayerName
charmap "<RIVAL>", $53 ; wRivalName
charmap "#", $54 ; "POKé"
charmap "<CONT>", $55
charmap "<……>", $56 ; "……"
charmap "<DONE>", $57
charmap "<PROMPT>", $58
charmap "<TARGET>", $59
charmap "<USER>", $5A
charmap "", $71
charmap "″", $73
charmap "№", $74
charmap "…", $75
charmap "<USER>", $5a
charmap "<PC>", $5b ; "PC"
charmap "<TM>", $5c ; "TM"
charmap "<TRAINER>", $5d ; "TRAINER"
charmap "<ROCKET>", $5e ; "ROCKET"
charmap "<DEXEND>", $5f
; Actual characters (from gfx/font/font_extra.png)
charmap "<BOLD_A>", $60 ; unused
charmap "<BOLD_B>", $61 ; unused
charmap "<BOLD_C>", $62 ; unused
charmap "<BOLD_D>", $63 ; unused
charmap "<BOLD_E>", $64 ; unused
charmap "<BOLD_F>", $65 ; unused
charmap "<BOLD_G>", $66 ; unused
charmap "<BOLD_H>", $67 ; unused
charmap "<BOLD_I>", $68 ; unused
charmap "<BOLD_V>", $69
charmap "<BOLD_S>", $6a
charmap "<BOLD_L>", $6b ; unused
charmap "<BOLD_M>", $6c ; unused
charmap "<COLON>", $6d ; colon with tinier dots than ":"
charmap "ぃ", $6e ; hiragana small i, unused
charmap "ぅ", $6f ; hiragana small u, unused
charmap "", $70 ; opening single quote
charmap "", $71 ; closing single quote
charmap "“", $72 ; opening quote
charmap "”", $73 ; closing quote
charmap "·", $74 ; middle dot, unused
charmap "…", $75 ; ellipsis
charmap "ぁ", $76 ; hiragana small a, unused
charmap "ぇ", $77 ; hiragana small e, unused
charmap "ぉ", $78 ; hiragana small o, unused
charmap "┌", $79
charmap "─", $7A
charmap "┐", $7B
charmap "│", $7C
charmap "└", $7D
charmap "┘", $7E
charmap "─", $7a
charmap "┐", $7b
charmap "│", $7c
charmap "└", $7d
charmap "┘", $7e
charmap " ", $7f
; Actual characters (from gfx/font/font_battle_extra.png)
charmap "<LV>", $6e
charmap "<to>", $70 ; narrow "to"
charmap "『", $72 ; Japanese opening quote, unused
charmap "<ID>", $73
charmap "№", $74
; Actual characters (from other graphics files)
; needed for ShowPokedexDataInternal (see engine/menus/pokedex.asm)
charmap "", $60 ; gfx/pokedex/pokedex.png
charmap "″", $61 ; gfx/pokedex/pokedex.png
; needed for StatusScreen (see engine/pokemon/status_screen.asm)
charmap "<BOLD_P>", $72 ; gfx/font/P.1bpp
; needed for LoadTownMap_Fly (see engine/items/town_map.asm)
charmap "▲", $ed ; gfx/town_map/up_arrow.1bpp
; needed for PrintAlphabet (see engine/menus/naming_screen.asm)
charmap "<ED>", $f0 ; gfx/font/ED.1bpp
; Actual characters (from gfx/font/font.png)
charmap " ", $7F
charmap "A", $80
charmap "B", $81
charmap "C", $82
@ -178,12 +99,12 @@ charmap "G", $86
charmap "H", $87
charmap "I", $88
charmap "J", $89
charmap "K", $8A
charmap "L", $8B
charmap "M", $8C
charmap "N", $8D
charmap "O", $8E
charmap "P", $8F
charmap "K", $8a
charmap "L", $8b
charmap "M", $8c
charmap "N", $8d
charmap "O", $8e
charmap "P", $8f
charmap "Q", $90
charmap "R", $91
charmap "S", $92
@ -194,72 +115,272 @@ charmap "W", $96
charmap "X", $97
charmap "Y", $98
charmap "Z", $99
charmap "(", $9A
charmap ")", $9B
charmap ":", $9C
charmap ";", $9D
charmap "[", $9E
charmap "]", $9F
charmap "a", $A0
charmap "b", $A1
charmap "c", $A2
charmap "d", $A3
charmap "e", $A4
charmap "f", $A5
charmap "g", $A6
charmap "h", $A7
charmap "i", $A8
charmap "j", $A9
charmap "k", $AA
charmap "l", $AB
charmap "m", $AC
charmap "n", $AD
charmap "o", $AE
charmap "p", $AF
charmap "q", $B0
charmap "r", $B1
charmap "s", $B2
charmap "t", $B3
charmap "u", $B4
charmap "v", $B5
charmap "w", $B6
charmap "x", $B7
charmap "y", $B8
charmap "z", $B9
charmap "é", $BA
charmap "'d", $BB
charmap "'l", $BC
charmap "'s", $BD
charmap "'t", $BE
charmap "'v", $BF
charmap "'", $E0
charmap "(", $9a
charmap ")", $9b
charmap ":", $9c
charmap ";", $9d
charmap "[", $9e
charmap "]", $9f
charmap "-", $E3
charmap "'r", $E4
charmap "'m", $E5
charmap "?", $E6
charmap "!", $E7
charmap ".", $E8
charmap "a", $a0
charmap "b", $a1
charmap "c", $a2
charmap "d", $a3
charmap "e", $a4
charmap "f", $a5
charmap "g", $a6
charmap "h", $a7
charmap "i", $a8
charmap "j", $a9
charmap "k", $aa
charmap "l", $ab
charmap "m", $ac
charmap "n", $ad
charmap "o", $ae
charmap "p", $af
charmap "q", $b0
charmap "r", $b1
charmap "s", $b2
charmap "t", $b3
charmap "u", $b4
charmap "v", $b5
charmap "w", $b6
charmap "x", $b7
charmap "y", $b8
charmap "z", $b9
charmap "▷", $EC
charmap "▶", $ED
charmap "▲", $ED
charmap "▼", $EE
charmap "♂", $EF
charmap "¥", $F0
charmap "×", $F1
charmap "⠄", $F2
charmap "/", $F3
charmap ",", $F4
charmap "♀", $F5
charmap "0", $F6
charmap "1", $F7
charmap "2", $F8
charmap "3", $F9
charmap "4", $FA
charmap "5", $FB
charmap "6", $FC
charmap "7", $FD
charmap "8", $FE
charmap "9", $FF
charmap "é", $ba
charmap "'d", $bb
charmap "'l", $bc
charmap "'s", $bd
charmap "'t", $be
charmap "'v", $bf
charmap "'", $e0
charmap "<PK>", $e1
charmap "<MN>", $e2
charmap "-", $e3
charmap "'r", $e4
charmap "'m", $e5
charmap "?", $e6
charmap "!", $e7
charmap ".", $e8
charmap "ァ", $e9 ; katakana small a, unused
charmap "ゥ", $ea ; katakana small u, unused
charmap "ェ", $eb ; katakana small e, unused
charmap "▷", $ec
charmap "▶", $ed
charmap "▼", $ee
charmap "♂", $ef
charmap "¥", $f0
charmap "×", $f1
charmap "<DOT>", $f2 ; decimal point; same as "." in English
charmap "/", $f3
charmap ",", $f4
charmap "♀", $f5
charmap "0", $f6
charmap "1", $f7
charmap "2", $f8
charmap "3", $f9
charmap "4", $fa
charmap "5", $fb
charmap "6", $fc
charmap "7", $fd
charmap "8", $fe
charmap "9", $ff
; Japanese kana, for those bits of text that were not translated to English
charmap "ガ", $05
charmap "ギ", $06
charmap "グ", $07
charmap "ゲ", $08
charmap "ゴ", $09
charmap "ザ", $0a
charmap "ジ", $0b
charmap "ズ", $0c
charmap "ゼ", $0d
charmap "ゾ", $0e
charmap "ダ", $0f
charmap "ヂ", $10
charmap "ヅ", $11
charmap "デ", $12
charmap "ド", $13
charmap "バ", $19
charmap "ビ", $1a
charmap "ブ", $1b
charmap "ボ", $1c
charmap "が", $26
charmap "ぎ", $27
charmap "ぐ", $28
charmap "げ", $29
charmap "ご", $2a
charmap "ざ", $2b
charmap "じ", $2c
charmap "ず", $2d
charmap "ぜ", $2e
charmap "ぞ", $2f
charmap "だ", $30
charmap "ぢ", $31
charmap "づ", $32
charmap "で", $33
charmap "ど", $34
charmap "ば", $3a
charmap "び", $3b
charmap "ぶ", $3c
charmap "べ", $3d
charmap "ぼ", $3e
charmap "パ", $40
charmap "ピ", $41
charmap "プ", $42
charmap "ポ", $43
charmap "ぱ", $44
charmap "ぴ", $45
charmap "ぷ", $46
charmap "ぺ", $47
charmap "ぽ", $48
charmap "「", $70
charmap "」", $71
charmap "』", $73
charmap "⋯", $75
charmap " ", $7f
charmap "ア", $80
charmap "イ", $81
charmap "ウ", $82
charmap "エ", $83
charmap "オ", $84
charmap "カ", $85
charmap "キ", $86
charmap "ク", $87
charmap "ケ", $88
charmap "コ", $89
charmap "サ", $8a
charmap "シ", $8b
charmap "ス", $8c
charmap "セ", $8d
charmap "ソ", $8e
charmap "タ", $8f
charmap "チ", $90
charmap "ツ", $91
charmap "テ", $92
charmap "ト", $93
charmap "ナ", $94
charmap "ニ", $95
charmap "ヌ", $96
charmap "ネ", $97
charmap "", $98
charmap "ハ", $99
charmap "ヒ", $9a
charmap "フ", $9b
charmap "ホ", $9c
charmap "マ", $9d
charmap "ミ", $9e
charmap "ム", $9f
charmap "メ", $a0
charmap "モ", $a1
charmap "ヤ", $a2
charmap "ユ", $a3
charmap "ヨ", $a4
charmap "ラ", $a5
charmap "ル", $a6
charmap "レ", $a7
charmap "ロ", $a8
charmap "ワ", $a9
charmap "ヲ", $aa
charmap "ン", $ab
charmap "ッ", $ac
charmap "ャ", $ad
charmap "ュ", $ae
charmap "ョ", $af
charmap "ィ", $b0
charmap "あ", $b1
charmap "い", $b2
charmap "う", $b3
charmap "え", $b4
charmap "お", $b5
charmap "か", $b6
charmap "き", $b7
charmap "く", $b8
charmap "け", $b9
charmap "こ", $ba
charmap "さ", $bb
charmap "し", $bc
charmap "す", $bd
charmap "せ", $be
charmap "そ", $bf
charmap "た", $c0
charmap "ち", $c1
charmap "つ", $c2
charmap "て", $c3
charmap "と", $c4
charmap "な", $c5
charmap "に", $c6
charmap "ぬ", $c7
charmap "ね", $c8
charmap "の", $c9
charmap "は", $ca
charmap "ひ", $cb
charmap "ふ", $cc
charmap "へ", $cd
charmap "ほ", $ce
charmap "ま", $cf
charmap "み", $d0
charmap "む", $d1
charmap "め", $d2
charmap "も", $d3
charmap "や", $d4
charmap "ゆ", $d5
charmap "よ", $d6
charmap "ら", $d7
charmap "り", $d8
charmap "る", $d9
charmap "れ", $da
charmap "ろ", $db
charmap "わ", $dc
charmap "を", $dd
charmap "ん", $de
charmap "っ", $df
charmap "ゃ", $e0
charmap "ゅ", $e1
charmap "ょ", $e2
charmap "ー", $e3
charmap "゚", $e4
charmap "゙", $e5
charmap "", $e6
charmap "", $e7
charmap "。", $e8
charmap "円", $f0
charmap "", $f2
charmap "", $f3
charmap "ォ", $f4
charmap "", $f6
charmap "", $f7
charmap "", $f8
charmap "", $f9
charmap "", $fa
charmap "", $fb
charmap "", $fc
charmap "", $fd
charmap "", $fe
charmap "", $ff

View file

@ -13,6 +13,10 @@ BATTLE_TYPE_NORMAL EQU 0
BATTLE_TYPE_OLD_MAN EQU 1
BATTLE_TYPE_SAFARI EQU 2
; damage limits before type effectiveness
MIN_NEUTRAL_DAMAGE EQU 2
MAX_NEUTRAL_DAMAGE EQU 999
; fixed damage constants
SONICBOOM_DAMAGE EQU 20
DRAGON_RAGE_DAMAGE EQU 40

View file

@ -63,3 +63,11 @@
const CRED_FUKUI ; $3D
const CRED_CLUB ; $3E
const CRED_PAAD ; $3F
const_value = $FA
const CRED_THE_END ; $FA
const CRED_COPYRIGHT ; $FB
const CRED_TEXT ; $FC
const CRED_TEXT_FADE ; $FD
const CRED_TEXT_MON ; $FE
const CRED_TEXT_FADE_MON ; $FF

View file

@ -1,15 +1,20 @@
TILE_WIDTH EQU 8 ; pixels
LEN_1BPP_TILE EQU 1 * TILE_WIDTH ; bytes
LEN_2BPP_TILE EQU 2 * TILE_WIDTH ; bytes
NUM_PAL_COLORS EQU 4
PAL_COLOR_SIZE EQU 2
PALETTE_SIZE EQU NUM_PAL_COLORS * PAL_COLOR_SIZE
SCREEN_WIDTH EQU 20
SCREEN_HEIGHT EQU 18
SCREEN_WIDTH_PX EQU SCREEN_WIDTH * TILE_WIDTH ; pixels
SCREEN_HEIGHT_PX EQU SCREEN_HEIGHT * TILE_WIDTH ; pixels
SCREEN_WIDTH_PIXELS EQU SCREEN_WIDTH * 8
SCREEN_HEIGHT_PIXELS EQU SCREEN_HEIGHT * 8
BG_MAP_WIDTH EQU 32 ; tiles
BG_MAP_HEIGHT EQU 32 ; tiles
BYTES_PER_TILE EQU 16
BG_MAP_WIDTH EQU 32
BG_MAP_HEIGHT EQU 32
SPRITEBUFFERSIZE EQU 7*7 * 8 ; 7 * 7 (tiles) * 8 (bytes per tile)
SPRITEBUFFERSIZE EQU 7 * 7 * LEN_1BPP_TILE
; HP bar
HP_BAR_GREEN EQU 0

View file

@ -1,3 +1,6 @@
HIDE EQU $11
SHOW EQU $15
; this is a list of the sprites that can be enabled/disabled during the game
; sprites marked with an X are constants that are never used
; because those sprites are not (de)activated in a map's script

View file

@ -1,12 +1,6 @@
NAME_LENGTH EQU 11
ITEM_NAME_LENGTH EQU 13
; 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
@ -15,3 +9,12 @@ 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)
; special text IDs (see home/text_script.asm)
const_def $d0
const TEXT_MON_FAINTED ; $d0
const TEXT_BLACKED_OUT ; $d1
const TEXT_REPEL_WORE_OFF ; $d2
const TEXT_SAFARI_GAME_OVER ; $d3
TEXT_START_MENU EQU $00

View file

@ -1,39 +1,40 @@
CreditsOrder:
; subsequent credits elements will be displayed on separate lines.
; $FF, $FE, $FD, $FC, $FB, and $FA are commands that are used
; to go to the next set of credits texts.
db CRED_MON, CRED_VERSION, $FF
db CRED_DIRECTOR, CRED_TAJIRI, $FF
db CRED_PROGRAMMERS, CRED_TA_OOTA, CRED_MORIMOTO, $FD
db CRED_PROGRAMMERS, CRED_WATANABE, CRED_MASUDE, CRED_TAMADA, $FE
db CRED_CHAR_DESIGN, CRED_SUGIMORI, CRED_NISHIDA, $FF
db CRED_MUSIC, CRED_MASUDE, $FD
db CRED_SOUND_EFFECTS, CRED_MASUDE, $FE
db CRED_GAME_DESIGN, CRED_TAJIRI, $FF
db CRED_MONSTER_DESIGN, CRED_SUGIMORI, CRED_NISHIDA, CRED_FUZIWARA, $FD
db CRED_MONSTER_DESIGN, CRED_MORIMOTO, CRED_SA_OOTA, CRED_YOSHIKAWA, $FE
db CRED_GAME_SCENE, CRED_TAJIRI, $FD
db CRED_GAME_SCENE, CRED_TANIGUCHI, CRED_NONOMURA, CRED_ZINNAI, $FE
db CRED_PARAM, CRED_NISINO, CRED_TA_NAKAMURA, $FF
db CRED_MAP, CRED_TAJIRI, CRED_NISINO, $FD
db CRED_MAP, CRED_MATSUSIMA, CRED_NONOMURA, CRED_TANIGUCHI, $FE
db CRED_TEST, CRED_KAKEI, CRED_TSUCHIYA, $FD
db CRED_TEST, CRED_TA_NAKAMURA, CRED_YUDA, $FE
db CRED_SPECIAL, CRED_HISHIDA, CRED_SAKAI, $FD
db CRED_SPECIAL, CRED_YAMAGUCHI, CRED_YAMAMOTO, $FC
db CRED_SPECIAL, CRED_TOMISAWA, CRED_KAWAMOTO, CRED_TO_OOTA, $FE
db CRED_PRODUCERS, CRED_MIYAMOTO, $FD
db CRED_PRODUCERS, CRED_KAWAGUCHI, $FC
db CRED_PRODUCERS, CRED_ISHIHARA, $FE
db CRED_US_STAFF, $FD
db CRED_US_COORD, CRED_TILDEN, $FD
db CRED_US_COORD, CRED_KAWAKAMI, CRED_HI_NAKAMURA, $FC
db CRED_US_COORD, CRED_GIESE, CRED_OSBORNE, $FC
db CRED_TRANS, CRED_OGASAWARA, $FD
db CRED_PROGRAMMERS, CRED_MURAKAWA, CRED_FUKUI, $FD
db CRED_SPECIAL, CRED_IWATA, $FD
db CRED_SPECIAL, CRED_HARADA, $FC
db CRED_TEST, CRED_PAAD, CRED_CLUB, $FD
db CRED_PRODUCER, CRED_IZUSHI, $FD
db CRED_EXECUTIVE, CRED_YAMAUCHI, $FF
db $FB, $FF, $FA
; CRED_TEXT, CRED_TEXT_FADE, CRED_TEXT_MON, and CRED_TEXT_FADE_MON are
; commands that are used to go to the next set of credits texts.
db CRED_MON, CRED_VERSION, CRED_TEXT_FADE_MON
db CRED_DIRECTOR, CRED_TAJIRI, CRED_TEXT_FADE_MON
db CRED_PROGRAMMERS, CRED_TA_OOTA, CRED_MORIMOTO, CRED_TEXT_FADE
db CRED_PROGRAMMERS, CRED_WATANABE, CRED_MASUDE, CRED_TAMADA, CRED_TEXT_MON
db CRED_CHAR_DESIGN, CRED_SUGIMORI, CRED_NISHIDA, CRED_TEXT_FADE_MON
db CRED_MUSIC, CRED_MASUDE, CRED_TEXT_FADE
db CRED_SOUND_EFFECTS, CRED_MASUDE, CRED_TEXT_MON
db CRED_GAME_DESIGN, CRED_TAJIRI, CRED_TEXT_FADE_MON
db CRED_MONSTER_DESIGN, CRED_SUGIMORI, CRED_NISHIDA, CRED_FUZIWARA, CRED_TEXT_FADE
db CRED_MONSTER_DESIGN, CRED_MORIMOTO, CRED_SA_OOTA, CRED_YOSHIKAWA, CRED_TEXT_MON
db CRED_GAME_SCENE, CRED_TAJIRI, CRED_TEXT_FADE
db CRED_GAME_SCENE, CRED_TANIGUCHI, CRED_NONOMURA, CRED_ZINNAI, CRED_TEXT_MON
db CRED_PARAM, CRED_NISINO, CRED_TA_NAKAMURA, CRED_TEXT_FADE_MON
db CRED_MAP, CRED_TAJIRI, CRED_NISINO, CRED_TEXT_FADE
db CRED_MAP, CRED_MATSUSIMA, CRED_NONOMURA, CRED_TANIGUCHI, CRED_TEXT_MON
db CRED_TEST, CRED_KAKEI, CRED_TSUCHIYA, CRED_TEXT_FADE
db CRED_TEST, CRED_TA_NAKAMURA, CRED_YUDA, CRED_TEXT_MON
db CRED_SPECIAL, CRED_HISHIDA, CRED_SAKAI, CRED_TEXT_FADE
db CRED_SPECIAL, CRED_YAMAGUCHI, CRED_YAMAMOTO, CRED_TEXT
db CRED_SPECIAL, CRED_TOMISAWA, CRED_KAWAMOTO, CRED_TO_OOTA, CRED_TEXT_MON
db CRED_PRODUCERS, CRED_MIYAMOTO, CRED_TEXT_FADE
db CRED_PRODUCERS, CRED_KAWAGUCHI, CRED_TEXT
db CRED_PRODUCERS, CRED_ISHIHARA, CRED_TEXT_MON
db CRED_US_STAFF, CRED_TEXT_FADE
db CRED_US_COORD, CRED_TILDEN, CRED_TEXT_FADE
db CRED_US_COORD, CRED_KAWAKAMI, CRED_HI_NAKAMURA, CRED_TEXT
db CRED_US_COORD, CRED_GIESE, CRED_OSBORNE, CRED_TEXT
db CRED_TRANS, CRED_OGASAWARA, CRED_TEXT_FADE
db CRED_PROGRAMMERS, CRED_MURAKAWA, CRED_FUKUI, CRED_TEXT_FADE
db CRED_SPECIAL, CRED_IWATA, CRED_TEXT_FADE
db CRED_SPECIAL, CRED_HARADA, CRED_TEXT
db CRED_TEST, CRED_PAAD, CRED_CLUB, CRED_TEXT_FADE
db CRED_PRODUCER, CRED_IZUSHI, CRED_TEXT_FADE
db CRED_EXECUTIVE, CRED_YAMAUCHI, CRED_TEXT_FADE_MON
db CRED_COPYRIGHT, CRED_TEXT_FADE_MON
db CRED_THE_END

File diff suppressed because it is too large Load diff

View file

@ -3,62 +3,62 @@
; Viridian
ViridianCashierText::
TX_MART POKE_BALL, ANTIDOTE, PARLYZ_HEAL, BURN_HEAL
script_mart POKE_BALL, ANTIDOTE, PARLYZ_HEAL, BURN_HEAL
; Pewter
PewterCashierText::
TX_MART POKE_BALL, POTION, ESCAPE_ROPE, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL
script_mart POKE_BALL, POTION, ESCAPE_ROPE, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL
; Cerulean
CeruleanCashierText::
TX_MART POKE_BALL, POTION, REPEL, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL
script_mart POKE_BALL, POTION, REPEL, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL
; Bike shop
TX_MART BICYCLE
script_mart BICYCLE
; Vermilion
VermilionCashierText::
TX_MART POKE_BALL, SUPER_POTION, ICE_HEAL, AWAKENING, PARLYZ_HEAL, REPEL
script_mart POKE_BALL, SUPER_POTION, ICE_HEAL, AWAKENING, PARLYZ_HEAL, REPEL
; Lavender
LavenderCashierText::
TX_MART GREAT_BALL, SUPER_POTION, REVIVE, ESCAPE_ROPE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, PARLYZ_HEAL
script_mart GREAT_BALL, SUPER_POTION, REVIVE, ESCAPE_ROPE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, PARLYZ_HEAL
; Celadon Dept. Store 2F (1)
CeladonMart2Clerk1Text::
TX_MART GREAT_BALL, SUPER_POTION, REVIVE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, AWAKENING, PARLYZ_HEAL
script_mart GREAT_BALL, SUPER_POTION, REVIVE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, AWAKENING, PARLYZ_HEAL
; Celadon Dept. Store 2F (2)
CeladonMart2Clerk2Text::
TX_MART TM_32, TM_33, TM_02, TM_07, TM_37, TM_01, TM_05, TM_09, TM_17
script_mart TM_32, TM_33, TM_02, TM_07, TM_37, TM_01, TM_05, TM_09, TM_17
; Celadon Dept. Store 4F
CeladonMart4ClerkText::
TX_MART POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE
script_mart POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE
; Celadon Dept. Store 5F (1)
CeladonMart5Clerk1Text::
TX_MART X_ACCURACY, GUARD_SPEC, DIRE_HIT, X_ATTACK, X_DEFEND, X_SPEED, X_SPECIAL
script_mart X_ACCURACY, GUARD_SPEC, DIRE_HIT, X_ATTACK, X_DEFEND, X_SPEED, X_SPECIAL
; Celadon Dept. Store 5F (2)
CeladonMart5Clerk2Text::
TX_MART HP_UP, PROTEIN, IRON, CARBOS, CALCIUM
script_mart HP_UP, PROTEIN, IRON, CARBOS, CALCIUM
; Fuchsia
FuchsiaCashierText::
TX_MART ULTRA_BALL, GREAT_BALL, SUPER_POTION, REVIVE, FULL_HEAL, SUPER_REPEL
script_mart ULTRA_BALL, GREAT_BALL, SUPER_POTION, REVIVE, FULL_HEAL, SUPER_REPEL
; unused?
TX_MART GREAT_BALL, HYPER_POTION, SUPER_POTION, FULL_HEAL, REVIVE
script_mart GREAT_BALL, HYPER_POTION, SUPER_POTION, FULL_HEAL, REVIVE
; Cinnabar
CinnabarCashierText::
TX_MART ULTRA_BALL, GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE
script_mart ULTRA_BALL, GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE
; Saffron
SaffronCashierText::
TX_MART GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE
script_mart GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE
; Indigo
IndigoCashierText::
TX_MART ULTRA_BALL, GREAT_BALL, FULL_RESTORE, MAX_POTION, FULL_HEAL, REVIVE, MAX_REPEL
script_mart ULTRA_BALL, GREAT_BALL, FULL_RESTORE, MAX_POTION, FULL_HEAL, REVIVE, MAX_REPEL

File diff suppressed because it is too large Load diff

View file

@ -98,7 +98,7 @@ RocketHQName:
SilphCoName:
db "SILPH CO.@"
PokemonMansionName:
db "<pkmn> MANSION@"
db "<PKMN> MANSION@"
SafariZoneName:
db "SAFARI ZONE@"
CeruleanCaveName:

File diff suppressed because it is too large Load diff

View file

@ -1,174 +1,50 @@
; palettes for overworlds, title screen, monsters
SuperPalettes:
RGB 31,29,31 ; PAL_ROUTE
RGB 21,28,11
RGB 20,26,31
RGB 3,2,2
RGB 31,29,31 ; PAL_PALLET
RGB 25,28,27
RGB 20,26,31
RGB 3,2,2
RGB 31,29,31 ; PAL_VIRIDIAN
RGB 17,26,3
RGB 20,26,31
RGB 3,2,2
RGB 31,29,31 ; PAL_PEWTER
RGB 23,25,16
RGB 20,26,31
RGB 3,2,2
RGB 31,29,31 ; PAL_CERULEAN
RGB 17,20,30
RGB 20,26,31
RGB 3,2,2
RGB 31,29,31 ; PAL_LAVENDER
RGB 27,20,27
RGB 20,26,31
RGB 3,2,2
RGB 31,29,31 ; PAL_VERMILION
RGB 30,18,0
RGB 20,26,31
RGB 3,2,2
RGB 31,29,31 ; PAL_CELADON
RGB 16,30,22
RGB 20,26,31
RGB 3,2,2
RGB 31,29,31 ; PAL_FUCHSIA
RGB 31,15,22
RGB 20,26,31
RGB 3,2,2
RGB 31,29,31 ; PAL_CINNABAR
RGB 26,10,6
RGB 20,26,31
RGB 3,2,2
RGB 31,29,31 ; PAL_INDIGO
RGB 22,14,24
RGB 20,26,31
RGB 3,2,2
RGB 31,29,31 ; PAL_SAFFRON
RGB 27,27,3
RGB 20,26,31
RGB 3,2,2
RGB 31,29,31 ; PAL_TOWNMAP
RGB 20,26,31
RGB 17,23,10
RGB 3,2,2
RGB 31,29,31, 21,28,11, 20,26,31, 03,02,02 ; PAL_ROUTE
RGB 31,29,31, 25,28,27, 20,26,31, 03,02,02 ; PAL_PALLET
RGB 31,29,31, 17,26,03, 20,26,31, 03,02,02 ; PAL_VIRIDIAN
RGB 31,29,31, 23,25,16, 20,26,31, 03,02,02 ; PAL_PEWTER
RGB 31,29,31, 17,20,30, 20,26,31, 03,02,02 ; PAL_CERULEAN
RGB 31,29,31, 27,20,27, 20,26,31, 03,02,02 ; PAL_LAVENDER
RGB 31,29,31, 30,18,00, 20,26,31, 03,02,02 ; PAL_VERMILION
RGB 31,29,31, 16,30,22, 20,26,31, 03,02,02 ; PAL_CELADON
RGB 31,29,31, 31,15,22, 20,26,31, 03,02,02 ; PAL_FUCHSIA
RGB 31,29,31, 26,10,06, 20,26,31, 03,02,02 ; PAL_CINNABAR
RGB 31,29,31, 22,14,24, 20,26,31, 03,02,02 ; PAL_INDIGO
RGB 31,29,31, 27,27,03, 20,26,31, 03,02,02 ; PAL_SAFFRON
RGB 31,29,31, 20,26,31, 17,23,10, 03,02,02 ; PAL_TOWNMAP
IF DEF(_RED)
RGB 31,29,31 ; PAL_LOGO1
RGB 30,30,17
RGB 17,23,10
RGB 21,0,4
RGB 31,29,31, 30,30,17, 17,23,10, 21,00,04 ; PAL_LOGO1
ENDC
IF DEF(_BLUE)
RGB 31,29,31 ; PAL_LOGO1
RGB 30,30,17
RGB 21,0,4
RGB 14,19,29
RGB 31,29,31, 30,30,17, 21,00,04, 14,19,29 ; PAL_LOGO1
ENDC
RGB 31,29,31 ; PAL_LOGO2
RGB 30,30,17
RGB 18,18,24
RGB 7,7,16
RGB 31,29,31 ; PAL_0F
RGB 24,20,30
RGB 11,20,30
RGB 3,2,2
RGB 31,29,31 ; PAL_MEWMON
RGB 30,22,17
RGB 16,14,19
RGB 3,2,2
RGB 31,29,31 ; PAL_BLUEMON
RGB 18,20,27
RGB 11,15,23
RGB 3,2,2
RGB 31,29,31 ; PAL_REDMON
RGB 31,20,10
RGB 26,10,6
RGB 3,2,2
RGB 31,29,31 ; PAL_CYANMON
RGB 21,25,29
RGB 14,19,25
RGB 3,2,2
RGB 31,29,31 ; PAL_PURPLEMON
RGB 27,22,24
RGB 21,15,23
RGB 3,2,2
RGB 31,29,31 ; PAL_BROWNMON
RGB 28,20,15
RGB 21,14,9
RGB 3,2,2
RGB 31,29,31 ; PAL_GREENMON
RGB 20,26,16
RGB 9,20,11
RGB 3,2,2
RGB 31,29,31 ; PAL_PINKMON
RGB 30,22,24
RGB 28,15,21
RGB 3,2,2
RGB 31,29,31 ; PAL_YELLOWMON
RGB 31,28,14
RGB 26,20,0
RGB 3,2,2
RGB 31,29,31 ; PAL_GREYMON
RGB 26,21,22
RGB 15,15,18
RGB 3,2,2
RGB 31,29,31 ; PAL_SLOTS1
RGB 26,21,22
RGB 27,20,6
RGB 3,2,2
RGB 31,29,31 ; PAL_SLOTS2
RGB 31,31,17
RGB 31,29,31, 30,30,17, 18,18,24, 07,07,16 ; PAL_LOGO2
RGB 31,29,31, 24,20,30, 11,20,30, 03,02,02 ; PAL_0F
RGB 31,29,31, 30,22,17, 16,14,19, 03,02,02 ; PAL_MEWMON
RGB 31,29,31, 18,20,27, 11,15,23, 03,02,02 ; PAL_BLUEMON
RGB 31,29,31, 31,20,10, 26,10,06, 03,02,02 ; PAL_REDMON
RGB 31,29,31, 21,25,29, 14,19,25, 03,02,02 ; PAL_CYANMON
RGB 31,29,31, 27,22,24, 21,15,23, 03,02,02 ; PAL_PURPLEMON
RGB 31,29,31, 28,20,15, 21,14,09, 03,02,02 ; PAL_BROWNMON
RGB 31,29,31, 20,26,16, 09,20,11, 03,02,02 ; PAL_GREENMON
RGB 31,29,31, 30,22,24, 28,15,21, 03,02,02 ; PAL_PINKMON
RGB 31,29,31, 31,28,14, 26,20,00, 03,02,02 ; PAL_YELLOWMON
RGB 31,29,31, 26,21,22, 15,15,18, 03,02,02 ; PAL_GREYMON
RGB 31,29,31, 26,21,22, 27,20,06, 03,02,02 ; PAL_SLOTS1
IF DEF(_RED)
RGB 25,17,21
RGB 31,29,31, 31,31,17, 25,17,21, 03,02,02 ; PAL_SLOTS2
RGB 31,29,31, 22,31,16, 25,17,21, 03,02,02 ; PAL_SLOTS3
RGB 31,29,31, 16,19,29, 25,17,21, 03,02,02 ; PAL_SLOTS4
ENDC
IF DEF(_BLUE)
RGB 16,19,29
RGB 31,29,31, 31,31,17, 16,19,29, 03,02,02 ; PAL_SLOTS2
RGB 31,29,31, 22,31,16, 16,19,29, 03,02,02 ; PAL_SLOTS3
RGB 31,29,31, 25,17,21, 16,19,29, 03,02,02 ; PAL_SLOTS4
ENDC
RGB 3,2,2
RGB 31,29,31 ; PAL_SLOTS3
RGB 22,31,16
IF DEF(_RED)
RGB 25,17,21
ENDC
IF DEF(_BLUE)
RGB 16,19,29
ENDC
RGB 3,2,2
RGB 31,29,31 ; PAL_SLOTS4
IF DEF(_RED)
RGB 16,19,29
RGB 25,17,21
ENDC
IF DEF(_BLUE)
RGB 25,17,21
RGB 16,19,29
ENDC
RGB 3,2,2
RGB 31,29,31 ; PAL_BLACK
RGB 7,7,7
RGB 2,3,3
RGB 3,2,2
RGB 31,29,31 ; PAL_GREENBAR
RGB 30,26,15
RGB 9,20,11
RGB 3,2,2
RGB 31,29,31 ; PAL_YELLOWBAR
RGB 30,26,15
RGB 26,20,0
RGB 3,2,2
RGB 31,29,31 ; PAL_REDBAR
RGB 30,26,15
RGB 26,10,6
RGB 3,2,2
RGB 31,29,31 ; PAL_BADGE
RGB 30,22,17
RGB 11,15,23
RGB 3,2,2
RGB 31,29,31 ; PAL_CAVE
RGB 21,14,9
RGB 18,24,22
RGB 3,2,2
RGB 31,29,31 ; PAL_GAMEFREAK
RGB 31,28,14
RGB 24,20,10
RGB 3,2,2
RGB 31,29,31, 07,07,07, 02,03,03, 03,02,02 ; PAL_BLACK
RGB 31,29,31, 30,26,15, 09,20,11, 03,02,02 ; PAL_GREENBAR
RGB 31,29,31, 30,26,15, 26,20,00, 03,02,02 ; PAL_YELLOWBAR
RGB 31,29,31, 30,26,15, 26,10,06, 03,02,02 ; PAL_REDBAR
RGB 31,29,31, 30,22,17, 11,15,23, 03,02,02 ; PAL_BADGE
RGB 31,29,31, 21,14,09, 18,24,22, 03,02,02 ; PAL_CAVE
RGB 31,29,31, 31,28,14, 24,20,10, 03,02,02 ; PAL_GAMEFREAK

View file

@ -1,5 +1,15 @@
LowerCaseAlphabet:
db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥UPPER CASE@"
db "abcdefghi"
db "jklmnopqr"
db "stuvwxyz "
db "×():;[]<PK><MN>"
db "-?!♂♀/<DOT>,<ED>"
db "UPPER CASE@"
UpperCaseAlphabet:
db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥lower case@"
db "ABCDEFGHI"
db "JKLMNOPQR"
db "STUVWXYZ "
db "×():;[]<PK><MN>"
db "-?!♂♀/<DOT>,<ED>"
db "lower case@"

View file

@ -7,9 +7,9 @@ Dakutens:
db "サザ", "シジ", "スズ", "セゼ", "ソゾ"
db "タダ", "チヂ", "ツヅ", "テデ", "トド"
db "ハバ", "ヒビ", "フブ", "へべ", "ホボ"
db $ff
db -1 ; end
Handakutens:
db "はぱ", "ひぴ", "ふぷ", "へぺ", "ほぽ"
db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ"
db $ff
db -1 ; end

View file

@ -1,8 +1,9 @@
_CardKeySuccessText1::
text "Bingo!@@"
text "Bingo!@"
text_end
_CardKeySuccessText2::
text ""
text_start
line "The CARD KEY"
cont "opened the door!"
done
@ -13,8 +14,9 @@ _CardKeyFailText::
done
_TrainerNameText::
TX_RAM wcd6d
text ": @@"
text_ram wcd6d
text ": @"
text_end
_NoNibbleText::
text "Not even a nibble!"
@ -58,8 +60,9 @@ _PokeCenterSignText::
_FoundItemText::
text "<PLAYER> found"
line "@"
TX_RAM wcf4b
text "!@@"
text_ram wcf4b
text "!@"
text_end
_NoMoreRoomForItemText::
text "No more room for"
@ -72,19 +75,19 @@ _OaksAideHiText::
cont "AIDE!"
para "If you caught @"
TX_NUM hOaksAideRequirement, 1, 3
text ""
text_decimal hOaksAideRequirement, 1, 3
text_start
line "kinds of #MON,"
cont "I'm supposed to"
cont "give you an"
cont "@"
TX_RAM wOaksAideRewardItemName
text_ram wOaksAideRewardItemName
text "!"
para "So, <PLAYER>! Have"
line "you caught at"
cont "least @"
TX_NUM hOaksAideRequirement, 1, 3
text_decimal hOaksAideRequirement, 1, 3
text " kinds of"
cont "#MON?"
done
@ -93,16 +96,16 @@ _OaksAideUhOhText::
text "Let's see..."
line "Uh-oh! You have"
cont "caught only @"
TX_NUM hOaksAideNumMonsOwned, 1, 3
text ""
text_decimal hOaksAideNumMonsOwned, 1, 3
text_start
cont "kinds of #MON!"
para "You need @"
TX_NUM hOaksAideRequirement, 1, 3
text_decimal hOaksAideRequirement, 1, 3
text " kinds"
line "if you want the"
cont "@"
TX_RAM wOaksAideRewardItemName
text_ram wOaksAideRewardItemName
text "."
done
@ -110,18 +113,18 @@ _OaksAideComeBackText::
text "Oh. I see."
para "When you get @"
TX_NUM hOaksAideRequirement, 1, 3
text ""
text_decimal hOaksAideRequirement, 1, 3
text_start
line "kinds, come back"
cont "for @"
TX_RAM wOaksAideRewardItemName
text_ram wOaksAideRewardItemName
text "."
done
_OaksAideHereYouGoText::
text "Great! You have"
line "caught @"
TX_NUM hOaksAideNumMonsOwned, 1, 3
text_decimal hOaksAideNumMonsOwned, 1, 3
text " kinds "
cont "of #MON!"
cont "Congratulations!"
@ -132,14 +135,15 @@ _OaksAideHereYouGoText::
_OaksAideGotItemText::
text "<PLAYER> got the"
line "@"
TX_RAM wOaksAideRewardItemName
text "!@@"
text_ram wOaksAideRewardItemName
text "!@"
text_end
_OaksAideNoRoomText::
text "Oh! I see you"
line "don't have any"
cont "room for the"
cont "@"
TX_RAM wOaksAideRewardItemName
text_ram wOaksAideRewardItemName
text "."
done

View file

@ -1,53 +1,53 @@
_AIBattleWithdrawText::
TX_RAM wTrainerName
text_ram wTrainerName
text " with-"
line "drew @"
TX_RAM wEnemyMonNick
text_ram wEnemyMonNick
text "!"
prompt
_AIBattleUseItemText::
TX_RAM wTrainerName
text ""
text_ram wTrainerName
text_start
line "used @"
TX_RAM wcd6d
text ""
text_ram wcd6d
text_start
cont "on @"
TX_RAM wEnemyMonNick
text_ram wEnemyMonNick
text "!"
prompt
_TradeWentToText::
TX_RAM wcf4b
text_ram wcf4b
text " went"
line "to @"
TX_RAM wLinkEnemyTrainerName
text_ram wLinkEnemyTrainerName
text "."
done
_TradeForText::
text "For <PLAYER>'s"
line "@"
TX_RAM wcf4b
text_ram wcf4b
text ","
done
_TradeSendsText::
TX_RAM wLinkEnemyTrainerName
text_ram wLinkEnemyTrainerName
text " sends"
line "@"
TX_RAM wcd6d
text_ram wcd6d
text "."
done
_TradeWavesFarewellText::
TX_RAM wLinkEnemyTrainerName
text_ram wLinkEnemyTrainerName
text " waves"
line "farewell as"
done
_TradeTransferredText::
TX_RAM wcd6d
text_ram wcd6d
text " is"
line "transferred."
done
@ -55,22 +55,22 @@ _TradeTransferredText::
_TradeTakeCareText::
text "Take good care of"
line "@"
TX_RAM wcd6d
text_ram wcd6d
text "."
done
_TradeWillTradeText::
TX_RAM wLinkEnemyTrainerName
text_ram wLinkEnemyTrainerName
text " will"
line "trade @"
TX_RAM wcd6d
text ""
text_ram wcd6d
text_start
done
_TradeforText::
text "for <PLAYER>'s"
line "@"
TX_RAM wcf4b
text_ram wcf4b
text "."
done
@ -106,7 +106,7 @@ _OneMoreGoSlotMachineText::
_LinedUpText::
text " lined up!"
line "Scored @"
TX_RAM wcf4b
text_ram wcf4b
text " coins!"
done
@ -115,39 +115,40 @@ _NotThisTimeText::
prompt
_YeahText::
text "Yeah!@@"
text "Yeah!@"
text_end
_DexSeenOwnedText::
text "#DEX Seen:@"
TX_NUM wDexRatingNumMonsSeen, 1, 3
text ""
text_decimal wDexRatingNumMonsSeen, 1, 3
text_start
line " Owned:@"
TX_NUM wDexRatingNumMonsOwned, 1, 3
db "@"
text_decimal wDexRatingNumMonsOwned, 1, 3
text_end
_DexRatingText::
text "#DEX Rating", $6d
text "#DEX Rating<COLON>"
done
_GymStatueText1::
TX_RAM wGymCityName
text ""
text_ram wGymCityName
text_start
line "#MON GYM"
cont "LEADER: @"
TX_RAM wGymLeaderName
text ""
text_ram wGymLeaderName
text_start
para "WINNING TRAINERS:"
line "<RIVAL>"
done
_GymStatueText2::
TX_RAM wGymCityName
text ""
text_ram wGymCityName
text_start
line "#MON GYM"
cont "LEADER: @"
TX_RAM wGymLeaderName
text ""
text_ram wGymLeaderName
text_start
para "WINNING TRAINERS:"
line "<RIVAL>"
@ -375,7 +376,8 @@ _CinnabarGymQuizCorrectText::
text "You're absolutely"
line "correct!"
para "Go on through!@@"
para "Go on through!@"
text_end
_CinnabarGymQuizIncorrectText::
text "Sorry! Bad call!"
@ -398,7 +400,8 @@ _BillsHouseMonitorText::
_BillsHouseInitiatedText::
text "<PLAYER> initiated"
line "TELEPORTER's Cell"
cont "Separator!@@"
cont "Separator!@"
text_end
_BillsHousePokemonListText1::
text "BILL's favorite"
@ -479,7 +482,8 @@ TMNotebookText::
line "HMs that can be"
cont "used repeatedly."
para "SILPH CO.@@"
para "SILPH CO.@"
text_end
_TurnPageText::
text "Turn the page?"
@ -487,7 +491,8 @@ _TurnPageText::
_ViridianSchoolNotebookText5::
text "GIRL: Hey! Don't"
line "look at my notes!@@"
line "look at my notes!@"
text_end
_ViridianSchoolNotebookText1::
text "Looked at the"
@ -718,7 +723,8 @@ _VermilionGymTrashSuccessText1::
cont "Turn it on!"
para "The 1st electric"
line "lock opened!@@"
line "lock opened!@"
text_end
_VermilionGymTrashSuccessText2::
text "Hey! There's"
@ -732,19 +738,22 @@ _VermilionGymTrashSuccessText3::
line "lock opened!"
para "The motorized door"
line "opened!@@"
line "opened!@"
text_end
_VermilionGymTrashFailText::
text "Nope! There's"
line "only trash here."
cont "Hey! The electric"
cont "locks were reset!@@"
cont "locks were reset!@"
text_end
_FoundHiddenItemText::
text "<PLAYER> found"
line "@"
TX_RAM wcd6d
text "!@@"
text_ram wcd6d
text "!@"
text_end
_HiddenItemBagFullText::
text "But, <PLAYER> has"
@ -755,17 +764,19 @@ _HiddenItemBagFullText::
_FoundHiddenCoinsText::
text "<PLAYER> found"
line "@"
TX_BCD hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
text " coins!@@"
text_bcd hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
text " coins!@"
text_end
_FoundHiddenCoins2Text::
text "<PLAYER> found"
line "@"
TX_BCD hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
text " coins!@@"
text_bcd hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
text " coins!@"
text_end
_DroppedHiddenCoinsText::
text ""
text_start
para "Oops! Dropped"
line "some coins!"
done
@ -802,7 +813,8 @@ _ElevatorText::
done
_TownMapText::
text "A TOWN MAP.@@"
text "A TOWN MAP.@"
text_end
_PokemonStuffText::
text "Wow! Tons of"
@ -818,15 +830,15 @@ _OutOfSafariBallsText::
_WildRanText::
text "Wild @"
TX_RAM wEnemyMonNick
text ""
text_ram wEnemyMonNick
text_start
line "ran!"
prompt
_EnemyRanText::
text "Enemy @"
TX_RAM wEnemyMonNick
text ""
text_ram wEnemyMonNick
text_start
line "ran!"
prompt
@ -847,28 +859,28 @@ _HurtByLeechSeedText::
_EnemyMonFaintedText::
text "Enemy @"
TX_RAM wEnemyMonNick
text ""
text_ram wEnemyMonNick
text_start
line "fainted!"
prompt
_MoneyForWinningText::
text "<PLAYER> got ¥@"
TX_BCD wAmountMoneyWon, 3 | LEADING_ZEROES | LEFT_ALIGN
text ""
text_bcd wAmountMoneyWon, 3 | LEADING_ZEROES | LEFT_ALIGN
text_start
line "for winning!"
prompt
_TrainerDefeatedText::
text "<PLAYER> defeated"
line "@"
TX_RAM wTrainerName
text_ram wTrainerName
text "!"
prompt
_PlayerMonFaintedText::
TX_RAM wBattleMonNick
text ""
text_ram wBattleMonNick
text_start
line "fainted!"
prompt
@ -892,16 +904,16 @@ _PlayerBlackedOutText2::
_LinkBattleLostText::
text "<PLAYER> lost to"
line "@"
TX_RAM wTrainerName
text_ram wTrainerName
text "!"
prompt
_TrainerAboutToUseText::
TX_RAM wTrainerName
text_ram wTrainerName
text " is"
line "about to use"
cont"@"
TX_RAM wEnemyMonNick
text_ram wEnemyMonNick
text "!"
para "Will <PLAYER>"
@ -909,10 +921,10 @@ _TrainerAboutToUseText::
done
_TrainerSentOutText::
TX_RAM wTrainerName
text_ram wTrainerName
text " sent"
line "out @"
TX_RAM wEnemyMonNick
text_ram wEnemyMonNick
text "!"
done
@ -941,7 +953,7 @@ _ItemsCantBeUsedHereText::
prompt
_AlreadyOutText::
TX_RAM wBattleMonNick
text_ram wBattleMonNick
text " is"
line "already out!"
prompt
@ -957,7 +969,7 @@ _MoveDisabledText::
prompt
_NoMovesLeftText::
TX_RAM wBattleMonNick
text_ram wBattleMonNick
text " has no"
line "moves left!"
done
@ -965,12 +977,12 @@ _NoMovesLeftText::
_MultiHitText::
text "Hit the enemy"
line "@"
TX_NUM wPlayerNumHits,1,1
text_decimal wPlayerNumHits, 1, 1
text " times!"
prompt
_ScaredText::
TX_RAM wBattleMonNick
text_ram wBattleMonNick
text " is too"
line "scared to move!"
prompt
@ -1058,28 +1070,32 @@ _CantMoveText::
_MoveIsDisabledText::
text "<USER>'s"
line "@"
TX_RAM wcd6d
text_ram wcd6d
text " is"
cont "disabled!"
prompt
_MonName1Text::
text "<USER>@@"
text "<USER>@"
text_end
_Used1Text::
text ""
line "used @@"
text_start
line "used @"
text_end
_Used2Text::
text ""
line "used @@"
text_start
line "used @"
text_end
_InsteadText::
text "instead,"
cont "@@"
cont "@"
text_end
_CF4BText::
TX_RAM wcf4b
text_ram wcf4b
text "@"
_ExclamationPoint1Text::
@ -1132,32 +1148,32 @@ _OHKOText::
prompt
_LoafingAroundText::
TX_RAM wBattleMonNick
text_ram wBattleMonNick
text " is"
line "loafing around."
prompt
_BeganToNapText::
TX_RAM wBattleMonNick
text_ram wBattleMonNick
text " began"
line "to nap!"
prompt
_WontObeyText::
TX_RAM wBattleMonNick
text_ram wBattleMonNick
text " won't"
line "obey!"
prompt
_TurnedAwayText::
TX_RAM wBattleMonNick
text_ram wBattleMonNick
text " turned"
line "away!"
prompt
_IgnoredOrdersText::
TX_RAM wBattleMonNick
text ""
text_ram wBattleMonNick
text_start
line "ignored orders!"
prompt
@ -1184,58 +1200,62 @@ _MirrorMoveFailedText::
_HitXTimesText::
text "Hit @"
TX_NUM wEnemyNumHits, 1, 1
text_decimal wEnemyNumHits, 1, 1
text " times!"
prompt
_GainedText::
TX_RAM wcd6d
text_ram wcd6d
text " gained"
line "@@"
line "@"
text_end
_WithExpAllText::
text "with EXP.ALL,"
cont "@@"
cont "@"
text_end
_BoostedText::
text "a boosted"
cont "@@"
cont "@"
text_end
_ExpPointsText::
TX_NUM wExpAmountGained, 2, 4
text_decimal wExpAmountGained, 2, 4
text " EXP. Points!"
prompt
_GrewLevelText::
TX_RAM wcd6d
text_ram wcd6d
text " grew"
line "to level @"
TX_NUM wCurEnemyLVL, 1, 3
text "!@@"
text_decimal wCurEnemyLVL, 1, 3
text "!@"
text_end
_WildMonAppearedText::
text "Wild @"
TX_RAM wEnemyMonNick
text ""
text_ram wEnemyMonNick
text_start
line "appeared!"
prompt
_HookedMonAttackedText::
text "The hooked"
line "@"
TX_RAM wEnemyMonNick
text ""
text_ram wEnemyMonNick
text_start
cont "attacked!"
prompt
_EnemyAppearedText::
TX_RAM wEnemyMonNick
text ""
text_ram wEnemyMonNick
text_start
line "appeared!"
prompt
_TrainerWantsToFightText::
TX_RAM wTrainerName
text_ram wTrainerName
text " wants"
line "to fight!"
prompt
@ -1252,38 +1272,46 @@ _GhostCantBeIDdText::
prompt
_GoText::
text "Go! @@"
text "Go! @"
text_end
_DoItText::
text "Do it! @@"
text "Do it! @"
text_end
_GetmText::
text "Get'm! @@"
text "Get'm! @"
text_end
_EnemysWeakText::
text "The enemy's weak!"
line "Get'm! @@"
line "Get'm! @"
text_end
_PlayerMon1Text::
TX_RAM wBattleMonNick
text_ram wBattleMonNick
text "!"
done
_PlayerMon2Text::
TX_RAM wBattleMonNick
text " @@"
text_ram wBattleMonNick
text " @"
text_end
_EnoughText::
text "enough!@@"
text "enough!@"
text_end
_OKExclamationText::
text "OK!@@"
text "OK!@"
text_end
_GoodText::
text "good!@@"
text "good!@"
text_end
_ComeBackText::
text ""
text_start
line "Come back!"
done
@ -1299,15 +1327,15 @@ _NotVeryEffectiveText::
_SafariZoneEatingText::
text "Wild @"
TX_RAM wEnemyMonNick
text ""
text_ram wEnemyMonNick
text_start
line "is eating!"
prompt
_SafariZoneAngryText::
text "Wild @"
TX_RAM wEnemyMonNick
text ""
text_ram wEnemyMonNick
text_start
line "is angry!"
prompt
@ -1315,7 +1343,7 @@ _SafariZoneAngryText::
_PickUpPayDayMoneyText::
text "<PLAYER> picked up"
line "¥@"
TX_BCD wTotalPayDayMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
text_bcd wTotalPayDayMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
text "!"
prompt
@ -1354,61 +1382,62 @@ _PartyMenuSwapMonText::
done
_PotionText::
TX_RAM wcd6d
text ""
text_ram wcd6d
text_start
line "recovered by @"
TX_NUM wHPBarHPDifference, 2, 3
text_decimal wHPBarHPDifference, 2, 3
text "!"
done
_AntidoteText::
TX_RAM wcd6d
text_ram wcd6d
text " was"
line "cured of poison!"
done
_ParlyzHealText::
TX_RAM wcd6d
text_ram wcd6d
text "'s"
line "rid of paralysis!"
done
_BurnHealText::
TX_RAM wcd6d
text_ram wcd6d
text "'s"
line "burn was healed!"
done
_IceHealText::
TX_RAM wcd6d
text_ram wcd6d
text " was"
line "defrosted!"
done
_AwakeningText::
TX_RAM wcd6d
text ""
text_ram wcd6d
text_start
line "woke up!"
done
_FullHealText::
TX_RAM wcd6d
text_ram wcd6d
text "'s"
line "health returned!"
done
_ReviveText::
TX_RAM wcd6d
text ""
text_ram wcd6d
text_start
line "is revitalized!"
done
_RareCandyText::
TX_RAM wcd6d
text_ram wcd6d
text " grew"
line "to level @"
TX_NUM wCurEnemyLVL, 1, 3
text "!@@"
text_decimal wCurEnemyLVL, 1, 3
text "!@"
text_end
_TurnedOnPC1Text::
text "<PLAYER> turned on"
@ -1458,7 +1487,7 @@ _DepositHowManyText::
done
_ItemWasStoredText::
TX_RAM wcd6d
text_ram wcd6d
text " was"
line "stored via PC."
prompt
@ -1485,7 +1514,7 @@ _WithdrawHowManyText::
_WithdrewItemText::
text "Withdrew"
line "@"
TX_RAM wcd6d
text_ram wcd6d
text "."
prompt
@ -1530,10 +1559,10 @@ _DepositWhichMonText::
done
_MonWasStoredText::
TX_RAM wcf4b
text_ram wcf4b
text " was"
line "stored in Box @"
TX_RAM wBoxNumString
text_ram wBoxNumString
text "."
prompt
@ -1548,11 +1577,11 @@ _BoxFullText::
prompt
_MonIsTakenOutText::
TX_RAM wcf4b
text_ram wcf4b
text " is"
line "taken out."
cont "Got @"
TX_RAM wcf4b
text_ram wcf4b
text "."
prompt
@ -1577,25 +1606,26 @@ _ReleaseWhichMonText::
_OnceReleasedText::
text "Once released,"
line "@"
TX_RAM wcf4b
text_ram wcf4b
text " is"
cont "gone forever. OK?"
done
_MonWasReleasedText::
TX_RAM wcf4b
text_ram wcf4b
text " was"
line "released outside."
cont "Bye @"
_CF4BExclamationText::
TX_RAM wcf4b
text_ram wcf4b
text "!"
prompt
_RequireCoinCaseText::
text "A COIN CASE is"
line "required!@@"
line "required!@"
text_end
_ExchangeCoinsForPrizesText::
text "We exchange your"
@ -1608,25 +1638,29 @@ _WhichPrizeText::
done
_HereYouGoText::
text "Here you go!@@"
text "Here you go!@"
text_end
_SoYouWantPrizeText::
text "So, you want"
line "@"
TX_RAM wcd6d
text_ram wcd6d
text "?"
done
_SorryNeedMoreCoinsText::
text "Sorry, you need"
line "more coins.@@"
line "more coins.@"
text_end
_OopsYouDontHaveEnoughRoomText::
text "Oops! You don't"
line "have enough room.@@"
line "have enough room.@"
text_end
_OhFineThenText::
text "Oh, fine then.@@"
text "Oh, fine then.@"
text_end
_GetDexRatedText::
text "Want to get your"
@ -1635,7 +1669,8 @@ _GetDexRatedText::
_ClosedOaksPCText::
text "Closed link to"
line "PROF.OAK's PC.@@"
line "PROF.OAK's PC.@"
text_end
_AccessedOaksPCText::
text "Accessed PROF."
@ -1674,10 +1709,13 @@ _OakSpeechText2A::
text "This world is"
line "inhabited by"
cont "creatures called"
cont "#MON!@@"
cont "#MON!@"
text_end
_OakSpeechText2B::
text $51,"For some people,"
text_start
para "For some people,"
line "#MON are"
cont "pets. Others use"
cont "them for fights."
@ -1720,7 +1758,7 @@ _DoYouWantToNicknameText::
text "Do you want to"
line "give a nickname"
cont "to @"
TX_RAM wcd6d
text_ram wcd6d
text "?"
done
@ -1736,18 +1774,19 @@ _HisNameIsText::
prompt
_WillBeTradedText::
TX_RAM wNameOfPlayerMonToBeTraded
text_ram wNameOfPlayerMonToBeTraded
text " and"
line "@"
TX_RAM wcd6d
text_ram wcd6d
text " will"
cont "be traded."
done
_Char00Text::
TX_NUM hSpriteIndexOrTextID,1,2
_TextIDErrorText::
text_decimal hSpriteIndexOrTextID, 1, 2
text " ERROR."
done
_Char55Text::
text $4B,"@@"
_ContCharText::
text "<_CONT>@"
text_end

View file

@ -29,31 +29,32 @@ _WhenYouChangeBoxText::
_ChooseABoxText::
text "Choose a"
line "<pkmn> BOX.@@"
line "<PKMN> BOX.@"
text_end
_EvolvedText::
TX_RAM wcf4b
text_ram wcf4b
text " evolved"
done
_IntoText::
text ""
text_start
line "into @"
TX_RAM wcd6d
text_ram wcd6d
text "!"
done
_StoppedEvolvingText::
text "Huh? @"
TX_RAM wcf4b
text ""
text_ram wcf4b
text_start
line "stopped evolving!"
prompt
_IsEvolvingText::
text "What? @"
TX_RAM wcf4b
text ""
text_ram wcf4b
text_start
line "is evolving!"
done
@ -95,11 +96,13 @@ _FireDefrostedText::
_MonsStatsRoseText::
text "<USER>'s"
line "@"
TX_RAM wcf4b
text "@@"
text_ram wcf4b
text "@"
text_end
_GreatlyRoseText::
text $4c, "greatly@@"
text "<SCROLL>greatly@"
text_end
_RoseText::
text " rose!"
@ -108,11 +111,13 @@ _RoseText::
_MonsStatsFellText::
text "<TARGET>'s"
line "@"
TX_RAM wcf4b
text "@@"
text_ram wcf4b
text "@"
text_end
_GreatlyFellText::
text $4c, "greatly@@"
text "<SCROLL>greatly@"
text_end
_FellText::
text " fell!"
@ -134,35 +139,36 @@ _WasBlownAwayText::
prompt
_ChargeMoveEffectText::
text "<USER>@@"
text "<USER>@"
text_end
_MadeWhirlwindText::
text ""
text_start
line "made a whirlwind!"
prompt
_TookInSunlightText::
text ""
text_start
line "took in sunlight!"
prompt
_LoweredItsHeadText::
text ""
text_start
line "lowered its head!"
prompt
_SkyAttackGlowingText::
text ""
text_start
line "is glowing!"
prompt
_FlewUpHighText::
text ""
text_start
line "flew up high!"
prompt
_DugAHoleText::
text ""
text_start
line "dug a hole!"
prompt
@ -175,14 +181,14 @@ _MimicLearnedMoveText::
text "<USER>"
line "learned"
cont "@"
TX_RAM wcd6d
text_ram wcd6d
text "!"
prompt
_MoveWasDisabledText::
text "<TARGET>'s"
line "@"
TX_RAM wcd6d
text_ram wcd6d
text " was"
cont "disabled!"
prompt
@ -285,7 +291,7 @@ _TransformedText::
text "<USER>"
line "transformed into"
cont "@"
TX_RAM wcd6d
text_ram wcd6d
text "!"
prompt

View file

@ -4,8 +4,8 @@ _PokemartGreetingText::
done
_PokemonFaintedText::
TX_RAM wcd6d
text ""
text_ram wcd6d
text_start
line "fainted!"
done
@ -27,11 +27,11 @@ _PokemartBuyingGreetingText::
done
_PokemartTellBuyPriceText::
TX_RAM wcf4b
text_ram wcf4b
text "?"
line "That will be"
cont "¥@"
TX_BCD hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
text_bcd hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
text ". OK?"
done
@ -58,7 +58,7 @@ _PokemonSellingGreetingText::
_PokemartTellSellPriceText::
text "I can pay you"
line "¥@"
TX_BCD hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
text_bcd hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
text " for that."
done
@ -82,11 +82,12 @@ _PokemartAnythingElseText::
done
_LearnedMove1Text::
TX_RAM wLearnMoveMonName
text_ram wLearnMoveMonName
text " learned"
line "@"
TX_RAM wcf4b
text "!@@"
text_ram wcf4b
text "!@"
text_end
_WhichMoveToForgetText::
text "Which move should"
@ -96,53 +97,55 @@ _WhichMoveToForgetText::
_AbandonLearningText::
text "Abandon learning"
line "@"
TX_RAM wcf4b
text_ram wcf4b
text "?"
done
_DidNotLearnText::
TX_RAM wLearnMoveMonName
text ""
text_ram wLearnMoveMonName
text_start
line "did not learn"
cont "@"
TX_RAM wcf4b
text_ram wcf4b
text "!"
prompt
_TryingToLearnText::
TX_RAM wLearnMoveMonName
text_ram wLearnMoveMonName
text " is"
line "trying to learn"
cont "@"
TX_RAM wcf4b
text_ram wcf4b
text "!"
para "But, @"
TX_RAM wLearnMoveMonName
text ""
text_ram wLearnMoveMonName
text_start
line "can't learn more"
cont "than 4 moves!"
para "Delete an older"
line "move to make room"
cont "for @"
TX_RAM wcf4b
text_ram wcf4b
text "?"
done
_OneTwoAndText::
text "1, 2 and...@@"
text "1, 2 and...@"
text_end
_PoofText::
text " Poof!@@"
text " Poof!@"
text_end
_ForgotAndText::
text ""
text_start
para "@"
TX_RAM wLearnMoveMonName
text_ram wLearnMoveMonName
text " forgot"
line "@"
TX_RAM wcd6d
text_ram wcd6d
text "!"
para "And..."
@ -204,7 +207,8 @@ _CableClubNPCPleaseApplyHereHaveToSaveText::
done
_CableClubNPCPleaseWaitText::
text "Please wait.@@"
text "Please wait.@"
text_end
_CableClubNPCLinkClosedBecauseOfInactivityText::
text "The link has been"

View file

@ -9,12 +9,13 @@ _CableClubNPCMakingPreparationsText::
done
_UsedStrengthText::
TX_RAM wcd6d
text_ram wcd6d
text " used"
line "STRENGTH.@@"
line "STRENGTH.@"
text_end
_CanMoveBouldersText::
TX_RAM wcd6d
text_ram wcd6d
text " can"
line "move boulders."
prompt
@ -40,13 +41,13 @@ _WarpToLastPokemonCenterText::
done
_CannotUseTeleportNowText::
TX_RAM wcd6d
text_ram wcd6d
text " can't"
line "use TELEPORT now."
prompt
_CannotFlyHereText::
TX_RAM wcd6d
text_ram wcd6d
text " can't"
line "FLY here."
prompt
@ -74,18 +75,19 @@ _CannotGetOffHereText::
_GotMonText::
text "<PLAYER> got"
line "@"
TX_RAM wcd6d
text "!@@"
text_ram wcd6d
text "!@"
text_end
_SentToBoxText::
text "There's no more"
line "room for #MON!"
cont "@"
TX_RAM wBoxMonNicks
text_ram wBoxMonNicks
text " was"
cont "sent to #MON"
cont "BOX @"
TX_RAM wcf4b
text_ram wcf4b
text " on PC!"
done

View file

@ -29,19 +29,20 @@ _ItemUseBallText04::
_ItemUseBallText05::
text "All right!"
line "@"
TX_RAM wEnemyMonNick
text_ram wEnemyMonNick
text " was"
cont "caught!@@"
cont "caught!@"
text_end
_ItemUseBallText07::
TX_RAM wBoxMonNicks
text_ram wBoxMonNicks
text " was"
line "transferred to"
cont "BILL's PC!"
prompt
_ItemUseBallText08::
TX_RAM wBoxMonNicks
text_ram wBoxMonNicks
text " was"
line "transferred to"
cont "someone's PC!"
@ -51,13 +52,14 @@ _ItemUseBallText06::
text "New #DEX data"
line "will be added for"
cont "@"
TX_RAM wEnemyMonNick
text "!@@"
text_ram wEnemyMonNick
text "!@"
text_end
_SurfingGotOnText::
text "<PLAYER> got on"
line "@"
TX_RAM wcd6d
text_ram wcd6d
text "!"
prompt
@ -67,10 +69,10 @@ _SurfingNoPlaceToGetOffText::
prompt
_VitaminStatRoseText::
TX_RAM wcd6d
text_ram wcd6d
text "'s"
line "@"
TX_RAM wcf4b
text_ram wcf4b
text " rose."
prompt
@ -104,12 +106,13 @@ _FluteWokeUpText::
_PlayedFluteHadEffectText::
text "<PLAYER> played the"
line "# FLUTE.@@"
line "# FLUTE.@"
text_end
_CoinCaseNumCoinsText::
text "Coins"
line "@"
TX_BCD wPlayerCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
text_bcd wPlayerCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
text " "
prompt
@ -135,13 +138,13 @@ _RestorePPWhichTechniqueText::
done
_PPMaxedOutText::
TX_RAM wcf4b
text_ram wcf4b
text "'s PP"
line "is maxed out."
prompt
_PPIncreasedText::
TX_RAM wcf4b
text_ram wcf4b
text "'s PP"
line "increased."
prompt
@ -161,26 +164,26 @@ _BootedUpHMText::
_TeachMachineMoveText::
text "It contained"
line "@"
TX_RAM wcf4b
text_ram wcf4b
text "!"
para "Teach @"
TX_RAM wcf4b
text ""
text_ram wcf4b
text_start
line "to a #MON?"
done
_MonCannotLearnMachineMoveText::
TX_RAM wcd6d
text_ram wcd6d
text " is not"
line "compatible with"
cont "@"
TX_RAM wcf4b
text_ram wcf4b
text "."
para "It can't learn"
line "@"
TX_RAM wcf4b
text_ram wcf4b
text "."
prompt
@ -217,7 +220,7 @@ _NoCyclingAllowedHereText::
_NoSurfingHereText::
text "No SURFing on"
line "@"
TX_RAM wcd6d
text_ram wcd6d
text " here!"
prompt

View file

@ -1,39 +1,42 @@
_ItemUseText001::
text "<PLAYER> used@@"
text "<PLAYER> used@"
text_end
_ItemUseText002::
TX_RAM wcf4b
text_ram wcf4b
text "!"
done
_GotOnBicycleText1::
text "<PLAYER> got on the@@"
text "<PLAYER> got on the@"
text_end
_GotOnBicycleText2::
TX_RAM wcf4b
text_ram wcf4b
text "!"
prompt
_GotOffBicycleText1::
text "<PLAYER> got off@@"
text "<PLAYER> got off@"
text_end
_GotOffBicycleText2::
text "the @"
TX_RAM wcf4b
text_ram wcf4b
text "."
prompt
_ThrewAwayItemText::
text "Threw away"
line "@"
TX_RAM wcd6d
text_ram wcd6d
text "."
prompt
_IsItOKToTossItemText::
text "Is it OK to toss"
line "@"
TX_RAM wcf4b
text_ram wcf4b
text "?"
prompt
@ -43,10 +46,10 @@ _TooImportantToTossText::
prompt
_AlreadyKnowsText::
TX_RAM wcd6d
text_ram wcd6d
text " knows"
line "@"
TX_RAM wcf4b
text_ram wcf4b
text "!"
prompt
@ -58,21 +61,22 @@ _ConnectCableText::
_TradedForText::
text "<PLAYER> traded"
line "@"
TX_RAM wInGameTradeGiveMonName
text_ram wInGameTradeGiveMonName
text " for"
cont "@"
TX_RAM wInGameTradeReceiveMonName
text "!@@"
text_ram wInGameTradeReceiveMonName
text "!@"
text_end
_WannaTrade1Text::
text "I'm looking for"
line "@"
TX_RAM wInGameTradeGiveMonName
text_ram wInGameTradeGiveMonName
text "! Wanna"
para "trade one for"
line "@"
TX_RAM wInGameTradeReceiveMonName
text_ram wInGameTradeReceiveMonName
text "? "
done
@ -84,7 +88,7 @@ _NoTrade1Text::
_WrongMon1Text::
text "What? That's not"
line "@"
TX_RAM wInGameTradeGiveMonName
text_ram wInGameTradeGiveMonName
text "!"
para "If you get one,"
@ -98,7 +102,7 @@ _Thanks1Text::
_AfterTrade1Text::
text "Isn't my old"
line "@"
TX_RAM wInGameTradeReceiveMonName
text_ram wInGameTradeReceiveMonName
text " great?"
done
@ -107,10 +111,10 @@ _WannaTrade2Text::
line "you want to trade"
para "your @"
TX_RAM wInGameTradeGiveMonName
text ""
text_ram wInGameTradeGiveMonName
text_start
line "for @"
TX_RAM wInGameTradeReceiveMonName
text_ram wInGameTradeReceiveMonName
text "?"
done
@ -122,7 +126,7 @@ _NoTrade2Text::
_WrongMon2Text::
text "Hmmm? This isn't"
line "@"
TX_RAM wInGameTradeGiveMonName
text_ram wInGameTradeGiveMonName
text "."
para "Think of me when"
@ -135,7 +139,7 @@ _Thanks2Text::
_AfterTrade2Text::
text "The @"
TX_RAM wInGameTradeGiveMonName
text_ram wInGameTradeGiveMonName
text " you"
line "traded to me"
@ -145,12 +149,12 @@ _AfterTrade2Text::
_WannaTrade3Text::
text "Hi! Do you have"
line "@"
TX_RAM wInGameTradeGiveMonName
text_ram wInGameTradeGiveMonName
text "?"
para "Want to trade it"
line "for @"
TX_RAM wInGameTradeReceiveMonName
text_ram wInGameTradeReceiveMonName
text "?"
done
@ -161,7 +165,7 @@ _NoTrade3Text::
_WrongMon3Text::
text "...This is no"
line "@"
TX_RAM wInGameTradeGiveMonName
text_ram wInGameTradeGiveMonName
text "."
para "If you get one,"
@ -175,11 +179,11 @@ _Thanks3Text::
_AfterTrade3Text::
text "How is my old"
line "@"
TX_RAM wInGameTradeReceiveMonName
text_ram wInGameTradeReceiveMonName
text "?"
para "My @"
TX_RAM wInGameTradeGiveMonName
text_ram wInGameTradeGiveMonName
text " is"
line "doing great!"
done
@ -190,7 +194,7 @@ _NothingToCutText::
prompt
_UsedCutText::
TX_RAM wcd6d
text_ram wcd6d
text " hacked"
line "away with CUT!"
prompt

View file

@ -1838,10 +1838,10 @@ AnimationWavyScreen:
call Delay3
xor a
ld [hAutoBGTransferEnabled], a
ld a, SCREEN_HEIGHT_PIXELS
ld a, SCREEN_HEIGHT_PX
ld [hWY], a
ld d, $80 ; terminator
ld e, SCREEN_HEIGHT_PIXELS - 1
ld e, SCREEN_HEIGHT_PX - 1
ld c, $ff
ld hl, WavyScreenLineOffsets
.loop
@ -2538,7 +2538,7 @@ AnimationShakeEnemyHUD:
; Now that the regular BG is showing the same thing the window was, move the
; window off the screen so that we can modify its contents below.
ld a, SCREEN_HEIGHT_PIXELS
ld a, SCREEN_HEIGHT_PX
ld [hWY], a
; Copy wTileMap to VRAM such that the row below the enemy HUD (in wTileMap) is
@ -2575,7 +2575,7 @@ AnimationShakeEnemyHUD:
; Restore the original graphics.
call AnimationShowMonPic
call ClearSprites
ld a, SCREEN_HEIGHT_PIXELS
ld a, SCREEN_HEIGHT_PX
ld [hWY], a
ld hl, vBGMap1
call BattleAnimCopyTileMapToVRAM

View file

@ -10,7 +10,7 @@ BattleTransition:
; Determine which OAM block is being used by the enemy trainer sprite (if there
; is one).
ld hl, wSpriteStateData1 + 2
ld hl, wSpritePlayerStateData1ImageIndex
ld a, [hSpriteIndexOrTextID] ; enemy trainer sprite index (0 if wild battle)
ld c, a
ld b, 0

View file

@ -71,28 +71,28 @@ PrintBeginningBattleText:
ret
WildMonAppearedText:
TX_FAR _WildMonAppearedText
db "@"
text_far _WildMonAppearedText
text_end
HookedMonAttackedText:
TX_FAR _HookedMonAttackedText
db "@"
text_far _HookedMonAttackedText
text_end
EnemyAppearedText:
TX_FAR _EnemyAppearedText
db "@"
text_far _EnemyAppearedText
text_end
TrainerWantsToFightText:
TX_FAR _TrainerWantsToFightText
db "@"
text_far _TrainerWantsToFightText
text_end
UnveiledGhostText:
TX_FAR _UnveiledGhostText
db "@"
text_far _UnveiledGhostText
text_end
GhostCantBeIDdText:
TX_FAR _GhostCantBeIDdText
db "@"
text_far _GhostCantBeIDdText
text_end
PrintSendOutMonMessage:
ld hl, wEnemyMonHP
@ -138,39 +138,39 @@ PrintSendOutMonMessage:
jp PrintText
GoText:
TX_FAR _GoText
TX_ASM
text_far _GoText
text_asm
jr PrintPlayerMon1Text
DoItText:
TX_FAR _DoItText
TX_ASM
text_far _DoItText
text_asm
jr PrintPlayerMon1Text
GetmText:
TX_FAR _GetmText
TX_ASM
text_far _GetmText
text_asm
jr PrintPlayerMon1Text
EnemysWeakText:
TX_FAR _EnemysWeakText
TX_ASM
text_far _EnemysWeakText
text_asm
PrintPlayerMon1Text:
ld hl, PlayerMon1Text
ret
PlayerMon1Text:
TX_FAR _PlayerMon1Text
db "@"
text_far _PlayerMon1Text
text_end
RetreatMon:
ld hl, PlayerMon2Text
jp PrintText
PlayerMon2Text:
TX_FAR _PlayerMon2Text
TX_ASM
text_far _PlayerMon2Text
text_asm
push de
push bc
ld hl, wEnemyMonHP + 1
@ -220,18 +220,18 @@ PlayerMon2Text:
ret
EnoughText:
TX_FAR _EnoughText
TX_ASM
text_far _EnoughText
text_asm
jr PrintComeBackText
OKExclamationText:
TX_FAR _OKExclamationText
TX_ASM
text_far _OKExclamationText
text_asm
jr PrintComeBackText
GoodText:
TX_FAR _GoodText
TX_ASM
text_far _GoodText
text_asm
jr PrintComeBackText
PrintComeBackText:
@ -239,5 +239,5 @@ PrintComeBackText:
ret
ComeBackText:
TX_FAR _ComeBackText
db "@"
text_far _ComeBackText
text_end

View file

@ -207,8 +207,8 @@ StartBattle:
jr EnemyRan ; if b was greater than the random value, the enemy runs
.outOfSafariBallsText
TX_FAR _OutOfSafariBallsText
db "@"
text_far _OutOfSafariBallsText
text_end
.playerSendOutFirstMon
xor a
@ -270,12 +270,12 @@ EnemyRan:
jpab AnimationSlideEnemyMonOff
WildRanText:
TX_FAR _WildRanText
db "@"
text_far _WildRanText
text_end
EnemyRanText:
TX_FAR _EnemyRanText
db "@"
text_far _EnemyRanText
text_end
MainInBattleLoop:
call ReadPlayerMonCurHPAndStatus
@ -532,16 +532,16 @@ HandlePoisonBurnLeechSeed:
ret
HurtByPoisonText:
TX_FAR _HurtByPoisonText
db "@"
text_far _HurtByPoisonText
text_end
HurtByBurnText:
TX_FAR _HurtByBurnText
db "@"
text_far _HurtByBurnText
text_end
HurtByLeechSeedText:
TX_FAR _HurtByLeechSeedText
db "@"
text_far _HurtByLeechSeedText
text_end
; decreases the mon's current HP by 1/16 of the Max HP (multiplied by number of toxic ticks if active)
; note that the toxic ticks are considered even if the damage is not poison (hence the Leech Seed glitch)
@ -858,8 +858,8 @@ FaintEnemyPokemon:
jpab GainExperience
EnemyMonFaintedText:
TX_FAR _EnemyMonFaintedText
db "@"
text_far _EnemyMonFaintedText
text_end
EndLowHealthAlarm:
; This function is called when the player has the won the battle. It turns off
@ -949,12 +949,12 @@ TrainerBattleVictory:
predef_jump AddBCDPredef
MoneyForWinningText:
TX_FAR _MoneyForWinningText
db "@"
text_far _MoneyForWinningText
text_end
TrainerDefeatedText:
TX_FAR _TrainerDefeatedText
db "@"
text_far _TrainerDefeatedText
text_end
PlayBattleVictoryMusic:
push af
@ -1044,8 +1044,8 @@ RemoveFaintedPlayerMon:
jp PrintText
PlayerMonFaintedText:
TX_FAR _PlayerMonFaintedText
db "@"
text_far _PlayerMonFaintedText
text_end
; asks if you want to use next mon
; stores whether you ran in C flag
@ -1078,8 +1078,8 @@ DoUseNextMonDialogue:
jp TryRunningFromBattle
UseNextMonText:
TX_FAR _UseNextMonText
db "@"
text_far _UseNextMonText
text_end
; choose next player mon to send out
; stores whether enemy mon has no HP left in Z flag
@ -1165,16 +1165,16 @@ HandlePlayerBlackOut:
ret
Sony1WinText:
TX_FAR _Sony1WinText
db "@"
text_far _Sony1WinText
text_end
PlayerBlackedOutText2:
TX_FAR _PlayerBlackedOutText2
db "@"
text_far _PlayerBlackedOutText2
text_end
LinkBattleLostText:
TX_FAR _LinkBattleLostText
db "@"
text_far _LinkBattleLostText
text_end
; slides pic of fainted mon downwards until it disappears
; bug: when this is called, [hAutoBGTransferEnabled] is non-zero, so there is screen tearing
@ -1442,12 +1442,12 @@ EnemySendOutFirstMon:
jp SwitchPlayerMon
TrainerAboutToUseText:
TX_FAR _TrainerAboutToUseText
db "@"
text_far _TrainerAboutToUseText
text_end
TrainerSentOutText:
TX_FAR _TrainerSentOutText
db "@"
text_far _TrainerSentOutText
text_end
; tests if the player has any pokemon that are not fainted
; sets d = 0 if all fainted, d != 0 if some mons are still alive
@ -1487,8 +1487,8 @@ HasMonFainted:
ret
NoWillText:
TX_FAR _NoWillText
db "@"
text_far _NoWillText
text_end
; try to run from battle (hl = player speed, de = enemy speed)
; stores whether the attempt was successful in carry flag
@ -1610,16 +1610,16 @@ TryRunningFromBattle:
ret
CantEscapeText:
TX_FAR _CantEscapeText
db "@"
text_far _CantEscapeText
text_end
NoRunningText:
TX_FAR _NoRunningText
db "@"
text_far _NoRunningText
text_end
GotAwayText:
TX_FAR _GotAwayText
db "@"
text_far _GotAwayText
text_end
; copies from party data to battle mon data when sending out a new player mon
LoadBattleMonFromParty:
@ -2289,8 +2289,8 @@ UseBagItem:
ret
ItemsCantBeUsedHereText:
TX_FAR _ItemsCantBeUsedHereText
db "@"
text_far _ItemsCantBeUsedHereText
text_end
PartyMenuOrRockOrRun:
dec a ; was Run selected?
@ -2434,8 +2434,8 @@ SwitchPlayerMon:
ret
AlreadyOutText:
TX_FAR _AlreadyOutText
db "@"
text_far _AlreadyOutText
text_end
BattleMenu_RunWasSelected:
call LoadScreenTilesFromBuffer1
@ -2667,12 +2667,12 @@ SelectMenuItem:
jp MoveSelectionMenu
MoveNoPPText:
TX_FAR _MoveNoPPText
db "@"
text_far _MoveNoPPText
text_end
MoveDisabledText:
TX_FAR _MoveDisabledText
db "@"
text_far _MoveDisabledText
text_end
WhichTechniqueString:
db "WHICH TECHNIQUE?@"
@ -2744,8 +2744,8 @@ AnyMoveToSelect:
ret
NoMovesLeftText:
TX_FAR _NoMovesLeftText
db "@"
text_far _NoMovesLeftText
text_end
SwapMovesInMenu:
ld a, [wMenuItemToSwap]
@ -3239,8 +3239,8 @@ MirrorMoveCheck:
jp ExecutePlayerMoveDone
MultiHitText:
TX_FAR _MultiHitText
db "@"
text_far _MultiHitText
text_end
ExecutePlayerMoveDone:
xor a
@ -3269,12 +3269,12 @@ PrintGhostText:
ret
ScaredText:
TX_FAR _ScaredText
db "@"
text_far _ScaredText
text_end
GetOutText:
TX_FAR _GetOutText
db "@"
text_far _GetOutText
text_end
IsGhostBattle:
ld a, [wIsInBattle]
@ -3557,64 +3557,64 @@ CheckPlayerStatusConditions:
ret
FastAsleepText:
TX_FAR _FastAsleepText
db "@"
text_far _FastAsleepText
text_end
WokeUpText:
TX_FAR _WokeUpText
db "@"
text_far _WokeUpText
text_end
IsFrozenText:
TX_FAR _IsFrozenText
db "@"
text_far _IsFrozenText
text_end
FullyParalyzedText:
TX_FAR _FullyParalyzedText
db "@"
text_far _FullyParalyzedText
text_end
FlinchedText:
TX_FAR _FlinchedText
db "@"
text_far _FlinchedText
text_end
MustRechargeText:
TX_FAR _MustRechargeText
db "@"
text_far _MustRechargeText
text_end
DisabledNoMoreText:
TX_FAR _DisabledNoMoreText
db "@"
text_far _DisabledNoMoreText
text_end
IsConfusedText:
TX_FAR _IsConfusedText
db "@"
text_far _IsConfusedText
text_end
HurtItselfText:
TX_FAR _HurtItselfText
db "@"
text_far _HurtItselfText
text_end
ConfusedNoMoreText:
TX_FAR _ConfusedNoMoreText
db "@"
text_far _ConfusedNoMoreText
text_end
SavingEnergyText:
TX_FAR _SavingEnergyText
db "@"
text_far _SavingEnergyText
text_end
UnleashedEnergyText:
TX_FAR _UnleashedEnergyText
db "@"
text_far _UnleashedEnergyText
text_end
ThrashingAboutText:
TX_FAR _ThrashingAboutText
db "@"
text_far _ThrashingAboutText
text_end
AttackContinuesText:
TX_FAR _AttackContinuesText
db "@"
text_far _AttackContinuesText
text_end
CantMoveText:
TX_FAR _CantMoveText
db "@"
text_far _CantMoveText
text_end
PrintMoveIsDisabledText:
ld hl, wPlayerSelectedMove
@ -3635,8 +3635,8 @@ PrintMoveIsDisabledText:
jp PrintText
MoveIsDisabledText:
TX_FAR _MoveIsDisabledText
db "@"
text_far _MoveIsDisabledText
text_end
HandleSelfConfusionDamage:
ld hl, HurtItselfText
@ -3692,8 +3692,8 @@ PrintMonName1Text:
; this likely had to do with Japanese grammar that got translated,
; but the functionality didn't get removed
MonName1Text:
TX_FAR _MonName1Text
TX_ASM
text_far _MonName1Text
text_asm
ld a, [hWhoseTurn]
and a
ld a, [wPlayerMoveNum]
@ -3717,13 +3717,13 @@ MonName1Text:
ret
Used1Text:
TX_FAR _Used1Text
TX_ASM
text_far _Used1Text
text_asm
jr PrintInsteadText
Used2Text:
TX_FAR _Used2Text
TX_ASM
text_far _Used2Text
text_asm
; fall through
PrintInsteadText:
@ -3734,8 +3734,8 @@ PrintInsteadText:
ret
InsteadText:
TX_FAR _InsteadText
TX_ASM
text_far _InsteadText
text_asm
; fall through
PrintMoveName:
@ -3743,8 +3743,8 @@ PrintMoveName:
ret
_PrintMoveName:
TX_FAR _CF4BText
TX_ASM
text_far _CF4BText
text_asm
ld hl, ExclamationPointPointerTable
ld a, [wd11e] ; exclamation point num
add a
@ -3766,24 +3766,24 @@ ExclamationPointPointerTable:
dw ExclamationPoint5Text
ExclamationPoint1Text:
TX_FAR _ExclamationPoint1Text
db "@"
text_far _ExclamationPoint1Text
text_end
ExclamationPoint2Text:
TX_FAR _ExclamationPoint2Text
db "@"
text_far _ExclamationPoint2Text
text_end
ExclamationPoint3Text:
TX_FAR _ExclamationPoint3Text
db "@"
text_far _ExclamationPoint3Text
text_end
ExclamationPoint4Text:
TX_FAR _ExclamationPoint4Text
db "@"
text_far _ExclamationPoint4Text
text_end
ExclamationPoint5Text:
TX_FAR _ExclamationPoint5Text
db "@"
text_far _ExclamationPoint5Text
text_end
; this function does nothing useful
; if the move being used is in set [1-4] from ExclamationPointMoveSets,
@ -3874,24 +3874,24 @@ PrintMoveFailureText:
jp ApplyDamageToEnemyPokemon
AttackMissedText:
TX_FAR _AttackMissedText
db "@"
text_far _AttackMissedText
text_end
KeptGoingAndCrashedText:
TX_FAR _KeptGoingAndCrashedText
db "@"
text_far _KeptGoingAndCrashedText
text_end
UnaffectedText:
TX_FAR _UnaffectedText
db "@"
text_far _UnaffectedText
text_end
PrintDoesntAffectText:
ld hl, DoesntAffectMonText
jp PrintText
DoesntAffectMonText:
TX_FAR _DoesntAffectMonText
db "@"
text_far _DoesntAffectMonText
text_end
; if there was a critical hit or an OHKO was successful, print the corresponding text
PrintCriticalOHKOText:
@ -3919,12 +3919,12 @@ CriticalOHKOTextPointers:
dw OHKOText
CriticalHitText:
TX_FAR _CriticalHitText
db "@"
text_far _CriticalHitText
text_end
OHKOText:
TX_FAR _OHKOText
db "@"
text_far _OHKOText
text_end
; checks if a traded mon will disobey due to lack of badges
; stores whether the mon will use a move in Z flag
@ -4108,24 +4108,24 @@ CheckForDisobedience:
ret
LoafingAroundText:
TX_FAR _LoafingAroundText
db "@"
text_far _LoafingAroundText
text_end
BeganToNapText:
TX_FAR _BeganToNapText
db "@"
text_far _BeganToNapText
text_end
WontObeyText:
TX_FAR _WontObeyText
db "@"
text_far _WontObeyText
text_end
TurnedAwayText:
TX_FAR _TurnedAwayText
db "@"
text_far _TurnedAwayText
text_end
IgnoredOrdersText:
TX_FAR _IgnoredOrdersText
db "@"
text_far _IgnoredOrdersText
text_end
; sets b, c, d, and e for the CalculateDamage routine in the case of an attack by the player mon
GetDamageVarsForPlayerAttack:
@ -4485,37 +4485,42 @@ CalculateDamage:
ld b, 4
call Divide
; Update wCurDamage.
; Capped at MAX_NEUTRAL_DAMAGE - MIN_NEUTRAL_DAMAGE: 999 - 2 = 997.
ld hl, wDamage
ld b, [hl]
ld a, [hQuotient + 3]
add b
ld [hQuotient + 3], a
jr nc, .asm_3dfd0
jr nc, .dont_cap_1
ld a, [hQuotient + 2]
inc a
ld [hQuotient + 2], a
and a
jr z, .asm_3e004
jr z, .cap
.asm_3dfd0
.dont_cap_1
ld a, [hQuotient]
ld b, a
ld a, [hQuotient + 1]
or a
jr nz, .asm_3e004
jr nz, .cap
ld a, [hQuotient + 2]
cp 998 / $100
jr c, .asm_3dfe8
cp 998 / $100 + 1
jr nc, .asm_3e004
ld a, [hQuotient + 3]
cp 998 % $100
jr nc, .asm_3e004
cp (MAX_NEUTRAL_DAMAGE - MIN_NEUTRAL_DAMAGE + 1) / $100
jr c, .dont_cap_2
.asm_3dfe8
cp (MAX_NEUTRAL_DAMAGE - MIN_NEUTRAL_DAMAGE + 1) / $100 + 1
jr nc, .cap
ld a, [hQuotient + 3]
cp (MAX_NEUTRAL_DAMAGE - MIN_NEUTRAL_DAMAGE + 1) % $100
jr nc, .cap
.dont_cap_2
inc hl
ld a, [hQuotient + 3]
ld b, [hl]
add b
@ -4525,36 +4530,37 @@ CalculateDamage:
ld b, [hl]
adc b
ld [hl], a
jr c, .asm_3e004
jr c, .cap
ld a, [hl]
cp 998 / $100
jr c, .asm_3e00a
cp 998 / $100 + 1
jr nc, .asm_3e004
cp (MAX_NEUTRAL_DAMAGE - MIN_NEUTRAL_DAMAGE + 1) / $100
jr c, .dont_cap_3
cp (MAX_NEUTRAL_DAMAGE - MIN_NEUTRAL_DAMAGE + 1) / $100 + 1
jr nc, .cap
inc hl
ld a, [hld]
cp 998 % $100
jr c, .asm_3e00a
cp (MAX_NEUTRAL_DAMAGE - MIN_NEUTRAL_DAMAGE + 1) % $100
jr c, .dont_cap_3
.asm_3e004
; cap at 997
ld a, 997 / $100
.cap
ld a, (MAX_NEUTRAL_DAMAGE - MIN_NEUTRAL_DAMAGE) / $100
ld [hli], a
ld a, 997 % $100
ld a, (MAX_NEUTRAL_DAMAGE - MIN_NEUTRAL_DAMAGE) % $100
ld [hld], a
.asm_3e00a
; add 2
.dont_cap_3
; Add back MIN_NEUTRAL_DAMAGE (capping at 999).
inc hl
ld a, [hl]
add 2
add MIN_NEUTRAL_DAMAGE
ld [hld], a
jr nc, .done
jr nc, .dont_floor
inc [hl]
.dont_floor
.done
; minimum damage is 1
; Returns nz and nc.
ld a, 1
and a
ret
@ -4997,12 +5003,12 @@ AttackSubstitute:
jp DrawHUDsAndHPBars
SubstituteTookDamageText:
TX_FAR _SubstituteTookDamageText
db "@"
text_far _SubstituteTookDamageText
text_end
SubstituteBrokeText:
TX_FAR _SubstituteBrokeText
db "@"
text_far _SubstituteBrokeText
text_end
; this function raises the attack modifier of a pokemon using Rage when that pokemon is attacked
HandleBuildingRage:
@ -5048,8 +5054,8 @@ HandleBuildingRage:
ret
BuildingRageText:
TX_FAR _BuildingRageText
db "@"
text_far _BuildingRageText
text_end
; copy last move for Mirror Move
; sets zero flag on failure and unsets zero flag on success
@ -5084,8 +5090,8 @@ MirrorMoveCopyMove:
ret
MirrorMoveFailedText:
TX_FAR _MirrorMoveFailedText
db "@"
text_far _MirrorMoveFailedText
text_end
; function used to reload move data for moves like Mirror Move and Metronome
ReloadMoveData:
@ -5759,8 +5765,8 @@ EnemyCheckIfMirrorMoveEffect:
jr ExecuteEnemyMoveDone
HitXTimesText:
TX_FAR _HitXTimesText
db "@"
text_far _HitXTimesText
text_end
ExecuteEnemyMoveDone:
ld b, $1
@ -6626,6 +6632,7 @@ LoadHudTilePatterns:
PrintEmptyString:
ld hl, .emptyString
jp PrintText
.emptyString
db "@"

View file

@ -10,9 +10,9 @@ DisplayEffectiveness:
jp PrintText
SuperEffectiveText:
TX_FAR _SuperEffectiveText
db "@"
text_far _SuperEffectiveText
text_end
NotVeryEffectiveText:
TX_FAR _NotVeryEffectiveText
db "@"
text_far _NotVeryEffectiveText
text_end

View file

@ -68,12 +68,12 @@ SleepEffect:
jp PrintDidntAffectText
FellAsleepText:
TX_FAR _FellAsleepText
db "@"
text_far _FellAsleepText
text_end
AlreadyAsleepText:
TX_FAR _AlreadyAsleepText
db "@"
text_far _AlreadyAsleepText
text_end
PoisonEffect:
ld hl, wEnemyMonStatus
@ -162,12 +162,12 @@ PoisonEffect:
jp PrintDidntAffectText
PoisonedText:
TX_FAR _PoisonedText
db "@"
text_far _PoisonedText
text_end
BadlyPoisonedText:
TX_FAR _BadlyPoisonedText
db "@"
text_far _BadlyPoisonedText
text_end
DrainHPEffect:
jpab DrainHPEffect_
@ -297,12 +297,12 @@ opponentAttacker:
jp PrintText
BurnedText:
TX_FAR _BurnedText
db "@"
text_far _BurnedText
text_end
FrozenText:
TX_FAR _FrozenText
db "@"
text_far _FrozenText
text_end
CheckDefrost:
; any fire-type move that has a chance inflict burn (all but Fire Spin) will defrost a frozen target
@ -340,8 +340,8 @@ CheckDefrost:
jp PrintText
FireDefrostedText:
TX_FAR _FireDefrostedText
db "@"
text_far _FireDefrostedText
text_end
StatModifierUpEffect:
ld hl, wPlayerMonStatMods
@ -508,8 +508,8 @@ PrintNothingHappenedText:
jp PrintText
MonsStatsRoseText:
TX_FAR _MonsStatsRoseText
TX_ASM
text_far _MonsStatsRoseText
text_asm
ld hl, GreatlyRoseText
ld a, [hWhoseTurn]
and a
@ -523,12 +523,12 @@ MonsStatsRoseText:
ret
GreatlyRoseText:
TX_DELAY
TX_FAR _GreatlyRoseText
text_pause
text_far _GreatlyRoseText
; fallthrough
RoseText:
TX_FAR _RoseText
db "@"
text_far _RoseText
text_end
StatModifierDownEffect:
ld hl, wEnemyMonStatMods
@ -710,8 +710,8 @@ MoveMissed:
jp ConditionalPrintButItFailed
MonsStatsFellText:
TX_FAR _MonsStatsFellText
TX_ASM
text_far _MonsStatsFellText
text_asm
ld hl, FellText
ld a, [hWhoseTurn]
and a
@ -728,12 +728,12 @@ MonsStatsFellText:
ret
GreatlyFellText:
TX_DELAY
TX_FAR _GreatlyFellText
text_pause
text_far _GreatlyFellText
; fallthrough
FellText:
TX_FAR _FellText
db "@"
text_far _FellText
text_end
PrintStatText:
ld hl, StatsTextStrings
@ -905,16 +905,16 @@ SwitchAndTeleportEffect:
jp PrintText
RanFromBattleText:
TX_FAR _RanFromBattleText
db "@"
text_far _RanFromBattleText
text_end
RanAwayScaredText:
TX_FAR _RanAwayScaredText
db "@"
text_far _RanAwayScaredText
text_end
WasBlownAwayText:
TX_FAR _WasBlownAwayText
db "@"
text_far _WasBlownAwayText
text_end
TwoToFiveAttacksEffect:
ld hl, wPlayerBattleStatus1
@ -1024,8 +1024,8 @@ ChargeEffect:
jp PrintText
ChargeMoveEffectText:
TX_FAR _ChargeMoveEffectText
TX_ASM
text_far _ChargeMoveEffectText
text_asm
ld a, [wChargeMoveNum]
cp RAZOR_WIND
ld hl, MadeWhirlwindText
@ -1048,28 +1048,28 @@ ChargeMoveEffectText:
ret
MadeWhirlwindText:
TX_FAR _MadeWhirlwindText
db "@"
text_far _MadeWhirlwindText
text_end
TookInSunlightText:
TX_FAR _TookInSunlightText
db "@"
text_far _TookInSunlightText
text_end
LoweredItsHeadText:
TX_FAR _LoweredItsHeadText
db "@"
text_far _LoweredItsHeadText
text_end
SkyAttackGlowingText:
TX_FAR _SkyAttackGlowingText
db "@"
text_far _SkyAttackGlowingText
text_end
FlewUpHighText:
TX_FAR _FlewUpHighText
db "@"
text_far _FlewUpHighText
text_end
DugAHoleText:
TX_FAR _DugAHoleText
db "@"
text_far _DugAHoleText
text_end
TrappingEffect:
ld hl, wPlayerBattleStatus1
@ -1146,8 +1146,8 @@ ConfusionSideEffectSuccess:
jp PrintText
BecameConfusedText:
TX_FAR _BecameConfusedText
db "@"
text_far _BecameConfusedText
text_end
ConfusionEffectFailed:
cp CONFUSION_SIDE_EFFECT
@ -1267,8 +1267,8 @@ MimicEffect:
jp PrintButItFailedText_
MimicLearnedMoveText:
TX_FAR _MimicLearnedMoveText
db "@"
text_far _MimicLearnedMoveText
text_end
LeechSeedEffect:
jpab LeechSeedEffect_
@ -1361,8 +1361,8 @@ DisableEffect:
jp PrintButItFailedText_
MoveWasDisabledText:
TX_FAR _MoveWasDisabledText
db "@"
text_far _MoveWasDisabledText
text_end
PayDayEffect:
jpab PayDayEffect_
@ -1383,16 +1383,16 @@ ReflectLightScreenEffect:
jpab ReflectLightScreenEffect_
NothingHappenedText:
TX_FAR _NothingHappenedText
db "@"
text_far _NothingHappenedText
text_end
PrintNoEffectText:
ld hl, NoEffectText
jp PrintText
NoEffectText:
TX_FAR _NoEffectText
db "@"
text_far _NoEffectText
text_end
ConditionalPrintButItFailed:
ld a, [wMoveDidntMiss]
@ -1404,28 +1404,28 @@ PrintButItFailedText_:
jp PrintText
ButItFailedText:
TX_FAR _ButItFailedText
db "@"
text_far _ButItFailedText
text_end
PrintDidntAffectText:
ld hl, DidntAffectText
jp PrintText
DidntAffectText:
TX_FAR _DidntAffectText
db "@"
text_far _DidntAffectText
text_end
IsUnaffectedText:
TX_FAR _IsUnaffectedText
db "@"
text_far _IsUnaffectedText
text_end
PrintMayNotAttackText:
ld hl, ParalyzedMayNotAttackText
jp PrintText
ParalyzedMayNotAttackText:
TX_FAR _ParalyzedMayNotAttackText
db "@"
text_far _ParalyzedMayNotAttackText
text_end
CheckTargetSubstitute:
push hl

View file

@ -84,5 +84,5 @@ DrawText:
db " DRAW@"
PickUpPayDayMoneyText:
TX_FAR _PickUpPayDayMoneyText
db "@"
text_far _PickUpPayDayMoneyText
text_end

View file

@ -340,8 +340,8 @@ BoostExp:
ret
GainedText:
TX_FAR _GainedText
TX_ASM
text_far _GainedText
text_asm
ld a, [wBoostExpByExpAll]
ld hl, WithExpAllText
and a
@ -354,19 +354,19 @@ GainedText:
ret
WithExpAllText:
TX_FAR _WithExpAllText
TX_ASM
text_far _WithExpAllText
text_asm
ld hl, ExpPointsText
ret
BoostedText:
TX_FAR _BoostedText
text_far _BoostedText
ExpPointsText:
TX_FAR _ExpPointsText
db "@"
text_far _ExpPointsText
text_end
GrewLevelText:
TX_FAR _GrewLevelText
TX_SFX_LEVEL_UP
db "@"
text_far _GrewLevelText
sound_level_up
text_end

View file

@ -25,8 +25,8 @@ ConversionEffect_:
jp PrintText
ConvertedTypeText:
TX_FAR _ConvertedTypeText
db "@"
text_far _ConvertedTypeText
text_end
PrintButItFailedText:
ld hl, PrintButItFailedText_

View file

@ -96,9 +96,9 @@ DrainHPEffect_:
jp PrintText
SuckedHealthText:
TX_FAR _SuckedHealthText
db "@"
text_far _SuckedHealthText
text_end
DreamWasEatenText:
TX_FAR _DreamWasEatenText
db "@"
text_far _DreamWasEatenText
text_end

View file

@ -17,6 +17,6 @@ FocusEnergyEffect_:
jpab PrintButItFailedText_
GettingPumpedText:
TX_DELAY
TX_FAR _GettingPumpedText
db "@"
text_pause
text_far _GettingPumpedText
text_end

View file

@ -77,5 +77,5 @@ ResetStats:
ret
StatusChangesEliminatedText:
TX_FAR _StatusChangesEliminatedText
db "@"
text_far _StatusChangesEliminatedText
text_end

View file

@ -108,13 +108,13 @@ HealEffect_:
jp BankswitchEtoF
StartedSleepingEffect:
TX_FAR _StartedSleepingEffect
db "@"
text_far _StartedSleepingEffect
text_end
FellAsleepBecameHealthyText:
TX_FAR _FellAsleepBecameHealthyText
db "@"
text_far _FellAsleepBecameHealthyText
text_end
RegainedHealthText:
TX_FAR _RegainedHealthText
db "@"
text_far _RegainedHealthText
text_end

View file

@ -32,9 +32,9 @@ LeechSeedEffect_:
jp PrintText
WasSeededText:
TX_FAR _WasSeededText
db "@"
text_far _WasSeededText
text_end
EvadedAttackText:
TX_FAR _EvadedAttackText
db "@"
text_far _EvadedAttackText
text_end

View file

@ -15,5 +15,5 @@ MistEffect_:
jpab PrintButItFailedText_
ShroudedInMistText:
TX_FAR _ShroudedInMistText
db "@"
text_far _ShroudedInMistText
text_end

View file

@ -41,5 +41,5 @@ PayDayEffect_:
jp PrintText
CoinsScatteredText:
TX_FAR _CoinsScatteredText
db "@"
text_far _CoinsScatteredText
text_end

View file

@ -66,5 +66,5 @@ RecoilEffect_:
ld hl, HitWithRecoilText
jp PrintText
HitWithRecoilText:
TX_FAR _HitWithRecoilText
db "@"
text_far _HitWithRecoilText
text_end

View file

@ -33,12 +33,12 @@ ReflectLightScreenEffect_:
jp BankswitchEtoF
LightScreenProtectedText:
TX_FAR _LightScreenProtectedText
db "@"
text_far _LightScreenProtectedText
text_end
ReflectGainedArmorText:
TX_FAR _ReflectGainedArmorText
db "@"
text_far _ReflectGainedArmorText
text_end
BankswitchEtoF:
ld b, BANK(BattleCore)

View file

@ -65,13 +65,13 @@ SubstituteEffect_:
jp PrintText
SubstituteText:
TX_FAR _SubstituteText
db "@"
text_far _SubstituteText
text_end
HasSubstituteText:
TX_FAR _HasSubstituteText
db "@"
text_far _HasSubstituteText
text_end
TooWeakSubstituteText:
TX_FAR _TooWeakSubstituteText
db "@"
text_far _TooWeakSubstituteText
text_end

View file

@ -144,5 +144,5 @@ TransformEffect_:
jp BankswitchEtoF
TransformedText:
TX_FAR _TransformedText
db "@"
text_far _TransformedText
text_end

View file

@ -28,9 +28,9 @@ PrintSafariZoneBattleText:
jp PrintText
SafariZoneEatingText:
TX_FAR _SafariZoneEatingText
db "@"
text_far _SafariZoneEatingText
text_end
SafariZoneAngryText:
TX_FAR _SafariZoneAngryText
db "@"
text_far _SafariZoneAngryText
text_end

View file

@ -549,7 +549,7 @@ AIPrintItemUseAndUpdateHPBar:
jp DecrementAICount
AISwitchIfEnoughMons:
; enemy trainer switches if there are 3 or more unfainted mons in party
; enemy trainer switches if there are 2 or more unfainted mons in party
ld a, [wEnemyPartyCount]
ld c, a
ld hl, wEnemyMon1HP
@ -573,7 +573,7 @@ AISwitchIfEnoughMons:
jr nz, .loop
ld a, d ; how many available monsters are there?
cp 2 ; don't bother if only 1 or 2
cp 2 ; don't bother if only 1
jp nc, SwitchEnemyMon
and a
ret
@ -610,8 +610,8 @@ SwitchEnemyMon:
ret
AIBattleWithdrawText:
TX_FAR _AIBattleWithdrawText
db "@"
text_far _AIBattleWithdrawText
text_end
AIUseFullHeal:
call AIPlayRestoringSFX
@ -735,5 +735,5 @@ AIPrintItemUse_:
jp PrintText
AIBattleUseItemText:
TX_FAR _AIBattleUseItemText
db "@"
text_far _AIBattleUseItemText
text_end

View file

@ -72,14 +72,14 @@ SilphCoMapList:
db $FF
CardKeySuccessText::
TX_FAR _CardKeySuccessText1
TX_SFX_ITEM_1
TX_FAR _CardKeySuccessText2
db "@"
text_far _CardKeySuccessText1
sound_get_item_1
text_far _CardKeySuccessText2
text_end
CardKeyFailText::
TX_FAR _CardKeyFailText
db "@"
text_far _CardKeyFailText
text_end
; d = Y
; e = X
@ -88,7 +88,7 @@ GetCoordsInFrontOfPlayer:
ld d, a
ld a, [wXCoord]
ld e, a
ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction
ld a, [wSpritePlayerStateData1FacingDirection]
and a
jr nz, .notFacingDown
; facing down

View file

@ -73,20 +73,20 @@ GiveFossilToCinnabarLab::
ret
LabFossil_610ae:
TX_FAR _Lab4Text_610ae
db "@"
text_far _Lab4Text_610ae
text_end
LabFossil_610b3:
TX_FAR _Lab4Text_610b3
db "@"
text_far _Lab4Text_610b3
text_end
LabFossil_610b8:
TX_FAR _Lab4Text_610b8
db "@"
text_far _Lab4Text_610b8
text_end
LabFossil_610bd:
TX_FAR _Lab4Text_610bd
db "@"
text_far _Lab4Text_610bd
text_end
PrintFossilsInBag:
; Prints each fossil in the player's bag on a separate line in the menu.

View file

@ -1,3 +1,5 @@
CIRCLE_TILE_ID EQU $70
DisplayDiploma::
call SaveScreenTilesToBuffer2
call GBPalWhiteOutWithDelay3
@ -8,7 +10,7 @@ DisplayDiploma::
set 6, [hl]
call DisableLCD
ld hl, CircleTile
ld de, vChars2 + $700
ld de, vChars2 + CIRCLE_TILE_ID * $10
ld bc, $10
ld a, BANK(CircleTile)
call FarCopyData2
@ -94,7 +96,7 @@ DiplomaTextPointersAndCoords:
dwCoord 9, 16
DiplomaText:
db $70,"Diploma",$70,"@"
db CIRCLE_TILE_ID, "Diploma", CIRCLE_TILE_ID, "@"
DiplomaPlayer:
db "Player@"

View file

@ -44,5 +44,5 @@ DisplayElevatorFloorMenu:
ret
WhichFloorText:
TX_FAR _WhichFloorText
db "@"
text_far _WhichFloorText
text_end

View file

@ -69,14 +69,14 @@ SetPokedexOwnedFlag:
jp PrintText
GotMonText:
TX_FAR _GotMonText
TX_SFX_ITEM_1
db "@"
text_far _GotMonText
sound_get_item_1
text_end
SentToBoxText:
TX_FAR _SentToBoxText
db "@"
text_far _SentToBoxText
text_end
BoxIsFullText:
TX_FAR _BoxIsFullText
db "@"
text_far _BoxIsFullText
text_end

View file

@ -21,8 +21,8 @@ HiddenItems:
INCLUDE "data/events/hidden_item_coords.asm"
FoundHiddenItemText::
TX_FAR _FoundHiddenItemText
TX_ASM
text_far _FoundHiddenItemText
text_asm
ld a, [wHiddenObjectFunctionArgument] ; item ID
ld b, a
ld c, 1
@ -46,8 +46,8 @@ FoundHiddenItemText::
jp TextScriptEnd
HiddenItemBagFullText::
TX_FAR _HiddenItemBagFullText
db "@"
text_far _HiddenItemBagFullText
text_end
HiddenCoins:
ld b, COIN_CASE
@ -121,15 +121,15 @@ HiddenCoins:
INCLUDE "data/events/hidden_coins.asm"
FoundHiddenCoinsText::
TX_FAR _FoundHiddenCoinsText
TX_SFX_ITEM_2
db "@"
text_far _FoundHiddenCoinsText
sound_get_item_2
text_end
DroppedHiddenCoinsText::
TX_FAR _FoundHiddenCoins2Text
TX_SFX_ITEM_2
TX_FAR _DroppedHiddenCoinsText
db "@"
text_far _FoundHiddenCoins2Text
sound_get_item_2
text_far _DroppedHiddenCoinsText
text_end
FindHiddenItemOrCoinsIndex:
ld a, [wHiddenObjectY]

View file

@ -15,7 +15,7 @@ PrintBenchGuyText:
.match
ld a, [hli]
ld b, a
ld a, [wSpriteStateData1 + 9]
ld a, [wSpritePlayerStateData1FacingDirection]
cp b
jr nz, .loop ; player isn't facing left at the bench guy
ld a, [hl]
@ -50,59 +50,59 @@ BenchGuyTextPointers:
db $FF
ViridianCityPokecenterBenchGuyText::
TX_FAR _ViridianCityPokecenterGuyText
db "@"
text_far _ViridianCityPokecenterGuyText
text_end
PewterCityPokecenterBenchGuyText::
TX_FAR _PewterCityPokecenterGuyText
db "@"
text_far _PewterCityPokecenterGuyText
text_end
CeruleanCityPokecenterBenchGuyText::
TX_FAR _CeruleanPokecenterGuyText
db "@"
text_far _CeruleanPokecenterGuyText
text_end
LavenderCityPokecenterBenchGuyText::
TX_FAR _LavenderPokecenterGuyText
db "@"
text_far _LavenderPokecenterGuyText
text_end
MtMoonPokecenterBenchGuyText::
TX_FAR _MtMoonPokecenterBenchGuyText
db "@"
text_far _MtMoonPokecenterBenchGuyText
text_end
RockTunnelPokecenterBenchGuyText::
TX_FAR _RockTunnelPokecenterGuyText
db "@"
text_far _RockTunnelPokecenterGuyText
text_end
UnusedBenchGuyText1::
TX_FAR _UnusedBenchGuyText1
db "@"
text_far _UnusedBenchGuyText1
text_end
UnusedBenchGuyText2::
TX_FAR _UnusedBenchGuyText2
db "@"
text_far _UnusedBenchGuyText2
text_end
UnusedBenchGuyText3::
TX_FAR _UnusedBenchGuyText3
db "@"
text_far _UnusedBenchGuyText3
text_end
VermilionCityPokecenterBenchGuyText::
TX_FAR _VermilionPokecenterGuyText
db "@"
text_far _VermilionPokecenterGuyText
text_end
CeladonCityPokecenterBenchGuyText::
TX_FAR _CeladonCityPokecenterGuyText
db "@"
text_far _CeladonCityPokecenterGuyText
text_end
FuchsiaCityPokecenterBenchGuyText::
TX_FAR _FuchsiaCityPokecenterGuyText
db "@"
text_far _FuchsiaCityPokecenterGuyText
text_end
CinnabarIslandPokecenterBenchGuyText::
TX_FAR _CinnabarPokecenterGuyText
db "@"
text_far _CinnabarPokecenterGuyText
text_end
SaffronCityPokecenterBenchGuyText::
TX_ASM
text_asm
CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI
ld hl, SaffronCityPokecenterBenchGuyText2
jr nz, .asm_624f2
@ -112,13 +112,13 @@ SaffronCityPokecenterBenchGuyText::
jp TextScriptEnd
SaffronCityPokecenterBenchGuyText1:
TX_FAR _SaffronCityPokecenterGuyText1
db "@"
text_far _SaffronCityPokecenterGuyText1
text_end
SaffronCityPokecenterBenchGuyText2:
TX_FAR _SaffronCityPokecenterGuyText2
db "@"
text_far _SaffronCityPokecenterGuyText2
text_end
CeladonCityHotelText::
TX_FAR _CeladonCityHotelText
db "@"
text_far _CeladonCityHotelText
text_end

View file

@ -1,6 +1,6 @@
BillsHousePC:
call EnableAutoTextBoxDrawing
ld a, [wSpriteStateData1 + 9]
ld a, [wSpritePlayerStateData1FacingDirection]
cp SPRITE_FACING_UP
ret nz
CheckEvent EVENT_LEFT_BILLS_HOUSE_AFTER_HELPING
@ -45,13 +45,13 @@ BillsHousePC:
ret
BillsHouseMonitorText::
TX_FAR _BillsHouseMonitorText
db "@"
text_far _BillsHouseMonitorText
text_end
BillsHouseInitiatedText::
TX_FAR _BillsHouseInitiatedText
TX_BLINK
TX_ASM
text_far _BillsHouseInitiatedText
text_promptbutton
text_asm
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
call PlaySound
@ -65,7 +65,7 @@ BillsHouseInitiatedText::
jp TextScriptEnd
BillsHousePokemonList::
TX_ASM
text_asm
call SaveScreenTilesToBuffer1
ld hl, BillsHousePokemonListText1
call PrintText
@ -119,8 +119,8 @@ BillsHousePokemonList::
jp TextScriptEnd
BillsHousePokemonListText1:
TX_FAR _BillsHousePokemonListText1
db "@"
text_far _BillsHousePokemonListText1
text_end
BillsMonListText:
db "EEVEE"
@ -130,5 +130,5 @@ BillsMonListText:
next "CANCEL@"
BillsHousePokemonListText2:
TX_FAR _BillsHousePokemonListText2
db "@"
text_far _BillsHousePokemonListText2
text_end

View file

@ -9,5 +9,5 @@ PrintBookcaseText:
tx_pre_jump BookcaseText
BookcaseText::
TX_FAR _BookcaseText
db "@"
text_far _BookcaseText
text_end

View file

@ -1,5 +1,5 @@
BookOrSculptureText::
TX_ASM
text_asm
ld hl, PokemonBooksText
ld a, [wCurMapTileset]
cp MANSION ; Celadon Mansion tileset
@ -13,9 +13,9 @@ BookOrSculptureText::
jp TextScriptEnd
PokemonBooksText:
TX_FAR _PokemonBooksText
db "@"
text_far _PokemonBooksText
text_end
DiglettSculptureText:
TX_FAR _DiglettSculptureText
db "@"
text_far _DiglettSculptureText
text_end

View file

@ -1,6 +1,6 @@
; prints text for bookshelves in buildings without sign events
PrintBookshelfText::
ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction
ld a, [wSpritePlayerStateData1FacingDirection]
cp SPRITE_FACING_UP
jr nz, .noMatch
; facing up

View file

@ -1,12 +1,12 @@
PrintCinnabarQuiz:
ld a, [wSpriteStateData1 + 9]
ld a, [wSpritePlayerStateData1FacingDirection]
cp SPRITE_FACING_UP
ret nz
call EnableAutoTextBoxDrawing
tx_pre_jump CinnabarGymQuiz
CinnabarGymQuiz::
TX_ASM
text_asm
xor a
ld [wOpponentAfterWrongAnswer], a
ld a, [wHiddenObjectFunctionArgument]
@ -36,8 +36,8 @@ CinnabarGymQuiz::
jp TextScriptEnd
CinnabarGymQuizIntroText:
TX_FAR _CinnabarGymQuizIntroText
db "@"
text_far _CinnabarGymQuizIntroText
text_end
CinnabarQuizQuestions:
dw CinnabarQuizQuestionsText1
@ -48,28 +48,28 @@ CinnabarQuizQuestions:
dw CinnabarQuizQuestionsText6
CinnabarQuizQuestionsText1:
TX_FAR _CinnabarQuizQuestionsText1
db "@"
text_far _CinnabarQuizQuestionsText1
text_end
CinnabarQuizQuestionsText2:
TX_FAR _CinnabarQuizQuestionsText2
db "@"
text_far _CinnabarQuizQuestionsText2
text_end
CinnabarQuizQuestionsText3:
TX_FAR _CinnabarQuizQuestionsText3
db "@"
text_far _CinnabarQuizQuestionsText3
text_end
CinnabarQuizQuestionsText4:
TX_FAR _CinnabarQuizQuestionsText4
db "@"
text_far _CinnabarQuizQuestionsText4
text_end
CinnabarQuizQuestionsText5:
TX_FAR _CinnabarQuizQuestionsText5
db "@"
text_far _CinnabarQuizQuestionsText5
text_end
CinnabarQuizQuestionsText6:
TX_FAR _CinnabarQuizQuestionsText6
db "@"
text_far _CinnabarQuizQuestionsText6
text_end
CinnabarGymGateFlagAction:
EventFlagAddress hl, EVENT_CINNABAR_GYM_GATE0_UNLOCKED
@ -117,10 +117,10 @@ CinnabarGymQuiz_1ea92:
ret
CinnabarGymQuizCorrectText:
TX_SFX_ITEM_1
TX_FAR _CinnabarGymQuizCorrectText
TX_BLINK
TX_ASM
sound_get_item_1
text_far _CinnabarGymQuizCorrectText
text_promptbutton
text_asm
ld a, [hBackupGymGateIndex]
AdjustEventBit EVENT_CINNABAR_GYM_GATE0_UNLOCKED, 0
@ -137,8 +137,8 @@ CinnabarGymQuizCorrectText:
jp TextScriptEnd
CinnabarGymQuizIncorrectText:
TX_FAR _CinnabarGymQuizIncorrectText
db "@"
text_far _CinnabarGymQuizIncorrectText
text_end
UpdateCinnabarGymGateTileBlocks_::
; Update the overworld map with open floor blocks or locked gate blocks

View file

@ -1,3 +1,3 @@
ElevatorText::
TX_FAR _ElevatorText
db "@"
text_far _ElevatorText
text_end

View file

@ -3,21 +3,21 @@ PrintFightingDojoText2:
tx_pre_jump EnemiesOnEverySideText
EnemiesOnEverySideText::
TX_FAR _EnemiesOnEverySideText
db "@"
text_far _EnemiesOnEverySideText
text_end
PrintFightingDojoText3:
call EnableAutoTextBoxDrawing
tx_pre_jump WhatGoesAroundComesAroundText
WhatGoesAroundComesAroundText::
TX_FAR _WhatGoesAroundComesAroundText
db "@"
text_far _WhatGoesAroundComesAroundText
text_end
PrintFightingDojoText:
call EnableAutoTextBoxDrawing
tx_pre_jump FightingDojoText
FightingDojoText::
TX_FAR _FightingDojoText
db "@"
text_far _FightingDojoText
text_end

View file

@ -3,7 +3,7 @@ GymStatues:
; if in a gym and dont have the corresponding badge, a = GymStatueText1_id and jp PrintPredefTextID
; else ret
call EnableAutoTextBoxDrawing
ld a, [wSpriteStateData1 + 9]
ld a, [wSpritePlayerStateData1FacingDirection]
cp SPRITE_FACING_UP
ret nz
ld hl, .BadgeFlags
@ -40,9 +40,9 @@ GymStatues:
db $ff
GymStatueText1::
TX_FAR _GymStatueText1
db "@"
text_far _GymStatueText1
text_end
GymStatueText2::
TX_FAR _GymStatueText2
db "@"
text_far _GymStatueText2
text_end

View file

@ -1,10 +1,10 @@
PrintIndigoPlateauHQText:
ld a, [wSpriteStateData1 + 9]
ld a, [wSpritePlayerStateData1FacingDirection]
cp SPRITE_FACING_UP
ret nz
call EnableAutoTextBoxDrawing
tx_pre_jump IndigoPlateauHQText
IndigoPlateauHQText::
TX_FAR _IndigoPlateauHQText
db "@"
text_far _IndigoPlateauHQText
text_end

View file

@ -1,5 +1,5 @@
IndigoPlateauStatues::
TX_ASM
text_asm
ld hl, IndigoPlateauStatuesText1
call PrintText
ld a, [wXCoord]
@ -12,13 +12,13 @@ IndigoPlateauStatues::
jp TextScriptEnd
IndigoPlateauStatuesText1:
TX_FAR _IndigoPlateauStatuesText1
db "@"
text_far _IndigoPlateauStatuesText1
text_end
IndigoPlateauStatuesText2:
TX_FAR _IndigoPlateauStatuesText2
db "@"
text_far _IndigoPlateauStatuesText2
text_end
IndigoPlateauStatuesText3:
TX_FAR _IndigoPlateauStatuesText3
db "@"
text_far _IndigoPlateauStatuesText3
text_end

View file

@ -4,5 +4,5 @@ PrintMagazinesText:
ret
MagazinesText::
TX_FAR _MagazinesText
db "@"
text_far _MagazinesText
text_end

View file

@ -7,8 +7,8 @@ AerodactylFossil:
ret
AerodactylFossilText::
TX_FAR _AerodactylFossilText
db "@"
text_far _AerodactylFossilText
text_end
KabutopsFossil:
ld a, FOSSIL_KABUTOPS
@ -19,8 +19,8 @@ KabutopsFossil:
ret
KabutopsFossilText::
TX_FAR _KabutopsFossilText
db "@"
text_far _KabutopsFossilText
text_end
DisplayMonFrontSpriteInBox:
; Displays a pokemon's front sprite in a pop-up window.

View file

@ -3,5 +3,5 @@ PrintNewBikeText:
tx_pre_jump NewBicycleText
NewBicycleText::
TX_FAR _NewBicycleText
db "@"
text_far _NewBicycleText
text_end

View file

@ -1,10 +1,10 @@
DisplayOakLabEmailText:
ld a, [wSpriteStateData1 + 9]
ld a, [wSpritePlayerStateData1FacingDirection]
cp SPRITE_FACING_UP
ret nz
call EnableAutoTextBoxDrawing
tx_pre_jump OakLabEmailText
OakLabEmailText::
TX_FAR _OakLabEmailText
db "@"
text_far _OakLabEmailText
text_end

View file

@ -3,8 +3,8 @@ DisplayOakLabLeftPoster:
tx_pre_jump PushStartText
PushStartText::
TX_FAR _PushStartText
db "@"
text_far _PushStartText
text_end
DisplayOakLabRightPoster:
call EnableAutoTextBoxDrawing
@ -21,9 +21,9 @@ DisplayOakLabRightPoster:
jp PrintPredefTextID
SaveOptionText::
TX_FAR _SaveOptionText
db "@"
text_far _SaveOptionText
text_end
StrengthsAndWeaknessesText::
TX_FAR _StrengthsAndWeaknessesText
db "@"
text_far _StrengthsAndWeaknessesText
text_end

View file

@ -1,6 +1,6 @@
OpenPokemonCenterPC:
ld a, [wSpriteStateData1 + 9]
cp SPRITE_FACING_UP ; check to see if player is facing up
ld a, [wSpritePlayerStateData1FacingDirection]
cp SPRITE_FACING_UP
ret nz
call EnableAutoTextBoxDrawing
ld a, $1
@ -8,4 +8,4 @@ OpenPokemonCenterPC:
tx_pre_jump PokemonCenterPCText
PokemonCenterPCText::
TX_POKECENTER_PC
script_pokecenter_pc

View file

@ -1,3 +1,3 @@
PokemonStuffText::
TX_FAR _PokemonStuffText
db "@"
text_far _PokemonStuffText
text_end

View file

@ -3,12 +3,12 @@ PrintRedSNESText:
tx_pre_jump RedBedroomSNESText
RedBedroomSNESText::
TX_FAR _RedBedroomSNESText
db "@"
text_far _RedBedroomSNESText
text_end
OpenRedsPC:
call EnableAutoTextBoxDrawing
tx_pre_jump RedBedroomPCText
RedBedroomPCText::
TX_PLAYERS_PC
script_players_pc

View file

@ -1,5 +1,5 @@
Route15GateLeftBinoculars:
ld a, [wSpriteStateData1 + 9]
ld a, [wSpritePlayerStateData1FacingDirection]
cp SPRITE_FACING_UP
ret nz
call EnableAutoTextBoxDrawing
@ -10,5 +10,5 @@ Route15GateLeftBinoculars:
jp DisplayMonFrontSpriteInBox
Route15UpstairsBinocularsText::
TX_FAR _Route15UpstairsBinocularsText
db "@"
text_far _Route15UpstairsBinocularsText
text_end

View file

@ -59,7 +59,7 @@ PrintSafariGameOverText::
jp PrintText
SafariGameOverText:
TX_ASM
text_asm
ld a, [wNumSafariBalls]
and a
jr z, .noMoreSafariBalls
@ -71,9 +71,9 @@ SafariGameOverText:
jp TextScriptEnd
TimesUpText:
TX_FAR _TimesUpText
db "@"
text_far _TimesUpText
text_end
GameOverText:
TX_FAR _GameOverText
db "@"
text_far _GameOverText
text_end

View file

@ -7,7 +7,7 @@ PrintBlackboardLinkCableText:
ret
LinkCableHelp::
TX_ASM
text_asm
call SaveScreenTilesToBuffer1
ld hl, LinkCableHelpText1
call PrintText
@ -60,12 +60,12 @@ LinkCableHelp::
jp TextScriptEnd
LinkCableHelpText1:
TX_FAR _LinkCableHelpText1
db "@"
text_far _LinkCableHelpText1
text_end
LinkCableHelpText2:
TX_FAR _LinkCableHelpText2
db "@"
text_far _LinkCableHelpText2
text_end
HowToLinkText:
db "HOW TO LINK"
@ -79,19 +79,19 @@ LinkCableInfoTexts:
dw LinkCableInfoText3
LinkCableInfoText1:
TX_FAR _LinkCableInfoText1
db "@"
text_far _LinkCableInfoText1
text_end
LinkCableInfoText2:
TX_FAR _LinkCableInfoText2
db "@"
text_far _LinkCableInfoText2
text_end
LinkCableInfoText3:
TX_FAR _LinkCableInfoText3
db "@"
text_far _LinkCableInfoText3
text_end
ViridianSchoolBlackboard::
TX_ASM
text_asm
call SaveScreenTilesToBuffer1
ld hl, ViridianSchoolBlackboardText1
call PrintText
@ -177,12 +177,12 @@ ViridianSchoolBlackboard::
jp TextScriptEnd
ViridianSchoolBlackboardText1:
TX_FAR _ViridianSchoolBlackboardText1
db "@"
text_far _ViridianSchoolBlackboardText1
text_end
ViridianSchoolBlackboardText2:
TX_FAR _ViridianSchoolBlackboardText2
db "@"
text_far _ViridianSchoolBlackboardText2
text_end
StatusAilmentText1:
db " SLP"
@ -192,7 +192,9 @@ StatusAilmentText1:
StatusAilmentText2:
db " BRN"
next " FRZ"
next " QUIT@@"
next " QUIT@"
db "@" ; unused
ViridianBlackboardStatusPointers:
dw ViridianBlackboardSleepText
@ -202,21 +204,21 @@ ViridianBlackboardStatusPointers:
dw ViridianBlackboardFrozenText
ViridianBlackboardSleepText:
TX_FAR _ViridianBlackboardSleepText
db "@"
text_far _ViridianBlackboardSleepText
text_end
ViridianBlackboardPoisonText:
TX_FAR _ViridianBlackboardPoisonText
db "@"
text_far _ViridianBlackboardPoisonText
text_end
ViridianBlackboardPrlzText:
TX_FAR _ViridianBlackboardPrlzText
db "@"
text_far _ViridianBlackboardPrlzText
text_end
ViridianBlackboardBurnText:
TX_FAR _ViridianBlackboardBurnText
db "@"
text_far _ViridianBlackboardBurnText
text_end
ViridianBlackboardFrozenText:
TX_FAR _ViridianBlackboardFrozenText
db "@"
text_far _ViridianBlackboardFrozenText
text_end

View file

@ -6,12 +6,12 @@ PrintNotebookText:
jp PrintPredefTextID
TMNotebook::
TX_FAR TMNotebookText
TX_WAIT
db "@"
text_far TMNotebookText
text_linkpromptbutton
text_end
ViridianSchoolNotebook::
TX_ASM
text_asm
ld hl, ViridianSchoolNotebookText1
call PrintText
call TurnPageSchoolNotebook
@ -40,26 +40,26 @@ TurnPageSchoolNotebook:
ret
TurnPageText:
TX_FAR _TurnPageText
db "@"
text_far _TurnPageText
text_end
ViridianSchoolNotebookText5:
TX_FAR _ViridianSchoolNotebookText5
TX_WAIT
db "@"
text_far _ViridianSchoolNotebookText5
text_linkpromptbutton
text_end
ViridianSchoolNotebookText1:
TX_FAR _ViridianSchoolNotebookText1
db "@"
text_far _ViridianSchoolNotebookText1
text_end
ViridianSchoolNotebookText2:
TX_FAR _ViridianSchoolNotebookText2
db "@"
text_far _ViridianSchoolNotebookText2
text_end
ViridianSchoolNotebookText3:
TX_FAR _ViridianSchoolNotebookText3
db "@"
text_far _ViridianSchoolNotebookText3
text_end
ViridianSchoolNotebookText4:
TX_FAR _ViridianSchoolNotebookText4
db "@"
text_far _ViridianSchoolNotebookText4
text_end

View file

@ -1,7 +1,7 @@
TownMapText::
TX_FAR _TownMapText
TX_BLINK
TX_ASM
text_far _TownMapText
text_promptbutton
text_asm
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, wd730

View file

@ -3,8 +3,8 @@ PrintTrashText:
tx_pre_jump VermilionGymTrashText
VermilionGymTrashText::
TX_FAR _VermilionGymTrashText
db "@"
text_far _VermilionGymTrashText
text_end
GymTrashScript:
call EnableAutoTextBoxDrawing
@ -128,8 +128,8 @@ GymTrashCans:
db 2, 11, 13, 0, 0 ; 14
VermilionGymTrashSuccessText1::
TX_FAR _VermilionGymTrashSuccessText1
TX_ASM
text_far _VermilionGymTrashSuccessText1
text_asm
call WaitForSoundToFinish
ld a, SFX_SWITCH
call PlaySound
@ -138,12 +138,12 @@ VermilionGymTrashSuccessText1::
; unused
VermilionGymTrashSuccessText2::
TX_FAR _VermilionGymTrashSuccessText2
db "@"
text_far _VermilionGymTrashSuccessText2
text_end
; unused
VermilionGymTrashSuccesPlaySfx:
TX_ASM
text_asm
call WaitForSoundToFinish
ld a, SFX_SWITCH
call PlaySound
@ -151,8 +151,8 @@ VermilionGymTrashSuccesPlaySfx:
jp TextScriptEnd
VermilionGymTrashSuccessText3::
TX_FAR _VermilionGymTrashSuccessText3
TX_ASM
text_far _VermilionGymTrashSuccessText3
text_asm
call WaitForSoundToFinish
ld a, SFX_GO_INSIDE
call PlaySound
@ -160,8 +160,8 @@ VermilionGymTrashSuccessText3::
jp TextScriptEnd
VermilionGymTrashFailText::
TX_FAR _VermilionGymTrashFailText
TX_ASM
text_far _VermilionGymTrashFailText
text_asm
call WaitForSoundToFinish
ld a, SFX_DENIED
call PlaySound

View file

@ -230,8 +230,7 @@ InGameTrade_GetReceivedMonPointer:
ret
InGameTrade_TrainerString:
; "TRAINER@@@@@@@@@@"
db $5d, "@@@@@@@@@@"
db "<TRAINER>@@@@@@@@@@"
InGameTradeTextPointers:
dw TradeTextPointers1
@ -260,71 +259,71 @@ TradeTextPointers3:
dw AfterTrade3Text
ConnectCableText:
TX_FAR _ConnectCableText
db "@"
text_far _ConnectCableText
text_end
TradedForText:
TX_FAR _TradedForText
TX_SFX_KEY_ITEM
TX_DELAY
db "@"
text_far _TradedForText
sound_get_key_item
text_pause
text_end
WannaTrade1Text:
TX_FAR _WannaTrade1Text
db "@"
text_far _WannaTrade1Text
text_end
NoTrade1Text:
TX_FAR _NoTrade1Text
db "@"
text_far _NoTrade1Text
text_end
WrongMon1Text:
TX_FAR _WrongMon1Text
db "@"
text_far _WrongMon1Text
text_end
Thanks1Text:
TX_FAR _Thanks1Text
db "@"
text_far _Thanks1Text
text_end
AfterTrade1Text:
TX_FAR _AfterTrade1Text
db "@"
text_far _AfterTrade1Text
text_end
WannaTrade2Text:
TX_FAR _WannaTrade2Text
db "@"
text_far _WannaTrade2Text
text_end
NoTrade2Text:
TX_FAR _NoTrade2Text
db "@"
text_far _NoTrade2Text
text_end
WrongMon2Text:
TX_FAR _WrongMon2Text
db "@"
text_far _WrongMon2Text
text_end
Thanks2Text:
TX_FAR _Thanks2Text
db "@"
text_far _Thanks2Text
text_end
AfterTrade2Text:
TX_FAR _AfterTrade2Text
db "@"
text_far _AfterTrade2Text
text_end
WannaTrade3Text:
TX_FAR _WannaTrade3Text
db "@"
text_far _WannaTrade3Text
text_end
NoTrade3Text:
TX_FAR _NoTrade3Text
db "@"
text_far _NoTrade3Text
text_end
WrongMon3Text:
TX_FAR _WrongMon3Text
db "@"
text_far _WrongMon3Text
text_end
Thanks3Text:
TX_FAR _Thanks3Text
db "@"
text_far _Thanks3Text
text_end
AfterTrade3Text:
TX_FAR _AfterTrade3Text
db "@"
text_far _AfterTrade3Text
text_end

View file

@ -46,26 +46,26 @@ OaksAideScript:
ret
OaksAideHiText:
TX_FAR _OaksAideHiText
db "@"
text_far _OaksAideHiText
text_end
OaksAideUhOhText:
TX_FAR _OaksAideUhOhText
db "@"
text_far _OaksAideUhOhText
text_end
OaksAideComeBackText:
TX_FAR _OaksAideComeBackText
db "@"
text_far _OaksAideComeBackText
text_end
OaksAideHereYouGoText:
TX_FAR _OaksAideHereYouGoText
db "@"
text_far _OaksAideHereYouGoText
text_end
OaksAideGotItemText:
TX_FAR _OaksAideGotItemText
TX_SFX_ITEM_1
db "@"
text_far _OaksAideGotItemText
sound_get_item_1
text_end
OaksAideNoRoomText:
TX_FAR _OaksAideNoRoomText
db "@"
text_far _OaksAideNoRoomText
text_end

View file

@ -45,10 +45,10 @@ PickUpItem:
ret
FoundItemText:
TX_FAR _FoundItemText
TX_SFX_ITEM_1
db "@"
text_far _FoundItemText
sound_get_item_1
text_end
NoMoreRoomForItemText:
TX_FAR _NoMoreRoomForItemText
db "@"
text_far _NoMoreRoomForItemText
text_end

View file

@ -19,7 +19,7 @@ DisplayPokemonCenterDialogue_::
ld hl, NeedYourPokemonText
call PrintText
ld a, $18
ld [wSpriteStateData1 + $12], a ; make the nurse turn to face the machine
ld [wSprite01StateData1ImageIndex], a ; make the nurse turn to face the machine
call Delay3
predef HealParty
callba AnimateHealingMachine ; do the healing machine animation
@ -34,7 +34,7 @@ DisplayPokemonCenterDialogue_::
ld hl, PokemonFightingFitText
call PrintText
ld a, $14
ld [wSpriteStateData1 + $12], a ; make the nurse bow
ld [wSprite01StateData1ImageIndex], a ; make the nurse bow
ld c, a
call DelayFrames
jr .done
@ -46,23 +46,23 @@ DisplayPokemonCenterDialogue_::
jp UpdateSprites
PokemonCenterWelcomeText:
TX_FAR _PokemonCenterWelcomeText
db "@"
text_far _PokemonCenterWelcomeText
text_end
ShallWeHealYourPokemonText:
TX_DELAY
TX_FAR _ShallWeHealYourPokemonText
db "@"
text_pause
text_far _ShallWeHealYourPokemonText
text_end
NeedYourPokemonText:
TX_FAR _NeedYourPokemonText
db "@"
text_far _NeedYourPokemonText
text_end
PokemonFightingFitText:
TX_FAR _PokemonFightingFitText
db "@"
text_far _PokemonFightingFitText
text_end
PokemonCenterFarewellText:
TX_DELAY
TX_FAR _PokemonCenterFarewellText
db "@"
text_pause
text_far _PokemonCenterFarewellText
text_end

View file

@ -52,8 +52,8 @@ DisplayDexRating:
ret
PokedexRatingText_441cc:
TX_FAR _OaksLabText_441cc
db "@"
text_far _OaksLabText_441cc
text_end
DexRatingsTable:
db 10
@ -90,65 +90,65 @@ DexRatingsTable:
dw PokedexRatingText_4424c
PokedexRatingText_44201:
TX_FAR _OaksLabText_44201
db "@"
text_far _OaksLabText_44201
text_end
PokedexRatingText_44206:
TX_FAR _OaksLabText_44206
db "@"
text_far _OaksLabText_44206
text_end
PokedexRatingText_4420b:
TX_FAR _OaksLabText_4420b
db "@"
text_far _OaksLabText_4420b
text_end
PokedexRatingText_44210:
TX_FAR _OaksLabText_44210
db "@"
text_far _OaksLabText_44210
text_end
PokedexRatingText_44215:
TX_FAR _OaksLabText_44215
db "@"
text_far _OaksLabText_44215
text_end
PokedexRatingText_4421a:
TX_FAR _OaksLabText_4421a
db "@"
text_far _OaksLabText_4421a
text_end
PokedexRatingText_4421f:
TX_FAR _OaksLabText_4421f
db "@"
text_far _OaksLabText_4421f
text_end
PokedexRatingText_44224:
TX_FAR _OaksLabText_44224
db "@"
text_far _OaksLabText_44224
text_end
PokedexRatingText_44229:
TX_FAR _OaksLabText_44229
db "@"
text_far _OaksLabText_44229
text_end
PokedexRatingText_4422e:
TX_FAR _OaksLabText_4422e
db "@"
text_far _OaksLabText_4422e
text_end
PokedexRatingText_44233:
TX_FAR _OaksLabText_44233
db "@"
text_far _OaksLabText_44233
text_end
PokedexRatingText_44238:
TX_FAR _OaksLabText_44238
db "@"
text_far _OaksLabText_44238
text_end
PokedexRatingText_4423d:
TX_FAR _OaksLabText_4423d
db "@"
text_far _OaksLabText_4423d
text_end
PokedexRatingText_44242:
TX_FAR _OaksLabText_44242
db "@"
text_far _OaksLabText_44242
text_end
PokedexRatingText_44247:
TX_FAR _OaksLabText_44247
db "@"
text_far _OaksLabText_44247
text_end
PokedexRatingText_4424c:
TX_FAR _OaksLabText_4424c
db "@"
text_far _OaksLabText_4424c
text_end

View file

@ -228,45 +228,45 @@ DisplayPokemartDialogue_::
ret
PokemartBuyingGreetingText:
TX_FAR _PokemartBuyingGreetingText
db "@"
text_far _PokemartBuyingGreetingText
text_end
PokemartTellBuyPriceText:
TX_FAR _PokemartTellBuyPriceText
db "@"
text_far _PokemartTellBuyPriceText
text_end
PokemartBoughtItemText:
TX_FAR _PokemartBoughtItemText
db "@"
text_far _PokemartBoughtItemText
text_end
PokemartNotEnoughMoneyText:
TX_FAR _PokemartNotEnoughMoneyText
db "@"
text_far _PokemartNotEnoughMoneyText
text_end
PokemartItemBagFullText:
TX_FAR _PokemartItemBagFullText
db "@"
text_far _PokemartItemBagFullText
text_end
PokemonSellingGreetingText:
TX_FAR _PokemonSellingGreetingText
db "@"
text_far _PokemonSellingGreetingText
text_end
PokemartTellSellPriceText:
TX_FAR _PokemartTellSellPriceText
db "@"
text_far _PokemartTellSellPriceText
text_end
PokemartItemBagEmptyText:
TX_FAR _PokemartItemBagEmptyText
db "@"
text_far _PokemartItemBagEmptyText
text_end
PokemartUnsellableItemText:
TX_FAR _PokemartUnsellableItemText
db "@"
text_far _PokemartUnsellableItemText
text_end
PokemartThankYouText:
TX_FAR _PokemartThankYouText
db "@"
text_far _PokemartThankYouText
text_end
PokemartAnythingElseText:
TX_FAR _PokemartAnythingElseText
db "@"
text_far _PokemartAnythingElseText
text_end

View file

@ -43,17 +43,17 @@ CeladonPrizeMenu::
ret
RequireCoinCaseTextPtr:
TX_FAR _RequireCoinCaseText
TX_WAIT
db "@"
text_far _RequireCoinCaseText
text_linkpromptbutton
text_end
ExchangeCoinsForPrizesTextPtr:
TX_FAR _ExchangeCoinsForPrizesText
db "@"
text_far _ExchangeCoinsForPrizesText
text_end
WhichPrizeTextPtr:
TX_FAR _WhichPrizeText
db "@"
text_far _WhichPrizeText
text_end
GetPrizeMenuId:
; determine which one among the three
@ -263,28 +263,28 @@ UnknownPrizeData:
db $00,$01,$00,$01,$00,$01,$00,$00,$01
HereYouGoTextPtr:
TX_FAR _HereYouGoText
TX_WAIT
db "@"
text_far _HereYouGoText
text_linkpromptbutton
text_end
SoYouWantPrizeTextPtr:
TX_FAR _SoYouWantPrizeText
db "@"
text_far _SoYouWantPrizeText
text_end
SorryNeedMoreCoinsText:
TX_FAR _SorryNeedMoreCoinsText
TX_WAIT
db "@"
text_far _SorryNeedMoreCoinsText
text_linkpromptbutton
text_end
PrizeRoomBagIsFullTextPtr:
TX_FAR _OopsYouDontHaveEnoughRoomText
TX_WAIT
db "@"
text_far _OopsYouDontHaveEnoughRoomText
text_linkpromptbutton
text_end
OhFineThenTextPtr:
TX_FAR _OhFineThenText
TX_WAIT
db "@"
text_far _OhFineThenText
text_linkpromptbutton
text_end
GetPrizeMonLevel:
ld a, [wcf91]

View file

@ -81,8 +81,8 @@ VendingMachineMenu::
jp PrintText
VendingMachineText1:
TX_FAR _VendingMachineText1
db "@"
text_far _VendingMachineText1
text_end
DrinkText:
db "FRESH WATER"
@ -97,20 +97,20 @@ DrinkPriceText:
next "@"
VendingMachineText4:
TX_FAR _VendingMachineText4
db "@"
text_far _VendingMachineText4
text_end
VendingMachineText5:
TX_FAR _VendingMachineText5
db "@"
text_far _VendingMachineText5
text_end
VendingMachineText6:
TX_FAR _VendingMachineText6
db "@"
text_far _VendingMachineText6
text_end
VendingMachineText7:
TX_FAR _VendingMachineText7
db "@"
text_far _VendingMachineText7
text_end
LoadVendingMachineItem:
ld hl, VendingPrices

View file

@ -586,47 +586,47 @@ ItemUseBall:
ItemUseBallText00:
;"It dodged the thrown ball!"
;"This pokemon can't be caught"
TX_FAR _ItemUseBallText00
db "@"
text_far _ItemUseBallText00
text_end
ItemUseBallText01:
;"You missed the pokemon!"
TX_FAR _ItemUseBallText01
db "@"
text_far _ItemUseBallText01
text_end
ItemUseBallText02:
;"Darn! The pokemon broke free!"
TX_FAR _ItemUseBallText02
db "@"
text_far _ItemUseBallText02
text_end
ItemUseBallText03:
;"Aww! It appeared to be caught!"
TX_FAR _ItemUseBallText03
db "@"
text_far _ItemUseBallText03
text_end
ItemUseBallText04:
;"Shoot! It was so close too!"
TX_FAR _ItemUseBallText04
db "@"
text_far _ItemUseBallText04
text_end
ItemUseBallText05:
;"All right! {MonName} was caught!"
;play sound
TX_FAR _ItemUseBallText05
TX_SFX_CAUGHT_MON
TX_BLINK
db "@"
text_far _ItemUseBallText05
sound_caught_mon
text_promptbutton
text_end
ItemUseBallText07:
;"X was transferred to Bill's PC"
TX_FAR _ItemUseBallText07
db "@"
text_far _ItemUseBallText07
text_end
ItemUseBallText08:
;"X was transferred to someone's PC"
TX_FAR _ItemUseBallText08
db "@"
text_far _ItemUseBallText08
text_end
ItemUseBallText06:
;"New DEX data will be added..."
;play sound
TX_FAR _ItemUseBallText06
TX_SFX_DEX_PAGE_ADDED
TX_BLINK
db "@"
text_far _ItemUseBallText06
sound_dex_page_added
text_promptbutton
text_end
ItemUseTownMap:
ld a, [wIsInBattle]
@ -745,12 +745,12 @@ ItemUseSurfboard:
ret
SurfingGotOnText:
TX_FAR _SurfingGotOnText
db "@"
text_far _SurfingGotOnText
text_end
SurfingNoPlaceToGetOffText:
TX_FAR _SurfingNoPlaceToGetOffText
db "@"
text_far _SurfingNoPlaceToGetOffText
text_end
ItemUsePokedex:
predef_jump ShowPokedexMenu
@ -1417,12 +1417,12 @@ ItemUseMedicine:
jp RemoveUsedItem
VitaminStatRoseText:
TX_FAR _VitaminStatRoseText
db "@"
text_far _VitaminStatRoseText
text_end
VitaminNoEffectText:
TX_FAR _VitaminNoEffectText
db "@"
text_far _VitaminNoEffectText
text_end
VitaminText:
db "HEALTH@"
@ -1479,12 +1479,12 @@ BaitRockCommon:
jp DelayFrames
ThrewBaitText:
TX_FAR _ThrewBaitText
db "@"
text_far _ThrewBaitText
text_end
ThrewRockText:
TX_FAR _ThrewRockText
db "@"
text_far _ThrewRockText
text_end
; also used for Dig out-of-battle effect
ItemUseEscapeRope:
@ -1829,17 +1829,17 @@ Route16SnorlaxFluteCoords:
db $ff ; terminator
PlayedFluteNoEffectText:
TX_FAR _PlayedFluteNoEffectText
db "@"
text_far _PlayedFluteNoEffectText
text_end
FluteWokeUpText:
TX_FAR _FluteWokeUpText
db "@"
text_far _FluteWokeUpText
text_end
PlayedFluteHadEffectText:
TX_FAR _PlayedFluteHadEffectText
TX_BLINK
TX_ASM
text_far _PlayedFluteHadEffectText
text_promptbutton
text_asm
ld a, [wIsInBattle]
and a
jr nz, .done
@ -1865,8 +1865,8 @@ ItemUseCoinCase:
jp PrintText
CoinCaseNumCoinsText:
TX_FAR _CoinCaseNumCoinsText
db "@"
text_far _CoinCaseNumCoinsText
text_end
ItemUseOldRod:
call FishingInit
@ -1984,12 +1984,12 @@ ItemUseItemfinder:
jp PrintText
ItemfinderFoundItemText:
TX_FAR _ItemfinderFoundItemText
db "@"
text_far _ItemfinderFoundItemText
text_end
ItemfinderFoundNothingText:
TX_FAR _ItemfinderFoundNothingText
db "@"
text_far _ItemfinderFoundNothingText
text_end
ItemUsePPUp:
ld a, [wIsInBattle]
@ -2173,24 +2173,24 @@ ItemUsePPRestore:
ret
RaisePPWhichTechniqueText:
TX_FAR _RaisePPWhichTechniqueText
db "@"
text_far _RaisePPWhichTechniqueText
text_end
RestorePPWhichTechniqueText:
TX_FAR _RestorePPWhichTechniqueText
db "@"
text_far _RestorePPWhichTechniqueText
text_end
PPMaxedOutText:
TX_FAR _PPMaxedOutText
db "@"
text_far _PPMaxedOutText
text_end
PPIncreasedText:
TX_FAR _PPIncreasedText
db "@"
text_far _PPIncreasedText
text_end
PPRestoredText:
TX_FAR _PPRestoredText
db "@"
text_far _PPRestoredText
text_end
; for items that can't be used from the Item menu
UnusableItem:
@ -2294,20 +2294,20 @@ ItemUseTMHM:
jp RemoveUsedItem
BootedUpTMText:
TX_FAR _BootedUpTMText
db "@"
text_far _BootedUpTMText
text_end
BootedUpHMText:
TX_FAR _BootedUpHMText
db "@"
text_far _BootedUpHMText
text_end
TeachMachineMoveText:
TX_FAR _TeachMachineMoveText
db "@"
text_far _TeachMachineMoveText
text_end
MonCannotLearnMachineMoveText:
TX_FAR _MonCannotLearnMachineMoveText
db "@"
text_far _MonCannotLearnMachineMoveText
text_end
PrintItemUseTextAndRemoveItem:
ld hl, ItemUseText00
@ -2364,54 +2364,54 @@ ItemUseFailed:
jp PrintText
ItemUseNotTimeText:
TX_FAR _ItemUseNotTimeText
db "@"
text_far _ItemUseNotTimeText
text_end
ItemUseNotYoursToUseText:
TX_FAR _ItemUseNotYoursToUseText
db "@"
text_far _ItemUseNotYoursToUseText
text_end
ItemUseNoEffectText:
TX_FAR _ItemUseNoEffectText
db "@"
text_far _ItemUseNoEffectText
text_end
ThrowBallAtTrainerMonText1:
TX_FAR _ThrowBallAtTrainerMonText1
db "@"
text_far _ThrowBallAtTrainerMonText1
text_end
ThrowBallAtTrainerMonText2:
TX_FAR _ThrowBallAtTrainerMonText2
db "@"
text_far _ThrowBallAtTrainerMonText2
text_end
NoCyclingAllowedHereText:
TX_FAR _NoCyclingAllowedHereText
db "@"
text_far _NoCyclingAllowedHereText
text_end
NoSurfingHereText:
TX_FAR _NoSurfingHereText
db "@"
text_far _NoSurfingHereText
text_end
BoxFullCannotThrowBallText:
TX_FAR _BoxFullCannotThrowBallText
db "@"
text_far _BoxFullCannotThrowBallText
text_end
ItemUseText00:
TX_FAR _ItemUseText001
TX_LINE
TX_FAR _ItemUseText002
db "@"
text_far _ItemUseText001
text_low
text_far _ItemUseText002
text_end
GotOnBicycleText:
TX_FAR _GotOnBicycleText1
TX_LINE
TX_FAR _GotOnBicycleText2
db "@"
text_far _GotOnBicycleText1
text_low
text_far _GotOnBicycleText2
text_end
GotOffBicycleText:
TX_FAR _GotOffBicycleText1
TX_LINE
TX_FAR _GotOffBicycleText2
db "@"
text_far _GotOffBicycleText1
text_low
text_far _GotOffBicycleText2
text_end
; restores bonus PP (from PP Ups) when healing at a pokemon center
; also, when a PP Up is used, it increases the current PP by one PP Up bonus
@ -2639,16 +2639,16 @@ TossItem_::
ret
ThrewAwayItemText:
TX_FAR _ThrewAwayItemText
db "@"
text_far _ThrewAwayItemText
text_end
IsItOKToTossItemText:
TX_FAR _IsItOKToTossItemText
db "@"
text_far _IsItOKToTossItemText
text_end
TooImportantToTossText:
TX_FAR _TooImportantToTossText
db "@"
text_far _TooImportantToTossText
text_end
; checks if an item is a key item
; INPUT:

View file

@ -22,5 +22,5 @@ CheckIfMoveIsKnown:
ret
AlreadyKnowsText:
TX_FAR _AlreadyKnowsText
db "@"
text_far _AlreadyKnowsText
text_end

View file

@ -872,8 +872,8 @@ TradeCenter_Trade:
jp CallCurrentTradeCenterFunction
WillBeTradedText:
TX_FAR _WillBeTradedText
db "@"
text_far _WillBeTradedText
text_end
TradeCompleted:
db "Trade completed!@"

View file

@ -110,33 +110,33 @@ CableClubNPC::
jpab LinkMenu
CableClubNPCAreaReservedFor2FriendsLinkedByCableText:
TX_FAR _CableClubNPCAreaReservedFor2FriendsLinkedByCableText
db "@"
text_far _CableClubNPCAreaReservedFor2FriendsLinkedByCableText
text_end
CableClubNPCWelcomeText:
TX_FAR _CableClubNPCWelcomeText
db "@"
text_far _CableClubNPCWelcomeText
text_end
CableClubNPCPleaseApplyHereHaveToSaveText:
TX_FAR _CableClubNPCPleaseApplyHereHaveToSaveText
db "@"
text_far _CableClubNPCPleaseApplyHereHaveToSaveText
text_end
CableClubNPCPleaseWaitText:
TX_FAR _CableClubNPCPleaseWaitText
TX_DELAY
db "@"
text_far _CableClubNPCPleaseWaitText
text_pause
text_end
CableClubNPCLinkClosedBecauseOfInactivityText:
TX_FAR _CableClubNPCLinkClosedBecauseOfInactivityText
db "@"
text_far _CableClubNPCLinkClosedBecauseOfInactivityText
text_end
CableClubNPCPleaseComeAgainText:
TX_FAR _CableClubNPCPleaseComeAgainText
db "@"
text_far _CableClubNPCPleaseComeAgainText
text_end
CableClubNPCMakingPreparationsText:
TX_FAR _CableClubNPCMakingPreparationsText
db "@"
text_far _CableClubNPCMakingPreparationsText
text_end
CloseLinkConnection:
call Delay3

View file

@ -41,7 +41,7 @@ DisplayTextIDInit::
; loop to copy C1X9 (direction the sprite is facing) to C2X9 for each sprite
; this is done because when you talk to an NPC, they turn to look your way
; the original direction they were facing must be restored after the dialogue is over
ld hl, wSpriteStateData1 + $19
ld hl, wSprite01StateData1FacingDirection
ld c, $0f
ld de, $10
.spriteFacingDirectionCopyLoop
@ -54,7 +54,7 @@ DisplayTextIDInit::
jr nz, .spriteFacingDirectionCopyLoop
; loop to force all the sprites in the middle of animation to stand still
; (so that they don't like they're frozen mid-step during the dialogue)
ld hl, wSpriteStateData1 + 2
ld hl, wSpritePlayerStateData1ImageIndex
ld de, $10
ld c, e
.spriteStandStillLoop

View file

@ -116,5 +116,5 @@ HallOfFameNoText:
db "HALL OF FAME No @"
AccessedHoFPCText:
TX_FAR _AccessedHoFPCText
db "@"
text_far _AccessedHoFPCText
text_end

View file

@ -136,7 +136,7 @@ LinkMenu:
ld [wLetterPrintingDelayFlags], a
ld hl, wd72e
set 6, [hl]
ld hl, TextTerminator_6b20
ld hl, LinkMenuEmptyText
call PrintText
call SaveScreenTilesToBuffer1
ld hl, WhereWouldYouLikeText
@ -293,16 +293,16 @@ LinkMenu:
ret
WhereWouldYouLikeText:
TX_FAR _WhereWouldYouLikeText
db "@"
text_far _WhereWouldYouLikeText
text_end
PleaseWaitText:
TX_FAR _PleaseWaitText
db "@"
text_far _PleaseWaitText
text_end
LinkCanceledText:
TX_FAR _LinkCanceledText
db "@"
text_far _LinkCanceledText
text_end
StartNewGame:
ld hl, wd732
@ -329,7 +329,9 @@ SpecialEnterMap::
jp EnterMap
ContinueText:
db "CONTINUE", $4e
db "CONTINUE"
next ""
; fallthrough
NewGameText:
db "NEW GAME"

View file

@ -50,8 +50,8 @@ AskName:
jp CopyData
DoYouWantToNicknameText:
TX_FAR _DoYouWantToNicknameText
db "@"
text_far _DoYouWantToNicknameText
text_end
DisplayNameRaterScreen::
ld hl, wBuffer

View file

@ -15,14 +15,14 @@ OpenOaksPC:
jp LoadScreenTilesFromBuffer2
GetDexRatedText:
TX_FAR _GetDexRatedText
db "@"
text_far _GetDexRatedText
text_end
ClosedOaksPCText:
TX_FAR _ClosedOaksPCText
TX_WAIT
db "@"
text_far _ClosedOaksPCText
text_linkpromptbutton
text_end
AccessedOaksPCText:
TX_FAR _AccessedOaksPCText
db "@"
text_far _AccessedOaksPCText
text_end

View file

@ -254,62 +254,62 @@ PartyMenuMessagePointers:
dw PartyMenuItemUseText
PartyMenuNormalText:
TX_FAR _PartyMenuNormalText
db "@"
text_far _PartyMenuNormalText
text_end
PartyMenuItemUseText:
TX_FAR _PartyMenuItemUseText
db "@"
text_far _PartyMenuItemUseText
text_end
PartyMenuBattleText:
TX_FAR _PartyMenuBattleText
db "@"
text_far _PartyMenuBattleText
text_end
PartyMenuUseTMText:
TX_FAR _PartyMenuUseTMText
db "@"
text_far _PartyMenuUseTMText
text_end
PartyMenuSwapMonText:
TX_FAR _PartyMenuSwapMonText
db "@"
text_far _PartyMenuSwapMonText
text_end
PotionText:
TX_FAR _PotionText
db "@"
text_far _PotionText
text_end
AntidoteText:
TX_FAR _AntidoteText
db "@"
text_far _AntidoteText
text_end
ParlyzHealText:
TX_FAR _ParlyzHealText
db "@"
text_far _ParlyzHealText
text_end
BurnHealText:
TX_FAR _BurnHealText
db "@"
text_far _BurnHealText
text_end
IceHealText:
TX_FAR _IceHealText
db "@"
text_far _IceHealText
text_end
AwakeningText:
TX_FAR _AwakeningText
db "@"
text_far _AwakeningText
text_end
FullHealText:
TX_FAR _FullHealText
db "@"
text_far _FullHealText
text_end
ReviveText:
TX_FAR _ReviveText
db "@"
text_far _ReviveText
text_end
RareCandyText:
TX_FAR _RareCandyText
TX_SFX_ITEM_1 ; probably supposed to play SFX_LEVEL_UP but the wrong music bank is loaded
TX_BLINK
db "@"
text_far _RareCandyText
sound_get_item_1 ; probably supposed to play SFX_LEVEL_UP but the wrong music bank is loaded
text_promptbutton
text_end
SetPartyMenuHPBarColor:
ld hl, wPartyMenuHPBarColors

View file

@ -99,20 +99,20 @@ LogOff:
ret
TurnedOnPC1Text:
TX_FAR _TurnedOnPC1Text
db "@"
text_far _TurnedOnPC1Text
text_end
AccessedBillsPCText:
TX_FAR _AccessedBillsPCText
db "@"
text_far _AccessedBillsPCText
text_end
AccessedSomeonesPCText:
TX_FAR _AccessedSomeonesPCText
db "@"
text_far _AccessedSomeonesPCText
text_end
AccessedMyPCText:
TX_FAR _AccessedMyPCText
db "@"
text_far _AccessedMyPCText
text_end
; removes one of the specified item ID [hItemToRemoveID] from bag (if existent)
RemoveItemByID::

View file

@ -247,57 +247,57 @@ PlayersPCMenuEntries:
next "LOG OFF@"
TurnedOnPC2Text:
TX_FAR _TurnedOnPC2Text
db "@"
text_far _TurnedOnPC2Text
text_end
WhatDoYouWantText:
TX_FAR _WhatDoYouWantText
db "@"
text_far _WhatDoYouWantText
text_end
WhatToDepositText:
TX_FAR _WhatToDepositText
db "@"
text_far _WhatToDepositText
text_end
DepositHowManyText:
TX_FAR _DepositHowManyText
db "@"
text_far _DepositHowManyText
text_end
ItemWasStoredText:
TX_FAR _ItemWasStoredText
db "@"
text_far _ItemWasStoredText
text_end
NothingToDepositText:
TX_FAR _NothingToDepositText
db "@"
text_far _NothingToDepositText
text_end
NoRoomToStoreText:
TX_FAR _NoRoomToStoreText
db "@"
text_far _NoRoomToStoreText
text_end
WhatToWithdrawText:
TX_FAR _WhatToWithdrawText
db "@"
text_far _WhatToWithdrawText
text_end
WithdrawHowManyText:
TX_FAR _WithdrawHowManyText
db "@"
text_far _WithdrawHowManyText
text_end
WithdrewItemText:
TX_FAR _WithdrewItemText
db "@"
text_far _WithdrewItemText
text_end
NothingStoredText:
TX_FAR _NothingStoredText
db "@"
text_far _NothingStoredText
text_end
CantCarryMoreText:
TX_FAR _CantCarryMoreText
db "@"
text_far _CantCarryMoreText
text_end
WhatToTossText:
TX_FAR _WhatToTossText
db "@"
text_far _WhatToTossText
text_end
TossHowManyText:
TX_FAR _TossHowManyText
db "@"
text_far _TossHowManyText
text_end

View file

@ -478,7 +478,7 @@ ShowPokedexDataInternal:
coord hl, 2, 8
ld a, "№"
ld [hli], a
ld a, ""
ld a, "<DOT>"
ld [hli], a
ld de, wd11e
lb bc, LEADING_ZEROES | 1, 3
@ -518,14 +518,14 @@ ShowPokedexDataInternal:
coord hl, 12, 6
lb bc, 1, 2
call PrintNumber ; print feet (height)
ld a, $60 ; feet symbol tile (one tick)
ld a, ""
ld [hl], a
inc de
inc de ; de = address of inches (height)
coord hl, 15, 6
lb bc, LEADING_ZEROES | 1, 2
call PrintNumber ; print inches (height)
ld a, $61 ; inches symbol tile (two ticks)
ld a, "″"
ld [hl], a
; now print the weight (note that weight is stored in tenths of pounds internally)
inc de
@ -558,7 +558,7 @@ ShowPokedexDataInternal:
inc hl
ld a, [hli]
ld [hld], a ; make space for the decimal point by moving the last digit forward one tile
ld [hl], "" ; decimal point tile
ld [hl], "<DOT>" ; decimal point tile
pop af
ld [hDexWeight + 1], a ; restore original value of [hDexWeight + 1]
pop af
@ -590,7 +590,7 @@ ShowPokedexDataInternal:
ret
HeightWeightText:
db "HT ?",$60,"??",$61
db "HT ???″"
next "WT ???lb@"
; XXX does anything point to this?

View file

@ -28,8 +28,8 @@ LoadSAV:
ret
FileDataDestroyedText:
TX_FAR _FileDataDestroyedText
db "@"
text_far _FileDataDestroyedText
text_end
LoadSAV0:
ld a, SRAM_ENABLE
@ -184,16 +184,16 @@ SaveSAVConfirm:
ret
WouldYouLikeToSaveText:
TX_FAR _WouldYouLikeToSaveText
db "@"
text_far _WouldYouLikeToSaveText
text_end
GameSavedText:
TX_FAR _GameSavedText
db "@"
text_far _GameSavedText
text_end
OlderFileWillBeErasedText:
TX_FAR _OlderFileWillBeErasedText
db "@"
text_far _OlderFileWillBeErasedText
text_end
SaveSAVtoSRAM0:
ld a, SRAM_ENABLE
@ -386,8 +386,8 @@ ChangeBox::
ret
WhenYouChangeBoxText:
TX_FAR _WhenYouChangeBoxText
db "@"
text_far _WhenYouChangeBoxText
text_end
CopyBoxToOrFromSRAM:
; copy an entire box from hl to de with b as the SRAM bank
@ -490,8 +490,8 @@ DisplayChangeBoxMenu:
ret
ChooseABoxText:
TX_FAR _ChooseABoxText
db "@"
text_far _ChooseABoxText
text_end
BoxNames:
db "BOX 1"

Some files were not shown because too many files have changed in this diff Show more