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

View file

@ -17,7 +17,11 @@ pokeblue_obj := $(rom_obj:.o=_blue.o)
### Build tools ### Build tools
MD5 := md5sum -c ifeq (,$(shell which sha1sum))
SHA1 := shasum
else
SHA1 := sha1sum
endif
RGBDS ?= RGBDS ?=
RGBASM ?= $(RGBDS)rgbasm RGBASM ?= $(RGBDS)rgbasm
@ -47,9 +51,8 @@ tidy:
rm -f $(roms) $(pokered_obj) $(pokeblue_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym) rgbdscheck.o rm -f $(roms) $(pokered_obj) $(pokeblue_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym) rgbdscheck.o
$(MAKE) clean -C tools/ $(MAKE) clean -C tools/
# For contributors to make sure a change didn't affect the original contents of the ROMs.
compare: $(roms) compare: $(roms)
@$(MD5) roms.md5 @$(SHA1) -c roms.sha1
tools: tools:
$(MAKE) -C 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_1.2bpp: tools/gfx += --trim-whitespace
gfx/battle/attack_anim_2.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_1.2bpp: rgbgfx += -h
gfx/intro_credits/blue_jigglypuff_2.2bpp: $(RGBGFX) += -h gfx/intro_credits/blue_jigglypuff_2.2bpp: rgbgfx += -h
gfx/intro_credits/blue_jigglypuff_3.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_1.2bpp: rgbgfx += -h
gfx/intro_credits/red_nidorino_2.2bpp: $(RGBGFX) += -h gfx/intro_credits/red_nidorino_2.2bpp: rgbgfx += -h
gfx/intro_credits/red_nidorino_3.2bpp: $(RGBGFX) += -h gfx/intro_credits/red_nidorino_3.2bpp: rgbgfx += -h
gfx/intro_credits/the_end.2bpp: tools/gfx += --interleave --png=$< 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 $@ $@) tools/gfx $(tools/gfx) -o $@ $@)
%.1bpp: %.png %.1bpp: %.png
$(RGBGFX) -d1 $(rgbgfx) -o $@ $< $(RGBGFX) $(rgbgfx) -d1 -o $@ $<
$(if $(tools/gfx),\ $(if $(tools/gfx),\
tools/gfx $(tools/gfx) -d1 -o $@ $@) 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. 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 Red (UE) [S][!].gb `sha1: ea9bcae617fdf159b045185467ae58b2e4a48b9a`
* Pokemon Blue (UE) [S][!].gb `md5: 50927e843568814f7ed45ec4f944bd8b` - Pokemon Blue (UE) [S][!].gb `sha1: d7037c83e1ae5b39bde3c30787637ba1d4c48ce2`
To set up the repository, see [**INSTALL.md**](INSTALL.md). To set up the repository, see [**INSTALL.md**](INSTALL.md).
## See also ## See also
* Disassembly of [**Pokémon Yellow**][pokeyellow] - **Discord:** [pret][discord]
* Disassembly of [**Pokémon Gold**][pokegold] - **IRC:** [freenode#pret][irc]
* Disassembly of [**Pokémon Crystal**][pokecrystal]
* Disassembly of [**Pokémon Pinball**][pokepinball] Other disassembly projects:
* Disassembly of [**Pokémon TCG**][poketcg]
* Disassembly of [**Pokémon Ruby**][pokeruby] - [**Pokémon Yellow**][pokeyellow]
* Disassembly of [**Pokémon Fire Red**][pokefirered] - [**Pokémon Gold/Silver**][pokegold]
* Disassembly of [**Pokémon Emerald**][pokeemerald] - [**Pokémon Crystal**][pokecrystal]
* Discord: [**pret**][Discord] - [**Pokémon Pinball**][pokepinball]
* irc: **irc.freenode.net** [**#pret**][irc] - [**Pokémon TCG**][poketcg]
- [**Pokémon Ruby**][pokeruby]
- [**Pokémon FireRed**][pokefirered]
- [**Pokémon Emerald**][pokeemerald]
[pokeyellow]: https://github.com/pret/pokeyellow [pokeyellow]: https://github.com/pret/pokeyellow
[pokegold]: https://github.com/pret/pokegold [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 [pokeruby]: https://github.com/pret/pokeruby
[pokefirered]: https://github.com/pret/pokefirered [pokefirered]: https://github.com/pret/pokefirered
[pokeemerald]: https://github.com/pret/pokeemerald [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 [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,265 +1,386 @@
charmap "ガ", $05 ; $00-$17 are TX_* constants (see macros/scripts/text.asm)
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
charmap "<pkmn>", $4A ; PkMn ; Control characters (see home/text.asm)
charmap "@", $50
charmap "<PLAYER>", $52
charmap "<RIVAL>", $53
charmap "#", $54
;charmap "POKé", $54
charmap "<TARGET>", $59
charmap "<USER>", $5A
charmap "", $71
charmap "″", $73
charmap "№", $74
charmap "…", $75
charmap "┌", $79 charmap "<NULL>", $00
charmap "─", $7A charmap "<PAGE>", $49
charmap "┐", $7B charmap "<PKMN>", $4a ; "<PK><MN>"
charmap "│", $7C charmap "<_CONT>", $4b ; implements "<CONT>"
charmap "└", $7D charmap "<SCROLL>", $4c
charmap "┘", $7E 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 "<PC>", $5b ; "PC"
charmap "<TM>", $5c ; "TM"
charmap "<TRAINER>", $5d ; "TRAINER"
charmap "<ROCKET>", $5e ; "ROCKET"
charmap "<DEXEND>", $5f
charmap " ", $7F ; Actual characters (from gfx/font/font_extra.png)
charmap "A", $80
charmap "B", $81
charmap "C", $82
charmap "D", $83
charmap "E", $84
charmap "F", $85
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 "Q", $90
charmap "R", $91
charmap "S", $92
charmap "T", $93
charmap "U", $94
charmap "V", $95
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 "<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 "-", $E3 charmap "┌", $79
charmap "'r", $E4 charmap "─", $7a
charmap "'m", $E5 charmap "┐", $7b
charmap "?", $E6 charmap "│", $7c
charmap "!", $E7 charmap "└", $7d
charmap ".", $E8 charmap "┘", $7e
charmap " ", $7f
charmap "▷", $EC ; Actual characters (from gfx/font/font_battle_extra.png)
charmap "▶", $ED
charmap "▲", $ED charmap "<LV>", $6e
charmap "▼", $EE
charmap "♂", $EF charmap "<to>", $70 ; narrow "to"
charmap "¥", $F0
charmap "×", $F1 charmap "『", $72 ; Japanese opening quote, unused
charmap "⠄", $F2 charmap "<ID>", $73
charmap "/", $F3 charmap "№", $74
charmap ",", $F4
charmap "♀", $F5 ; Actual characters (from other graphics files)
charmap "0", $F6
charmap "1", $F7 ; needed for ShowPokedexDataInternal (see engine/menus/pokedex.asm)
charmap "2", $F8 charmap "", $60 ; gfx/pokedex/pokedex.png
charmap "3", $F9 charmap "″", $61 ; gfx/pokedex/pokedex.png
charmap "4", $FA
charmap "5", $FB ; needed for StatusScreen (see engine/pokemon/status_screen.asm)
charmap "6", $FC charmap "<BOLD_P>", $72 ; gfx/font/P.1bpp
charmap "7", $FD
charmap "8", $FE ; needed for LoadTownMap_Fly (see engine/items/town_map.asm)
charmap "9", $FF 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 "A", $80
charmap "B", $81
charmap "C", $82
charmap "D", $83
charmap "E", $84
charmap "F", $85
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 "Q", $90
charmap "R", $91
charmap "S", $92
charmap "T", $93
charmap "U", $94
charmap "V", $95
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 "<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_OLD_MAN EQU 1
BATTLE_TYPE_SAFARI EQU 2 BATTLE_TYPE_SAFARI EQU 2
; damage limits before type effectiveness
MIN_NEUTRAL_DAMAGE EQU 2
MAX_NEUTRAL_DAMAGE EQU 999
; fixed damage constants ; fixed damage constants
SONICBOOM_DAMAGE EQU 20 SONICBOOM_DAMAGE EQU 20
DRAGON_RAGE_DAMAGE EQU 40 DRAGON_RAGE_DAMAGE EQU 40

View file

@ -63,3 +63,11 @@
const CRED_FUKUI ; $3D const CRED_FUKUI ; $3D
const CRED_CLUB ; $3E const CRED_CLUB ; $3E
const CRED_PAAD ; $3F 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_WIDTH EQU 20
SCREEN_HEIGHT EQU 18 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 BG_MAP_WIDTH EQU 32 ; tiles
SCREEN_HEIGHT_PIXELS EQU SCREEN_HEIGHT * 8 BG_MAP_HEIGHT EQU 32 ; tiles
BYTES_PER_TILE EQU 16 SPRITEBUFFERSIZE EQU 7 * 7 * LEN_1BPP_TILE
BG_MAP_WIDTH EQU 32
BG_MAP_HEIGHT EQU 32
SPRITEBUFFERSIZE EQU 7*7 * 8 ; 7 * 7 (tiles) * 8 (bytes per tile)
; HP bar ; HP bar
HP_BAR_GREEN EQU 0 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 ; 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 ; sprites marked with an X are constants that are never used
; because those sprites are not (de)activated in a map's script ; because those sprites are not (de)activated in a map's script

View file

@ -1,12 +1,6 @@
NAME_LENGTH EQU 11 NAME_LENGTH EQU 11
ITEM_NAME_LENGTH EQU 13 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 ; PrintNumber
BIT_MONEY_SIGN EQU 5 BIT_MONEY_SIGN EQU 5
BIT_LEFT_ALIGN EQU 6 BIT_LEFT_ALIGN EQU 6
@ -15,3 +9,12 @@ BIT_LEADING_ZEROES EQU 7
MONEY_SIGN EQU (1 << BIT_MONEY_SIGN) MONEY_SIGN EQU (1 << BIT_MONEY_SIGN)
LEFT_ALIGN EQU (1 << BIT_LEFT_ALIGN) LEFT_ALIGN EQU (1 << BIT_LEFT_ALIGN)
LEADING_ZEROES EQU (1 << BIT_LEADING_ZEROES) 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: CreditsOrder:
; subsequent credits elements will be displayed on separate lines. ; subsequent credits elements will be displayed on separate lines.
; $FF, $FE, $FD, $FC, $FB, and $FA are commands that are used ; CRED_TEXT, CRED_TEXT_FADE, CRED_TEXT_MON, and CRED_TEXT_FADE_MON are
; to go to the next set of credits texts. ; commands that are used to go to the next set of credits texts.
db CRED_MON, CRED_VERSION, $FF db CRED_MON, CRED_VERSION, CRED_TEXT_FADE_MON
db CRED_DIRECTOR, CRED_TAJIRI, $FF db CRED_DIRECTOR, CRED_TAJIRI, CRED_TEXT_FADE_MON
db CRED_PROGRAMMERS, CRED_TA_OOTA, CRED_MORIMOTO, $FD db CRED_PROGRAMMERS, CRED_TA_OOTA, CRED_MORIMOTO, CRED_TEXT_FADE
db CRED_PROGRAMMERS, CRED_WATANABE, CRED_MASUDE, CRED_TAMADA, $FE db CRED_PROGRAMMERS, CRED_WATANABE, CRED_MASUDE, CRED_TAMADA, CRED_TEXT_MON
db CRED_CHAR_DESIGN, CRED_SUGIMORI, CRED_NISHIDA, $FF db CRED_CHAR_DESIGN, CRED_SUGIMORI, CRED_NISHIDA, CRED_TEXT_FADE_MON
db CRED_MUSIC, CRED_MASUDE, $FD db CRED_MUSIC, CRED_MASUDE, CRED_TEXT_FADE
db CRED_SOUND_EFFECTS, CRED_MASUDE, $FE db CRED_SOUND_EFFECTS, CRED_MASUDE, CRED_TEXT_MON
db CRED_GAME_DESIGN, CRED_TAJIRI, $FF db CRED_GAME_DESIGN, CRED_TAJIRI, CRED_TEXT_FADE_MON
db CRED_MONSTER_DESIGN, CRED_SUGIMORI, CRED_NISHIDA, CRED_FUZIWARA, $FD db CRED_MONSTER_DESIGN, CRED_SUGIMORI, CRED_NISHIDA, CRED_FUZIWARA, CRED_TEXT_FADE
db CRED_MONSTER_DESIGN, CRED_MORIMOTO, CRED_SA_OOTA, CRED_YOSHIKAWA, $FE db CRED_MONSTER_DESIGN, CRED_MORIMOTO, CRED_SA_OOTA, CRED_YOSHIKAWA, CRED_TEXT_MON
db CRED_GAME_SCENE, CRED_TAJIRI, $FD db CRED_GAME_SCENE, CRED_TAJIRI, CRED_TEXT_FADE
db CRED_GAME_SCENE, CRED_TANIGUCHI, CRED_NONOMURA, CRED_ZINNAI, $FE db CRED_GAME_SCENE, CRED_TANIGUCHI, CRED_NONOMURA, CRED_ZINNAI, CRED_TEXT_MON
db CRED_PARAM, CRED_NISINO, CRED_TA_NAKAMURA, $FF db CRED_PARAM, CRED_NISINO, CRED_TA_NAKAMURA, CRED_TEXT_FADE_MON
db CRED_MAP, CRED_TAJIRI, CRED_NISINO, $FD db CRED_MAP, CRED_TAJIRI, CRED_NISINO, CRED_TEXT_FADE
db CRED_MAP, CRED_MATSUSIMA, CRED_NONOMURA, CRED_TANIGUCHI, $FE db CRED_MAP, CRED_MATSUSIMA, CRED_NONOMURA, CRED_TANIGUCHI, CRED_TEXT_MON
db CRED_TEST, CRED_KAKEI, CRED_TSUCHIYA, $FD db CRED_TEST, CRED_KAKEI, CRED_TSUCHIYA, CRED_TEXT_FADE
db CRED_TEST, CRED_TA_NAKAMURA, CRED_YUDA, $FE db CRED_TEST, CRED_TA_NAKAMURA, CRED_YUDA, CRED_TEXT_MON
db CRED_SPECIAL, CRED_HISHIDA, CRED_SAKAI, $FD db CRED_SPECIAL, CRED_HISHIDA, CRED_SAKAI, CRED_TEXT_FADE
db CRED_SPECIAL, CRED_YAMAGUCHI, CRED_YAMAMOTO, $FC db CRED_SPECIAL, CRED_YAMAGUCHI, CRED_YAMAMOTO, CRED_TEXT
db CRED_SPECIAL, CRED_TOMISAWA, CRED_KAWAMOTO, CRED_TO_OOTA, $FE db CRED_SPECIAL, CRED_TOMISAWA, CRED_KAWAMOTO, CRED_TO_OOTA, CRED_TEXT_MON
db CRED_PRODUCERS, CRED_MIYAMOTO, $FD db CRED_PRODUCERS, CRED_MIYAMOTO, CRED_TEXT_FADE
db CRED_PRODUCERS, CRED_KAWAGUCHI, $FC db CRED_PRODUCERS, CRED_KAWAGUCHI, CRED_TEXT
db CRED_PRODUCERS, CRED_ISHIHARA, $FE db CRED_PRODUCERS, CRED_ISHIHARA, CRED_TEXT_MON
db CRED_US_STAFF, $FD db CRED_US_STAFF, CRED_TEXT_FADE
db CRED_US_COORD, CRED_TILDEN, $FD db CRED_US_COORD, CRED_TILDEN, CRED_TEXT_FADE
db CRED_US_COORD, CRED_KAWAKAMI, CRED_HI_NAKAMURA, $FC db CRED_US_COORD, CRED_KAWAKAMI, CRED_HI_NAKAMURA, CRED_TEXT
db CRED_US_COORD, CRED_GIESE, CRED_OSBORNE, $FC db CRED_US_COORD, CRED_GIESE, CRED_OSBORNE, CRED_TEXT
db CRED_TRANS, CRED_OGASAWARA, $FD db CRED_TRANS, CRED_OGASAWARA, CRED_TEXT_FADE
db CRED_PROGRAMMERS, CRED_MURAKAWA, CRED_FUKUI, $FD db CRED_PROGRAMMERS, CRED_MURAKAWA, CRED_FUKUI, CRED_TEXT_FADE
db CRED_SPECIAL, CRED_IWATA, $FD db CRED_SPECIAL, CRED_IWATA, CRED_TEXT_FADE
db CRED_SPECIAL, CRED_HARADA, $FC db CRED_SPECIAL, CRED_HARADA, CRED_TEXT
db CRED_TEST, CRED_PAAD, CRED_CLUB, $FD db CRED_TEST, CRED_PAAD, CRED_CLUB, CRED_TEXT_FADE
db CRED_PRODUCER, CRED_IZUSHI, $FD db CRED_PRODUCER, CRED_IZUSHI, CRED_TEXT_FADE
db CRED_EXECUTIVE, CRED_YAMAUCHI, $FF db CRED_EXECUTIVE, CRED_YAMAUCHI, CRED_TEXT_FADE_MON
db $FB, $FF, $FA 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 ; Viridian
ViridianCashierText:: ViridianCashierText::
TX_MART POKE_BALL, ANTIDOTE, PARLYZ_HEAL, BURN_HEAL script_mart POKE_BALL, ANTIDOTE, PARLYZ_HEAL, BURN_HEAL
; Pewter ; Pewter
PewterCashierText:: 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 ; Cerulean
CeruleanCashierText:: 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 ; Bike shop
TX_MART BICYCLE script_mart BICYCLE
; Vermilion ; Vermilion
VermilionCashierText:: 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 ; Lavender
LavenderCashierText:: 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) ; Celadon Dept. Store 2F (1)
CeladonMart2Clerk1Text:: 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) ; Celadon Dept. Store 2F (2)
CeladonMart2Clerk2Text:: 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 ; Celadon Dept. Store 4F
CeladonMart4ClerkText:: 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) ; Celadon Dept. Store 5F (1)
CeladonMart5Clerk1Text:: 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) ; Celadon Dept. Store 5F (2)
CeladonMart5Clerk2Text:: CeladonMart5Clerk2Text::
TX_MART HP_UP, PROTEIN, IRON, CARBOS, CALCIUM script_mart HP_UP, PROTEIN, IRON, CARBOS, CALCIUM
; Fuchsia ; Fuchsia
FuchsiaCashierText:: 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? ; unused?
TX_MART GREAT_BALL, HYPER_POTION, SUPER_POTION, FULL_HEAL, REVIVE script_mart GREAT_BALL, HYPER_POTION, SUPER_POTION, FULL_HEAL, REVIVE
; Cinnabar ; Cinnabar
CinnabarCashierText:: 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 ; Saffron
SaffronCashierText:: 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 ; Indigo
IndigoCashierText:: 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: SilphCoName:
db "SILPH CO.@" db "SILPH CO.@"
PokemonMansionName: PokemonMansionName:
db "<pkmn> MANSION@" db "<PKMN> MANSION@"
SafariZoneName: SafariZoneName:
db "SAFARI ZONE@" db "SAFARI ZONE@"
CeruleanCaveName: CeruleanCaveName:

File diff suppressed because it is too large Load diff

View file

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

View file

@ -1,5 +1,15 @@
LowerCaseAlphabet: LowerCaseAlphabet:
db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥UPPER CASE@" db "abcdefghi"
db "jklmnopqr"
db "stuvwxyz "
db "×():;[]<PK><MN>"
db "-?!♂♀/<DOT>,<ED>"
db "UPPER CASE@"
UpperCaseAlphabet: 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 "タダ", "チヂ", "ツヅ", "テデ", "トド"
db "ハバ", "ヒビ", "フブ", "へべ", "ホボ" db "ハバ", "ヒビ", "フブ", "へべ", "ホボ"
db $ff db -1 ; end
Handakutens: Handakutens:
db "はぱ", "ひぴ", "ふぷ", "へぺ", "ほぽ" db "はぱ", "ひぴ", "ふぷ", "へぺ", "ほぽ"
db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ" db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ"
db $ff db -1 ; end

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -549,7 +549,7 @@ AIPrintItemUseAndUpdateHPBar:
jp DecrementAICount jp DecrementAICount
AISwitchIfEnoughMons: 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 a, [wEnemyPartyCount]
ld c, a ld c, a
ld hl, wEnemyMon1HP ld hl, wEnemyMon1HP
@ -573,7 +573,7 @@ AISwitchIfEnoughMons:
jr nz, .loop jr nz, .loop
ld a, d ; how many available monsters are there? 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 jp nc, SwitchEnemyMon
and a and a
ret ret
@ -610,8 +610,8 @@ SwitchEnemyMon:
ret ret
AIBattleWithdrawText: AIBattleWithdrawText:
TX_FAR _AIBattleWithdrawText text_far _AIBattleWithdrawText
db "@" text_end
AIUseFullHeal: AIUseFullHeal:
call AIPlayRestoringSFX call AIPlayRestoringSFX
@ -735,5 +735,5 @@ AIPrintItemUse_:
jp PrintText jp PrintText
AIBattleUseItemText: AIBattleUseItemText:
TX_FAR _AIBattleUseItemText text_far _AIBattleUseItemText
db "@" text_end

View file

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

View file

@ -73,20 +73,20 @@ GiveFossilToCinnabarLab::
ret ret
LabFossil_610ae: LabFossil_610ae:
TX_FAR _Lab4Text_610ae text_far _Lab4Text_610ae
db "@" text_end
LabFossil_610b3: LabFossil_610b3:
TX_FAR _Lab4Text_610b3 text_far _Lab4Text_610b3
db "@" text_end
LabFossil_610b8: LabFossil_610b8:
TX_FAR _Lab4Text_610b8 text_far _Lab4Text_610b8
db "@" text_end
LabFossil_610bd: LabFossil_610bd:
TX_FAR _Lab4Text_610bd text_far _Lab4Text_610bd
db "@" text_end
PrintFossilsInBag: PrintFossilsInBag:
; Prints each fossil in the player's bag on a separate line in the menu. ; 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:: DisplayDiploma::
call SaveScreenTilesToBuffer2 call SaveScreenTilesToBuffer2
call GBPalWhiteOutWithDelay3 call GBPalWhiteOutWithDelay3
@ -8,7 +10,7 @@ DisplayDiploma::
set 6, [hl] set 6, [hl]
call DisableLCD call DisableLCD
ld hl, CircleTile ld hl, CircleTile
ld de, vChars2 + $700 ld de, vChars2 + CIRCLE_TILE_ID * $10
ld bc, $10 ld bc, $10
ld a, BANK(CircleTile) ld a, BANK(CircleTile)
call FarCopyData2 call FarCopyData2
@ -94,7 +96,7 @@ DiplomaTextPointersAndCoords:
dwCoord 9, 16 dwCoord 9, 16
DiplomaText: DiplomaText:
db $70,"Diploma",$70,"@" db CIRCLE_TILE_ID, "Diploma", CIRCLE_TILE_ID, "@"
DiplomaPlayer: DiplomaPlayer:
db "Player@" db "Player@"

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -3,21 +3,21 @@ PrintFightingDojoText2:
tx_pre_jump EnemiesOnEverySideText tx_pre_jump EnemiesOnEverySideText
EnemiesOnEverySideText:: EnemiesOnEverySideText::
TX_FAR _EnemiesOnEverySideText text_far _EnemiesOnEverySideText
db "@" text_end
PrintFightingDojoText3: PrintFightingDojoText3:
call EnableAutoTextBoxDrawing call EnableAutoTextBoxDrawing
tx_pre_jump WhatGoesAroundComesAroundText tx_pre_jump WhatGoesAroundComesAroundText
WhatGoesAroundComesAroundText:: WhatGoesAroundComesAroundText::
TX_FAR _WhatGoesAroundComesAroundText text_far _WhatGoesAroundComesAroundText
db "@" text_end
PrintFightingDojoText: PrintFightingDojoText:
call EnableAutoTextBoxDrawing call EnableAutoTextBoxDrawing
tx_pre_jump FightingDojoText tx_pre_jump FightingDojoText
FightingDojoText:: FightingDojoText::
TX_FAR _FightingDojoText text_far _FightingDojoText
db "@" 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 ; if in a gym and dont have the corresponding badge, a = GymStatueText1_id and jp PrintPredefTextID
; else ret ; else ret
call EnableAutoTextBoxDrawing call EnableAutoTextBoxDrawing
ld a, [wSpriteStateData1 + 9] ld a, [wSpritePlayerStateData1FacingDirection]
cp SPRITE_FACING_UP cp SPRITE_FACING_UP
ret nz ret nz
ld hl, .BadgeFlags ld hl, .BadgeFlags
@ -40,9 +40,9 @@ GymStatues:
db $ff db $ff
GymStatueText1:: GymStatueText1::
TX_FAR _GymStatueText1 text_far _GymStatueText1
db "@" text_end
GymStatueText2:: GymStatueText2::
TX_FAR _GymStatueText2 text_far _GymStatueText2
db "@" text_end

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -41,7 +41,7 @@ DisplayTextIDInit::
; loop to copy C1X9 (direction the sprite is facing) to C2X9 for each sprite ; 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 ; 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 ; 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 c, $0f
ld de, $10 ld de, $10
.spriteFacingDirectionCopyLoop .spriteFacingDirectionCopyLoop
@ -54,7 +54,7 @@ DisplayTextIDInit::
jr nz, .spriteFacingDirectionCopyLoop jr nz, .spriteFacingDirectionCopyLoop
; loop to force all the sprites in the middle of animation to stand still ; 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) ; (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 de, $10
ld c, e ld c, e
.spriteStandStillLoop .spriteStandStillLoop

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

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