summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/color.asm10
-rw-r--r--engine/credits.asm896
-rw-r--r--engine/credits_crystal.asm6
-rw-r--r--engine/engine_flags.asm54
-rw-r--r--engine/events.asm15
-rw-r--r--engine/events_2.asm3
-rw-r--r--engine/facings.asm269
-rw-r--r--engine/fruit_trees.asm18
-rw-r--r--engine/landmarks.asm720
-rw-r--r--engine/movement.asm38
-rw-r--r--engine/scripting.asm12
-rw-r--r--engine/scripting_crystal.asm4
-rw-r--r--engine/std_scripts.asm594
13 files changed, 1498 insertions, 1141 deletions
diff --git a/engine/color.asm b/engine/color.asm
index da99cd4bf..56b93cc75 100644
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -950,7 +950,7 @@ Function992c: ; 992c
; 9938
Function9938: ; 9938
- ld hl, $651e
+ ld hl, SGBBorder
ld de, $606e
ret
; 993f
@@ -1270,19 +1270,19 @@ Functionb1de: ; b1de
INCBIN "baserom.gbc", $b279, $b319 - $b279
MornPal: ; 0xb319
-INCBIN "tilesets/morn.pal"
+INCLUDE "tilesets/morn.pal"
; 0xb359
DayPal: ; 0xb359
-INCBIN "tilesets/day.pal"
+INCLUDE "tilesets/day.pal"
; 0xb399
NitePal: ; 0xb399
-INCBIN "tilesets/nite.pal"
+INCLUDE "tilesets/nite.pal"
; 0xb3d9
DarkPal: ; 0xb3d9
-INCBIN "tilesets/dark.pal"
+INCLUDE "tilesets/dark.pal"
; 0xb419
INCBIN "baserom.gbc", $b419, $b7a9 - $b419
diff --git a/engine/credits.asm b/engine/credits.asm
index c0cc72d97..677e1639b 100644
--- a/engine/credits.asm
+++ b/engine/credits.asm
@@ -1,113 +1,352 @@
-SATOSHI_TAJIRI EQU 00
-JUNICHI_MASUDA EQU 01
-TETSUYA_WATANABE EQU 02
-SHIGEKI_MORIMOTO EQU 03
-SOUSUKE_TAMADA EQU 04
-TAKENORI_OOTA EQU 05
-KEN_SUGIMORI EQU 06
-MOTOFUMI_FUJIWARA EQU 07
-ATSUKO_NISHIDA EQU 08
-MUNEO_SAITO EQU 09
-SATOSHI_OOTA EQU 10
-RENA_YOSHIKAWA EQU 11
-JUN_OKUTANI EQU 12
-HIRONOBU_YOSHIDA EQU 13
-ASUKA_IWASHITA EQU 14
-GO_ICHINOSE EQU 15
-MORIKAZU_AOKI EQU 16
-KOHJI_NISHINO EQU 17
-KENJI_MATSUSHIMA EQU 18
-TOSHINOBU_MATSUMIYA EQU 19
-SATORU_IWATA EQU 20
-NOBUHIRO_SEYA EQU 21
-KAZUHITO_SEKINE EQU 22
-TETSUJI_OOTA EQU 23
-NCL_SUPER_MARIO_CLUB EQU 24
-SARUGAKUCHO EQU 25
-AKITO_MORI EQU 26
-TAKAHIRO_HARADA EQU 27
-TOHRU_HASHIMOTO EQU 28
-NOBORU_MATSUMOTO EQU 29
-TAKEHIRO_IZUSHI EQU 30
-TAKASHI_KAWAGUCHI EQU 31
-TSUNEKAZU_ISHIHARA EQU 32
-HIROSHI_YAMAUCHI EQU 33
-KENJI_SAIKI EQU 34
-ATSUSHI_TADA EQU 35
-NAOKO_KAWAKAMI EQU 36
-HIROYUKI_ZINNAI EQU 37
-KUNIMI_KAWAMURA EQU 38
-HISASHI_SOGABE EQU 39
-KEITA_KAGAYA EQU 40
-YOSHINORI_MATSUDA EQU 41
-HITOMI_SATO EQU 42
-TORU_OSAWA EQU 43
-TAKAO_OHARA EQU 44
-YUICHIRO_ITO EQU 45
-TAKAO_SHIMIZU EQU 46
-PLANNING EQU 47
-KEITA_NAKAMURA EQU 48
-HIROTAKA_UEMURA EQU 49
-HIROAKI_TAMURA EQU 50
-NORIAKI_SAKAGUCHI EQU 51
-MIYUKI_SATO EQU 52
-GAKUZI_NOMOTO EQU 53
-AI_MASHIMA EQU 54
-MIKIHIRO_ISHIKAWA EQU 55
-HIDEYUKI_HASHIMOTO EQU 56
-SATOSHI_YAMATO EQU 57
-SHIGERU_MIYAMOTO EQU 58
-GAIL_TILDEN EQU 59
-NOB_OGASAWARA EQU 60
-SETH_MCMAHILL EQU 61
-HIROTO_ALEXANDER EQU 62
-TERESA_LILLYGREN EQU 63
-THOMAS_HERTZOG EQU 64
-ERIK_JOHNSON EQU 65
-HIRO_NAKAMURA EQU 66
-TERUKI_MURAKAWA EQU 67
-KAZUYOSHI_OSAWA EQU 68
-KIMIKO_NAKAMICHI EQU 69
-END EQU 70
-CREDITS_UNKNOWN EQU 71
-STAFF EQU 72
-DIRECTOR EQU 73
-CODIRECTOR EQU 74
-PROGRAMMERS EQU 75
-GRAPHICS_DIRECTOR EQU 76
-MONSTER_DESIGN EQU 77
-GRAPHICS_DESIGN EQU 78
-MUSIC EQU 79
-SOUND_EFFECTS EQU 80
-GAME_DESIGN EQU 81
-GAME_SCENARIO EQU 82
-TOOL_PROGRAMMING EQU 83
-PARAMETRIC_DESIGN EQU 84
-SCRIPT_DESIGN EQU 85
-MAP_DATA_DESIGN EQU 86
-MAP_DESIGN EQU 87
-PRODUCT_TESTING EQU 88
-SPECIAL_THANKS EQU 89
-PRODUCERS EQU 90
-EXECUTIVE_PRODUCER EQU 91
-POKEMON_ANIMATION EQU 92
-POKEDEX_TEXT EQU 93
-MOBILE_PRJ_LEADER EQU 94
-MOBILE_SYSTEM_AD EQU 95
-MOBILE_STADIUM_DIR EQU 96
-COORDINATION EQU 97
-COPYRIGHT EQU 98
-US_VERSION_STAFF EQU 99
-US_COORDINATION EQU 100
-TEXT_TRANSLATION EQU 101
-PAAD_TESTING EQU 102
-
-CREDITS_THEEND EQU $f9
-CREDITS_WAIT2 EQU $fa
-CREDITS_MUSIC EQU $fb
-CREDITS_CLEAR EQU $fc
-CREDITS_SCENE EQU $fd
-CREDITS_WAIT EQU $fe
+
+ const_def
+ const SATOSHI_TAJIRI
+ const JUNICHI_MASUDA
+ const TETSUYA_WATANABE
+ const SHIGEKI_MORIMOTO
+ const SOUSUKE_TAMADA
+ const TAKENORI_OOTA
+ const KEN_SUGIMORI
+ const MOTOFUMI_FUJIWARA
+ const ATSUKO_NISHIDA
+ const MUNEO_SAITO
+ const SATOSHI_OOTA
+ const RENA_YOSHIKAWA
+ const JUN_OKUTANI
+ const HIRONOBU_YOSHIDA
+ const ASUKA_IWASHITA
+ const GO_ICHINOSE
+ const MORIKAZU_AOKI
+ const KOHJI_NISHINO
+ const KENJI_MATSUSHIMA
+ const TOSHINOBU_MATSUMIYA
+ const SATORU_IWATA
+ const NOBUHIRO_SEYA
+ const KAZUHITO_SEKINE
+ const TETSUJI_OOTA
+ const NCL_SUPER_MARIO_CLUB
+ const SARUGAKUCHO
+ const AKITO_MORI
+ const TAKAHIRO_HARADA
+ const TOHRU_HASHIMOTO
+ const NOBORU_MATSUMOTO
+ const TAKEHIRO_IZUSHI
+ const TAKASHI_KAWAGUCHI
+ const TSUNEKAZU_ISHIHARA
+ const HIROSHI_YAMAUCHI
+ const KENJI_SAIKI
+ const ATSUSHI_TADA
+ const NAOKO_KAWAKAMI
+ const HIROYUKI_ZINNAI
+ const KUNIMI_KAWAMURA
+ const HISASHI_SOGABE
+ const KEITA_KAGAYA
+ const YOSHINORI_MATSUDA
+ const HITOMI_SATO
+ const TORU_OSAWA
+ const TAKAO_OHARA
+ const YUICHIRO_ITO
+ const TAKAO_SHIMIZU
+ const PLANNING
+ const KEITA_NAKAMURA
+ const HIROTAKA_UEMURA
+ const HIROAKI_TAMURA
+ const NORIAKI_SAKAGUCHI
+ const MIYUKI_SATO
+ const GAKUZI_NOMOTO
+ const AI_MASHIMA
+ const MIKIHIRO_ISHIKAWA
+ const HIDEYUKI_HASHIMOTO
+ const SATOSHI_YAMATO
+ const SHIGERU_MIYAMOTO
+ const GAIL_TILDEN
+ const NOB_OGASAWARA
+ const SETH_MCMAHILL
+ const HIROTO_ALEXANDER
+ const TERESA_LILLYGREN
+ const THOMAS_HERTZOG
+ const ERIK_JOHNSON
+ const HIRO_NAKAMURA
+ const TERUKI_MURAKAWA
+ const KAZUYOSHI_OSAWA
+ const KIMIKO_NAKAMICHI
+ const CREDIT_END
+ const CREDIT_UNKNOWN
+ const STAFF
+ const DIRECTOR
+ const CODIRECTOR
+ const PROGRAMMERS
+ const GRAPHICS_DIRECTOR
+ const MONSTER_DESIGN
+ const GRAPHICS_DESIGN
+ const CREDIT_MUSIC
+ const CREDIT_SOUND_EFFECTS
+ const GAME_DESIGN
+ const GAME_SCENARIO
+ const TOOL_PROGRAMMING
+ const PARAMETRIC_DESIGN
+ const SCRIPT_DESIGN
+ const MAP_DATA_DESIGN
+ const MAP_DESIGN
+ const PRODUCT_TESTING
+ const SPECIAL_THANKS
+ const PRODUCERS
+ const EXECUTIVE_PRODUCER
+ const POKEMON_ANIMATION
+ const POKEDEX_TEXT
+ const MOBILE_PRJ_LEADER
+ const MOBILE_SYSTEM_AD
+ const MOBILE_STADIUM_DIR
+ const COORDINATION
+ const COPYRIGHT
+ const US_VERSION_STAFF
+ const US_COORDINATION
+ const TEXT_TRANSLATION
+ const PAAD_TESTING
+
+const_value SET -7
+ const CREDITS_THEEND
+ const CREDITS_WAIT2
+ const CREDITS_MUSIC
+ const CREDITS_CLEAR
+ const CREDITS_SCENE
+ const CREDITS_WAIT
+ const CREDITS_END
+
+
+Function109847: ; 109847
+ bit 6, b
+ ld a, $0
+ jr z, .asm_10984f
+ ld a, $40
+.asm_10984f
+ ld [$cf63], a
+
+ ld a, [rSVBK]
+ push af
+ ld a, $5
+ ld [rSVBK], a
+
+ call WhiteBGMap
+ call ClearTileMap
+ call ClearSprites
+
+ ld hl, $ca00
+ ld c, $80
+ ld de, $ff00
+
+.asm_10986a
+ ld a, e
+ ld [hli], a
+ ld a, d
+ ld [hli], a
+ dec c
+ jr nz, .asm_10986a
+
+ ld de, CreditsBorderGFX
+ ld hl, $9200
+ lb bc, BANK(CreditsBorderGFX), $09
+ call Request2bpp
+
+ ld de, CopyrightGFX
+ ld hl, $9600
+ lb bc, BANK(CopyrightGFX), $1d
+ call Request2bpp
+
+ ld de, TheEndGFX
+ ld hl, $9400
+ lb bc, BANK(TheEndGFX), $10
+ call Request2bpp
+
+ ld a, $ff
+ ld [$cf64], a
+ xor a
+ ld [$cf65], a
+
+ call Function109bca
+ ld e, l
+ ld d, h
+ ld hl, VTiles2
+ lb bc, BANK(CreditsMonsGFX), $10
+ call Request2bpp
+
+ call Function109a95
+ xor a
+ ld [$cf66], a
+
+ ld hl, LYOverrides
+ ld bc, $100
+ xor a
+ call ByteFill
+
+ ld a, rSCX & $ff
+ ld [hLCDStatCustom], a
+
+ call GetCreditsPalette
+ call Function32f9
+ ld a, [$ff9e]
+ push af
+ ld a, $5
+ ld [$ff9e], a
+ ld a, $1
+ ld [$ffaa], a
+ xor a
+ ld [hBGMapMode], a
+ ld [CreditsPos], a
+ ld [$cd21], a
+ ld [CreditsTimer], a
+
+.asm_1098de
+ call Function109908
+ call Function1098fd
+ jr nz, .asm_1098ee
+
+ call Function109926
+ call DelayFrame
+ jr .asm_1098de
+
+.asm_1098ee
+ call WhiteBGMap
+ xor a
+ ld [hLCDStatCustom], a
+ ld [hBGMapAddress], a
+ pop af
+ ld [$ff9e], a
+ pop af
+ ld [rSVBK], a
+ ret
+; 1098fd
+
+Function1098fd: ; 1098fd
+ ld a, [hJoypadDown]
+ and $1
+ ret z
+ ld a, [$cf63]
+ bit 7, a
+ ret
+; 109908
+
+Function109908: ; 109908
+ ld a, [hJoypadDown]
+ and $2
+ ret z
+ ld a, [$cf63]
+ bit 6, a
+ ret z
+ ld hl, CreditsPos
+ ld a, [hli]
+ cp $d
+ jr nc, .asm_10991e
+ ld a, [hli]
+ and a
+ ret z
+
+.asm_10991e
+ ld hl, CreditsTimer
+ ld a, [hl]
+ and a
+ ret z
+ dec [hl]
+ ret
+; 109926
+
+Function109926: ; 109926
+ ld a, [$cf63]
+ and $f
+ ld e, a
+ ld d, $0
+ ld hl, $5937
+ add hl, de
+ add hl, de
+ ld a, [hli]
+ ld h, [hl]
+ ld l, a
+ jp [hl]
+; 109937
+
+
+; no known jump sources
+Jumptable_109937: ; 109937 (42:5937)
+ dw ParseCredits
+ dw Function109951
+ dw Function109951
+ dw Function10995e
+ dw Function109964
+ dw Function10997b
+ dw Function109986
+ dw Function109951
+ dw Function109951
+ dw Function109951
+ dw Function109964
+ dw Function10997b
+ dw Function109956
+
+
+; known jump sources: 109961 (42:5961), 109983 (42:5983), 1099a0 (42:59a0), 109a62 (42:5a62)
+Function109951: ; 109951 (42:5951)
+ ld hl, $cf63
+ inc [hl]
+ ret
+
+; no known jump sources
+Function109956: ; 109956 (42:5956)
+ ld hl, $cf63
+ ld a, [hl]
+ and $f0
+ ld [hl], a
+ ret
+
+; no known jump sources
+Function10995e: ; 10995e (42:595e)
+ xor a
+ ld [hBGMapMode], a ; $ff00+$d4
+ jp Function109951
+
+; no known jump sources
+Function109964: ; 109964 (42:5964)
+ call Function109bca
+ ld a, l
+ ld [$cf68], a
+ ld a, h
+ ld [$cf69], a
+ ld a, $0
+ ld [$cf6a], a
+ ld a, $90
+ ld [$cf6b], a
+ jr Function10997b
+
+; known jump sources: 109979 (42:5979)
+Function10997b: ; 10997b (42:597b)
+ xor a
+ ld [hBGMapMode], a ; $ff00+$d4
+ ld a, $8
+ ld [$cf67], a
+ jp Function109951
+
+; known jump sources: 10998a (42:598a)
+Function109986: ; 109986 (42:5986)
+ ld a, [rLY] ; $ff00+$44
+ cp $30
+ jr c, Function109986
+ ld a, [$cf66]
+ dec a
+ dec a
+ ld [$cf66], a
+ ld hl, $d11f
+ call Function1099a3
+ ld hl, $d187
+ call Function1099a3
+ jp Function109951
+
+; known jump sources: 109997 (42:5997), 10999d (42:599d)
+Function1099a3: ; 1099a3 (42:59a3)
+ ld c, $8
+.asm_1099a5
+ ld [hli], a
+ dec c
+ jr nz, .asm_1099a5
+ ret
+; 1099aa
ParseCredits: ; 1099aa
@@ -141,7 +380,7 @@ ParseCredits: ; 1099aa
call .get
; Commands:
- cp $ff
+ cp CREDITS_END
jp z, .end
cp CREDITS_WAIT
jr z, .wait
@@ -199,7 +438,7 @@ ParseCredits: ; 1099aa
.theend
; Display "The End" graphic.
- call $5c11
+ call Function109c11
jr .loop
.scene
@@ -392,7 +631,7 @@ GetCreditsPalette: ; 109b2c
add a
ld e, a
ld d, 0
- ld hl, .CreditsPalettes
+ ld hl, CreditsPalettes
add hl, de
add hl, de ; * 3
add hl, de
@@ -403,31 +642,91 @@ GetCreditsPalette: ; 109b2c
push af
push hl
- add $00 ; lo($d000)
+ add $d000 % $100
ld e, a
ld a, 0
- adc $d0 ; hi($d000)
+ adc $d000 / $100
ld d, a
ld bc, 24
call CopyBytes
pop hl
pop af
- add $80 ; lo($d080)
+ add $d080 % $100
ld e, a
ld a, 0
- adc $d0 ; hi($d080)
+ adc $d080 / $100
ld d, a
ld bc, 24
call CopyBytes
ret
-.CreditsPalettes
-INCBIN "baserom.gbc",$109b6a,$18 ; pichu.pal
-INCBIN "baserom.gbc",$109b82,$18 ; smoochum.pal
-INCBIN "baserom.gbc",$109b9a,$18 ; ditto.pal
-INCBIN "baserom.gbc",$109bb2,$18 ; igglybuff.pal
+CreditsPalettes:
+
+; Pichu
+ RGB 31, 00, 31
+ RGB 31, 25, 00
+ RGB 11, 14, 31
+ RGB 07, 07, 07
+
+ RGB 31, 05, 05
+ RGB 11, 14, 31
+ RGB 11, 14, 31
+ RGB 31, 31, 31
+
+ RGB 31, 05, 05
+ RGB 00, 00, 00
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+; Smoochum
+ RGB 31, 31, 31
+ RGB 31, 27, 00
+ RGB 26, 06, 31
+ RGB 07, 07, 07
+
+ RGB 03, 13, 31
+ RGB 20, 00, 24
+ RGB 26, 06, 31
+ RGB 31, 31, 31
+
+ RGB 03, 13, 31
+ RGB 00, 00, 00
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+; Ditto
+ RGB 31, 31, 31
+ RGB 23, 12, 28
+ RGB 31, 22, 00
+ RGB 07, 07, 07
+
+ RGB 03, 20, 00
+ RGB 31, 22, 00
+ RGB 31, 22, 00
+ RGB 31, 31, 31
+
+ RGB 03, 20, 00
+ RGB 00, 00, 00
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+; Igglybuff
+ RGB 31, 31, 31
+ RGB 31, 10, 31
+ RGB 31, 00, 09
+ RGB 07, 07, 07
+
+ RGB 31, 14, 00
+ RGB 31, 00, 09
+ RGB 31, 00, 09
+ RGB 31, 31, 31
+
+ RGB 31, 14, 00
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
; 109bca
; known jump sources: 10989e (42:589e), 109964 (42:5964)
@@ -436,31 +735,50 @@ Function109bca: ; 109bca (42:5bca)
ld a, [hl]
cp $ff
jr z, .asm_109bed
- and $3
+
+ and 3
ld e, a
inc a
- and $3
+ and 3
ld [hl], a
ld a, [$cf65]
- and $3
+ and 3
add a
add a
add e
add a
ld e, a
- ld d, $0
- ld hl, $5bf1
+ ld d, 0
+ ld hl, CreditsMonsFrames
add hl, de
ld a, [hli]
ld h, [hl]
ld l, a
ret
+
.asm_109bed
ld hl, $ca00
ret
; 109bf1 (42:5bf1)
-INCBIN "baserom.gbc",$109bf1,$109c11 - $109bf1
+CreditsMonsFrames: ; 109bf1
+ dw CreditsPichuGFX
+ dw CreditsPichuGFX + $100
+ dw CreditsPichuGFX + $200
+ dw CreditsPichuGFX + $300
+ dw CreditsSmoochumGFX
+ dw CreditsSmoochumGFX + $100
+ dw CreditsSmoochumGFX + $200
+ dw CreditsSmoochumGFX + $300
+ dw CreditsDittoGFX
+ dw CreditsDittoGFX + $100
+ dw CreditsDittoGFX + $200
+ dw CreditsDittoGFX + $300
+ dw CreditsIgglybuffGFX
+ dw CreditsIgglybuffGFX + $100
+ dw CreditsIgglybuffGFX + $200
+ dw CreditsIgglybuffGFX + $300
+; 109c11
; known jump sources: 109a1b (42:5a1b)
Function109c11: ; 109c11 (42:5c11)
@@ -481,12 +799,13 @@ Function109c1c: ; 109c1c (42:5c1c)
; 109c24 (42:5c24)
-CreditsGFX:
-INCBIN "gfx/credits/border.2bpp"
-INCBIN "gfx/credits/pichu.2bpp"
-INCBIN "gfx/credits/smoochum.2bpp"
-INCBIN "gfx/credits/ditto.2bpp"
-INCBIN "gfx/credits/igglybuff.2bpp"
+CreditsBorderGFX: INCBIN "gfx/credits/border.2bpp"
+
+CreditsMonsGFX:
+CreditsPichuGFX: INCBIN "gfx/credits/pichu.2bpp"
+CreditsSmoochumGFX: INCBIN "gfx/credits/smoochum.2bpp"
+CreditsDittoGFX: INCBIN "gfx/credits/ditto.2bpp"
+CreditsIgglybuffGFX: INCBIN "gfx/credits/igglybuff.2bpp"
CreditsScript: ; 10acb4
@@ -495,247 +814,286 @@ CreditsScript: ; 10acb4
db CREDITS_CLEAR
; Pokemon Crystal Version Staff
- db STAFF, 01
- db CREDITS_WAIT, 08
+ db STAFF, 1
+
+ db CREDITS_WAIT, 8
; Play the credits music.
db CREDITS_MUSIC
db CREDITS_WAIT2, 10
- db CREDITS_WAIT, 01
+ db CREDITS_WAIT, 1
; Update the banner.
- db CREDITS_SCENE, 00 ; Pichu
+ db CREDITS_SCENE, 0 ; Pichu
+
+ db DIRECTOR, 1
+ db SATOSHI_TAJIRI, 2
- db DIRECTOR, 01
- db SATOSHI_TAJIRI, 02
db CREDITS_WAIT, 12
- db CODIRECTOR, 01
- db JUNICHI_MASUDA, 02
+ db CODIRECTOR, 1
+ db JUNICHI_MASUDA, 2
+
db CREDITS_WAIT, 12
- db PROGRAMMERS, 00
- db SOUSUKE_TAMADA, 01
- db HISASHI_SOGABE, 02
- db KEITA_KAGAYA, 03
- db YOSHINORI_MATSUDA, 04
+ db PROGRAMMERS, 0
+ db SOUSUKE_TAMADA, 1
+ db HISASHI_SOGABE, 2
+ db KEITA_KAGAYA, 3
+ db YOSHINORI_MATSUDA, 4
+
db CREDITS_WAIT, 12
- db PROGRAMMERS, 00
- db SHIGEKI_MORIMOTO, 01
- db TETSUYA_WATANABE, 02
- db TAKENORI_OOTA, 03
+ db PROGRAMMERS, 0
+ db SHIGEKI_MORIMOTO, 1
+ db TETSUYA_WATANABE, 2
+ db TAKENORI_OOTA, 3
+
db CREDITS_WAIT, 12
- db GRAPHICS_DIRECTOR, 01
- db KEN_SUGIMORI, 02
+ db GRAPHICS_DIRECTOR, 1
+ db KEN_SUGIMORI, 2
+
db CREDITS_WAIT, 12
- db MONSTER_DESIGN, 00
- db KEN_SUGIMORI, 01
- db MOTOFUMI_FUJIWARA, 02
- db SHIGEKI_MORIMOTO, 03
- db HIRONOBU_YOSHIDA, 04
- db SATOSHI_OOTA, 05
+ db MONSTER_DESIGN, 0
+ db KEN_SUGIMORI, 1
+ db MOTOFUMI_FUJIWARA, 2
+ db SHIGEKI_MORIMOTO, 3
+ db HIRONOBU_YOSHIDA, 4
+ db SATOSHI_OOTA, 5
+
db CREDITS_WAIT, 12
- db MONSTER_DESIGN, 00
- db ATSUKO_NISHIDA, 01
- db MUNEO_SAITO, 02
- db RENA_YOSHIKAWA, 03
+ db MONSTER_DESIGN, 0
+ db ATSUKO_NISHIDA, 1
+ db MUNEO_SAITO, 2
+ db RENA_YOSHIKAWA, 3
+
db CREDITS_WAIT, 12
- db POKEMON_ANIMATION, 01
- db HIRONOBU_YOSHIDA, 02
- db JUN_OKUTANI, 03
+ db POKEMON_ANIMATION, 1
+ db HIRONOBU_YOSHIDA, 2
+ db JUN_OKUTANI, 3
+
db CREDITS_WAIT, 12
; Clear the banner.
db CREDITS_CLEAR
- db CREDITS_WAIT, 01
+ db CREDITS_WAIT, 1
; Update the banner.
- db CREDITS_SCENE, 01 ; Smoochum
+ db CREDITS_SCENE, 1 ; Smoochum
+
+ db GRAPHICS_DESIGN, 0
+ db HIRONOBU_YOSHIDA, 1
+ db JUN_OKUTANI, 2
+ db ASUKA_IWASHITA, 3
+ db TETSUYA_WATANABE, 4
- db GRAPHICS_DESIGN, 00
- db HIRONOBU_YOSHIDA, 01
- db JUN_OKUTANI, 02
- db ASUKA_IWASHITA, 03
- db TETSUYA_WATANABE, 04
db CREDITS_WAIT, 12
- db MUSIC, 00
- db JUNICHI_MASUDA, 01
- db MORIKAZU_AOKI, 02
- db GO_ICHINOSE, 03
+ db CREDIT_MUSIC, 0
+ db JUNICHI_MASUDA, 1
+ db MORIKAZU_AOKI, 2
+ db GO_ICHINOSE, 3
+
db CREDITS_WAIT, 12
- db SOUND_EFFECTS, 00
- db MORIKAZU_AOKI, 01
- db JUNICHI_MASUDA, 02
- db TETSUYA_WATANABE, 03
+ db CREDIT_SOUND_EFFECTS, 0
+ db MORIKAZU_AOKI, 1
+ db JUNICHI_MASUDA, 2
+ db TETSUYA_WATANABE, 3
+
db CREDITS_WAIT, 12
- db GAME_DESIGN, 00
- db JUNICHI_MASUDA, 01
- db SHIGEKI_MORIMOTO, 02
- db KOHJI_NISHINO, 03
+ db GAME_DESIGN, 0
+ db JUNICHI_MASUDA, 1
+ db SHIGEKI_MORIMOTO, 2
+ db KOHJI_NISHINO, 3
+
db CREDITS_WAIT, 12
- db GAME_DESIGN, 00
- db TETSUJI_OOTA, 01
- db HITOMI_SATO, 02
- db KENJI_MATSUSHIMA, 03
+ db GAME_DESIGN, 0
+ db TETSUJI_OOTA, 1
+ db HITOMI_SATO, 2
+ db KENJI_MATSUSHIMA, 3
+
db CREDITS_WAIT, 12
- db GAME_SCENARIO, 00
- db JUNICHI_MASUDA, 01
- db KOHJI_NISHINO, 02
- db TOSHINOBU_MATSUMIYA, 03
- db KENJI_MATSUSHIMA, 04
+ db GAME_SCENARIO, 0
+ db JUNICHI_MASUDA, 1
+ db KOHJI_NISHINO, 2
+ db TOSHINOBU_MATSUMIYA, 3
+ db KENJI_MATSUSHIMA, 4
+
db CREDITS_WAIT, 12
- db POKEDEX_TEXT, 01
- db TOSHINOBU_MATSUMIYA, 02
+ db POKEDEX_TEXT, 1
+ db TOSHINOBU_MATSUMIYA, 2
+
db CREDITS_WAIT, 12
- db TOOL_PROGRAMMING, 01
- db SOUSUKE_TAMADA, 02
- db TAKENORI_OOTA, 03
+ db TOOL_PROGRAMMING, 1
+ db SOUSUKE_TAMADA, 2
+ db TAKENORI_OOTA, 3
+
db CREDITS_WAIT, 12
- db PARAMETRIC_DESIGN, 01
- db KOHJI_NISHINO, 02
+ db PARAMETRIC_DESIGN, 1
+ db KOHJI_NISHINO, 2
+
db CREDITS_WAIT, 12
; Clear the banner.
db CREDITS_CLEAR
- db CREDITS_WAIT, 01
+ db CREDITS_WAIT, 1
; Update the banner.
- db CREDITS_SCENE, 02 ; Ditto
+ db CREDITS_SCENE, 2 ; Ditto
+
+ db SCRIPT_DESIGN, 1
+ db TETSUJI_OOTA, 2
+ db NOBUHIRO_SEYA, 3
- db SCRIPT_DESIGN, 01
- db TETSUJI_OOTA, 02
- db NOBUHIRO_SEYA, 03
db CREDITS_WAIT, 12
- db MAP_DATA_DESIGN, 01
- db TETSUJI_OOTA, 02
- db KAZUHITO_SEKINE, 03
+ db MAP_DATA_DESIGN, 1
+ db TETSUJI_OOTA, 2
+ db KAZUHITO_SEKINE, 3
+
db CREDITS_WAIT, 12
- db MAP_DESIGN, 00
- db TETSUJI_OOTA, 01
- db KOHJI_NISHINO, 02
- db NOBUHIRO_SEYA, 03
+ db MAP_DESIGN, 0
+ db TETSUJI_OOTA, 1
+ db KOHJI_NISHINO, 2
+ db NOBUHIRO_SEYA, 3
+
db CREDITS_WAIT, 12
- db COORDINATION, 01
- db HIROYUKI_ZINNAI, 02
+ db COORDINATION, 1
+ db HIROYUKI_ZINNAI, 2
+
db CREDITS_WAIT, 12
- db PRODUCERS, 00
- db SATORU_IWATA, 01
- db SATOSHI_YAMATO, 02
- db SHIGERU_MIYAMOTO, 03
+ db PRODUCERS, 0
+ db SATORU_IWATA, 1
+ db SATOSHI_YAMATO, 2
+ db SHIGERU_MIYAMOTO, 3
+
db CREDITS_WAIT, 12
- db PRODUCERS, 01
- db TSUNEKAZU_ISHIHARA, 02
+ db PRODUCERS, 1
+ db TSUNEKAZU_ISHIHARA, 2
+
db CREDITS_WAIT, 12
; Clear the banner.
db CREDITS_CLEAR
- db CREDITS_WAIT, 01
+ db CREDITS_WAIT, 1
; Update the banner.
- db CREDITS_SCENE, 03 ; Igglybuff
+ db CREDITS_SCENE, 3 ; Igglybuff
- db US_VERSION_STAFF, 02
- db CREDITS_WAIT, 09
+ db US_VERSION_STAFF, 2
+
+ db CREDITS_WAIT, 9
+
+ db US_COORDINATION, 1
+ db GAIL_TILDEN, 2
+ db HIRO_NAKAMURA, 3
- db US_COORDINATION, 01
- db GAIL_TILDEN, 02
- db HIRO_NAKAMURA, 03
db CREDITS_WAIT, 12
- db US_COORDINATION, 01
- db JUNICHI_MASUDA, 02
- db SETH_MCMAHILL, 03
+ db US_COORDINATION, 1
+ db JUNICHI_MASUDA, 2
+ db SETH_MCMAHILL, 3
+
db CREDITS_WAIT, 12
- db US_COORDINATION, 01
- db HIROTO_ALEXANDER, 02
- db TERESA_LILLYGREN, 03
+ db US_COORDINATION, 1
+ db HIROTO_ALEXANDER, 2
+ db TERESA_LILLYGREN, 3
+
db CREDITS_WAIT, 12
- db TEXT_TRANSLATION, 01
- db NOB_OGASAWARA, 02
+ db TEXT_TRANSLATION, 1
+ db NOB_OGASAWARA, 2
+
db CREDITS_WAIT, 12
- db PROGRAMMERS, 01
- db TERUKI_MURAKAWA, 02
- db KAZUYOSHI_OSAWA, 03
+ db PROGRAMMERS, 1
+ db TERUKI_MURAKAWA, 2
+ db KAZUYOSHI_OSAWA, 3
+
db CREDITS_WAIT, 12
- db PAAD_TESTING, 01
- db THOMAS_HERTZOG, 02
- db ERIK_JOHNSON, 03
+ db PAAD_TESTING, 1
+ db THOMAS_HERTZOG, 2
+ db ERIK_JOHNSON, 3
+
db CREDITS_WAIT, 12
- db PRODUCT_TESTING, 00
- db PLANNING, 01
+ db PRODUCT_TESTING, 0
+ db PLANNING, 1
+
db CREDITS_WAIT, 12
- db PRODUCT_TESTING, 00
- db KEITA_NAKAMURA, 01
- db HIROTAKA_UEMURA, 02
- db HIROAKI_TAMURA, 03
- db NORIAKI_SAKAGUCHI, 04
+ db PRODUCT_TESTING, 0
+ db KEITA_NAKAMURA, 1
+ db HIROTAKA_UEMURA, 2
+ db HIROAKI_TAMURA, 3
+ db NORIAKI_SAKAGUCHI, 4
+
db CREDITS_WAIT, 12
- db PRODUCT_TESTING, 00
- db NCL_SUPER_MARIO_CLUB, 01
- db KENJI_SAIKI, 02
- db ATSUSHI_TADA, 03
- db MIYUKI_SATO, 04
+ db PRODUCT_TESTING, 0
+ db NCL_SUPER_MARIO_CLUB, 1
+ db KENJI_SAIKI, 2
+ db ATSUSHI_TADA, 3
+ db MIYUKI_SATO, 4
+
db CREDITS_WAIT, 12
- db SPECIAL_THANKS, 00
- db KIMIKO_NAKAMICHI, 01
- db AKITO_MORI, 02
+ db SPECIAL_THANKS, 0
+ db KIMIKO_NAKAMICHI, 1
+ db AKITO_MORI, 2
+
db CREDITS_WAIT, 12
- db SPECIAL_THANKS, 00
- db GAKUZI_NOMOTO, 01
- db AI_MASHIMA, 02
- db KUNIMI_KAWAMURA, 03
+ db SPECIAL_THANKS, 0
+ db GAKUZI_NOMOTO, 1
+ db AI_MASHIMA, 2
+ db KUNIMI_KAWAMURA, 3
+
db CREDITS_WAIT, 12
- db SPECIAL_THANKS, 00
- db MIKIHIRO_ISHIKAWA, 01
- db HIDEYUKI_HASHIMOTO, 02
+ db SPECIAL_THANKS, 0
+ db MIKIHIRO_ISHIKAWA, 1
+ db HIDEYUKI_HASHIMOTO, 2
+
db CREDITS_WAIT, 12
- db EXECUTIVE_PRODUCER, 01
- db HIROSHI_YAMAUCHI, 02
+ db EXECUTIVE_PRODUCER, 1
+ db HIROSHI_YAMAUCHI, 2
+
db CREDITS_WAIT, 12
- db COPYRIGHT, 01
- db CREDITS_WAIT, 09
+ db COPYRIGHT, 1
+
+ db CREDITS_WAIT, 9
; Display "The End" graphic.
db CREDITS_THEEND
db CREDITS_WAIT, 20
- db $ff ; end
+ db CREDITS_END
; 10ae13
diff --git a/engine/credits_crystal.asm b/engine/credits_crystal.asm
new file mode 100644
index 000000000..76dc86319
--- /dev/null
+++ b/engine/credits_crystal.asm
@@ -0,0 +1,6 @@
+INCLUDE "pokecrystal.asm"
+INCLUDE "includes.asm"
+
+SECTION "Credits", ROMX, BANK[CREDITS]
+INCLUDE "engine/credits.asm"
+
diff --git a/engine/engine_flags.asm b/engine/engine_flags.asm
index 16ed58878..11414438e 100644
--- a/engine/engine_flags.asm
+++ b/engine/engine_flags.asm
@@ -69,33 +69,33 @@
dwb UnlockedUnowns, %10000000 ; 8
; fly
- dwb FlypointPerms, %00000001 ; your house
- dwb FlypointPerms, %00000010 ; viridian pokecenter
- dwb FlypointPerms, %00000100 ; pallet
- dwb FlypointPerms, %00001000 ; viridian
- dwb FlypointPerms, %00010000 ; pewter
- dwb FlypointPerms, %00100000 ; cerulean ; $38
- dwb FlypointPerms, %01000000 ; rock tunnel
- dwb FlypointPerms, %10000000 ; vermilion
- dwb FlypointPerms + 1, %00000001 ; lavender
- dwb FlypointPerms + 1, %00000010 ; saffron
- dwb FlypointPerms + 1, %00000100 ; celadon
- dwb FlypointPerms + 1, %00001000 ; fuchsia
- dwb FlypointPerms + 1, %00010000 ; cinnabar
- dwb FlypointPerms + 1, %00100000 ; indigo plateau ; $40
- dwb FlypointPerms + 1, %01000000 ; new bark
- dwb FlypointPerms + 1, %10000000 ; cherrygrove
- dwb FlypointPerms + 2, %00000001 ; violet
- dwb FlypointPerms + 2, %00000100 ; azalea
- dwb FlypointPerms + 2, %00001000 ; cianwood
- dwb FlypointPerms + 2, %00010000 ; goldenrod
- dwb FlypointPerms + 2, %00100000 ; olivine
- dwb FlypointPerms + 2, %01000000 ; ecruteak ; $48
- dwb FlypointPerms + 2, %10000000 ; mahogany
- dwb FlypointPerms + 3, %00000001 ; lake of rage
- dwb FlypointPerms + 3, %00000010 ; blackthorn
- dwb FlypointPerms + 3, %00000100 ; silver cave
- dwb FlypointPerms + 3, %00010000 ; unused
+ dwb VisitedSpawns, %00000001 ; your house
+ dwb VisitedSpawns, %00000010 ; viridian pokecenter
+ dwb VisitedSpawns, %00000100 ; pallet
+ dwb VisitedSpawns, %00001000 ; viridian
+ dwb VisitedSpawns, %00010000 ; pewter
+ dwb VisitedSpawns, %00100000 ; cerulean ; $38
+ dwb VisitedSpawns, %01000000 ; rock tunnel
+ dwb VisitedSpawns, %10000000 ; vermilion
+ dwb VisitedSpawns + 1, %00000001 ; lavender
+ dwb VisitedSpawns + 1, %00000010 ; saffron
+ dwb VisitedSpawns + 1, %00000100 ; celadon
+ dwb VisitedSpawns + 1, %00001000 ; fuchsia
+ dwb VisitedSpawns + 1, %00010000 ; cinnabar
+ dwb VisitedSpawns + 1, %00100000 ; indigo plateau ; $40
+ dwb VisitedSpawns + 1, %01000000 ; new bark
+ dwb VisitedSpawns + 1, %10000000 ; cherrygrove
+ dwb VisitedSpawns + 2, %00000001 ; violet
+ dwb VisitedSpawns + 2, %00000100 ; azalea
+ dwb VisitedSpawns + 2, %00001000 ; cianwood
+ dwb VisitedSpawns + 2, %00010000 ; goldenrod
+ dwb VisitedSpawns + 2, %00100000 ; olivine
+ dwb VisitedSpawns + 2, %01000000 ; ecruteak ; $48
+ dwb VisitedSpawns + 2, %10000000 ; mahogany
+ dwb VisitedSpawns + 3, %00000001 ; lake of rage
+ dwb VisitedSpawns + 3, %00000010 ; blackthorn
+ dwb VisitedSpawns + 3, %00000100 ; silver cave
+ dwb VisitedSpawns + 3, %00010000 ; unused
dwb $dc9d, %00000001 ; lucky number show
dwb $d84d, %00001000
diff --git a/engine/events.asm b/engine/events.asm
index d1b651f91..8a6db2773 100644
--- a/engine/events.asm
+++ b/engine/events.asm
@@ -1,6 +1,7 @@
INCLUDE "includes.asm"
-SECTION "events", ROMX, BANK[$25]
+
+SECTION "Events", ROMX, BANK[EVENTS]
Function966b0: ; 966b0
xor a
@@ -123,7 +124,7 @@ Function96724: ; 96724
ld bc, $3e
call ByteFill
callba Function113e5
- call ClearJoypadPublic
+ call ClearJoypad
; fallthrough
; 9673e
@@ -225,7 +226,7 @@ Function967c1: ; 967c1
cp 1
ret z
call UpdateTime
- call GetJoypadPublic
+ call GetJoypad
call TimeOfDayPals
ret
; 967d1
@@ -919,12 +920,12 @@ CheckMenuOW: ; 96b30
StartMenuScript: ; 96b58
- 3callasm BANK(StartMenu), StartMenu
+ 3callasm StartMenu
2jump StartMenuCallback
; 96b5f
SelectMenuScript: ; 96b5f
- 3callasm BANK(SelectMenu), SelectMenu
+ 3callasm SelectMenu
2jump SelectMenuCallback
; 96b66
@@ -1071,7 +1072,7 @@ UnknownScript_0x96c2e: ; 96c2e
; 96c2f
UnknownScript_0x96c2f: ; 96c2f
- 3callasm $05, $6f5e
+ 3callasm Function16f5e
end
; 96c34
@@ -1106,7 +1107,7 @@ UnknownScript_0x96c4d: ; 96c4d
UnknownScript_0x96c4f: ; 96c4f
deactivatefacing $3
- 3callasm BANK(Function96706), Function96706
+ 3callasm Function96706
end
; 96c56
diff --git a/engine/events_2.asm b/engine/events_2.asm
index 88b924bd7..682fd8237 100644
--- a/engine/events_2.asm
+++ b/engine/events_2.asm
@@ -1,8 +1,9 @@
INCLUDE "includes.asm"
+
; More overworld event handling.
-SECTION "events2", ROMX, BANK[$25]
+SECTION "Events 2", ROMX, BANK[EVENTS]
Function97c28: ; 97c28
ld hl, StatusFlags2
diff --git a/engine/facings.asm b/engine/facings.asm
new file mode 100644
index 000000000..7f078224e
--- /dev/null
+++ b/engine/facings.asm
@@ -0,0 +1,269 @@
+Facings: ; 4049
+ dw Facing00
+ dw Facing01
+ dw Facing02
+ dw Facing03
+ dw Facing04
+ dw Facing05
+ dw Facing06
+ dw Facing07
+ dw Facing08
+ dw Facing09
+ dw Facing10
+ dw Facing11
+ dw Facing12
+ dw Facing13
+ dw Facing14
+ dw Facing15
+ dw Facing16
+ dw Facing17
+ dw Facing18
+ dw Facing19
+ dw Facing20
+ dw Facing21
+ dw Facing22
+ dw Facing23
+ dw Facing24
+ dw Facing25
+ dw Facing26
+ dw Facing27
+ dw Facing28
+ dw Facing29
+ dw Facing30
+ dw Facing31
+FacingsEnd: dw 0
+
+NUM_FACINGS EQU (FacingsEnd - Facings) / 2
+
+
+; Tables used as a reference to transform OAM data.
+
+; Format:
+; db y, x, attributes, tile index
+
+; Attributes:
+X_FLIP EQU 1 << OAM_X_FLIP
+Y_FLIP EQU 1 << OAM_Y_FLIP
+BEHIND_BG EQU 1 << OAM_PRIORITY
+
+
+Facing00:
+Facing02:
+Facing24:
+Facing26: ; 408b
+ db 4 ; #
+ db 0, 0, 0, $00
+ db 0, 8, 0, $01
+ db 8, 0, 2, $02
+ db 8, 8, 2, $03
+; 409c
+
+Facing01: ; 409c
+ db 4 ; #
+ db 0, 0, 0, $80
+ db 0, 8, 0, $81
+ db 8, 0, 2, $82
+ db 8, 8, 2, $83
+; 40ad
+
+Facing03: ; 40ad
+ db 4 ; #
+ db 0, 8, X_FLIP, $80
+ db 0, 0, X_FLIP, $81
+ db 8, 8, 2 | X_FLIP, $82
+ db 8, 0, 2 | X_FLIP, $83
+; 40be
+
+Facing04:
+Facing06: ; 40be
+ db 4 ; #
+ db 0, 0, 0, $04
+ db 0, 8, 0, $05
+ db 8, 0, 2, $06
+ db 8, 8, 2, $07
+; 40cf
+
+Facing05: ; 40cf
+ db 4 ; #
+ db 0, 0, 0, $84
+ db 0, 8, 0, $85
+ db 8, 0, 2, $86
+ db 8, 8, 2, $87
+; 40e0
+
+Facing07: ; 40e0
+ db 4 ; #
+ db 0, 8, X_FLIP, $84
+ db 0, 0, X_FLIP, $85
+ db 8, 8, 2 | X_FLIP, $86
+ db 8, 0, 2 | X_FLIP, $87
+; 40f1
+
+Facing08:
+Facing10: ; 40f1
+ db 4 ; #
+ db 0, 0, 0, $08
+ db 0, 8, 0, $09
+ db 8, 0, 2, $0a
+ db 8, 8, 2, $0b
+; 4102
+
+Facing12:
+Facing14: ; 4102
+ db 4 ; #
+ db 0, 8, X_FLIP, $08
+ db 0, 0, X_FLIP, $09
+ db 8, 8, 2 | X_FLIP, $0a
+ db 8, 0, 2 | X_FLIP, $0b
+; 4113
+
+Facing09:
+Facing11: ; 4113
+ db 4 ; #
+ db 0, 0, 0, $88
+ db 0, 8, 0, $89
+ db 8, 0, 2, $8a
+ db 8, 8, 2, $8b
+; 4124
+
+Facing13:
+Facing15: ; 4124
+ db 4 ; #
+ db 0, 8, X_FLIP, $88
+ db 0, 0, X_FLIP, $89
+ db 8, 8, 2 | X_FLIP, $8a
+ db 8, 0, 2 | X_FLIP, $8b
+; 4135
+
+Facing16: ; 4135
+ db 5 ; #
+ db 0, 0, 0, $00
+ db 0, 8, 0, $01
+ db 8, 0, 2, $02
+ db 8, 8, 2, $03
+ db 16, 0, 4, $fc
+; 414a
+
+Facing17: ; 414a
+ db 5 ; #
+ db 0, 0, 0, $04
+ db 0, 8, 0, $05
+ db 8, 0, 2, $06
+ db 8, 8, 2, $07
+ db -8, 0, 4, $fc
+; 415f
+
+Facing18: ; 415f
+ db 5 ; #
+ db 0, 0, 0, $08
+ db 0, 8, 0, $09
+ db 8, 0, 2, $0a
+ db 8, 8, 2, $0b
+ db 5, -8, 4 | X_FLIP, $fd
+; 4174
+
+Facing19: ; 4174
+ db 5 ; #
+ db 0, 8, X_FLIP, $08
+ db 0, 0, X_FLIP, $09
+ db 8, 8, 2 | X_FLIP, $0a
+ db 8, 0, 2 | X_FLIP, $0b
+ db 5, 16, 4, $fd
+; 4189
+
+Facing20: ; 4189
+ db 4 ; #
+ db 0, 0, 4, $f8
+ db 0, 8, 4, $f9
+ db 8, 0, 4, $fa
+ db 8, 8, 4, $fb
+; 419a
+
+Facing21: ; 419a
+ db 2 ; #
+ db 0, 0, 4, $fc
+ db 0, 8, 4 | X_FLIP, $fc
+; 41a3
+
+Facing23: ; 41a3
+ db 16 ; #
+ db 0, 0, 0, $00
+ db 0, 8, 0, $01
+ db 8, 0, 0, $02
+ db 8, 8, 0, $03
+ db 16, 0, 0, $04
+ db 16, 8, 0, $05
+ db 24, 0, 0, $06
+ db 24, 8, 0, $07
+ db 0, 24, X_FLIP, $00
+ db 0, 16, X_FLIP, $01
+ db 8, 24, X_FLIP, $02
+ db 8, 16, X_FLIP, $03
+ db 16, 24, X_FLIP, $04
+ db 16, 16, X_FLIP, $05
+ db 24, 24, X_FLIP, $06
+ db 24, 16, X_FLIP, $07
+; 41e4
+
+Facing25: ; 41e4
+ db 4 ; #
+ db 0, 0, 0, $04
+ db 0, 8, 0, $05
+ db 8, 0, 0, $06
+ db 8, 8, 0, $07
+; 41f5
+
+Facing27: ; 41f5
+ db 4 ; #
+ db 0, 8, X_FLIP, $04
+ db 0, 0, X_FLIP, $05
+ db 8, 8, X_FLIP, $06
+ db 8, 0, X_FLIP, $07
+; 4206
+
+Facing22: ; 4206
+ db 14 ; #
+ db 0, 0, 0, $00
+ db 0, 8, 0, $01
+ db 8, 0, 0, $04
+ db 8, 8, 0, $05
+ db 16, 8, 0, $07
+ db 24, 8, 0, $0a
+ db 0, 24, 0, $03
+ db 0, 16, 0, $02
+ db 8, 24, X_FLIP, $02
+ db 8, 16, 0, $06
+ db 16, 24, 0, $09
+ db 16, 16, 0, $08
+ db 24, 24, X_FLIP, $04
+ db 24, 16, 0, $0b
+; 423f
+
+Facing28: ; 423f
+ db 4 ; #
+ db 0, 0, 4, $fe
+ db 0, 8, 4, $fe
+ db 8, 0, 4, $fe
+ db 8, 8, 4, $fe
+; 4250
+
+Facing29: ; 4250
+ db 4 ; #
+ db 0, 0, 4, $ff
+ db 0, 8, 4, $ff
+ db 8, 0, 4, $ff
+ db 8, 8, 4, $ff
+; 4261
+
+Facing30: ; 4261
+ db 2 ; #
+ db 8, 0, 4, $fe
+ db 8, 8, 4 | X_FLIP, $fe
+; 426a
+
+Facing31: ; 426a
+ db 2 ; #
+ db 9, -1, 4, $fe
+ db 9, 9, 4 | X_FLIP, $fe
+; 4273
+
diff --git a/engine/fruit_trees.asm b/engine/fruit_trees.asm
index a8a3b797b..50653823b 100644
--- a/engine/fruit_trees.asm
+++ b/engine/fruit_trees.asm
@@ -1,12 +1,12 @@
FruitTreeScript: ; 44000
- 3callasm BANK(GetCurTreeFruit), GetCurTreeFruit
+ 3callasm GetCurTreeFruit
loadfont
copybytetovar CurFruit
itemtotext $0, $0
2writetext FruitBearingTreeText
keeptextopen
- 3callasm BANK(TryResetFruitTrees), TryResetFruitTrees
- 3callasm BANK(CheckFruitTree), CheckFruitTree
+ 3callasm TryResetFruitTrees
+ 3callasm CheckFruitTree
iffalse .fruit
2writetext NothingHereText
closetext
@@ -19,7 +19,7 @@ FruitTreeScript: ; 44000
iffalse .packisfull
keeptextopen
2writetext ObtainedFruitText
- 3callasm BANK(PickedFruitTree), PickedFruitTree
+ 3callasm PickedFruitTree
specialsound
itemnotify
2jump .end
@@ -136,27 +136,27 @@ FruitTreeItems: ; 44097
; 440b5
FruitBearingTreeText: ; 440b5
- text_jump _FruitBearingTreeText, BANK(_FruitBearingTreeText)
+ text_jump _FruitBearingTreeText
db "@"
; 440ba
HeyItsFruitText: ; 440ba
- text_jump _HeyItsFruitText, BANK(_HeyItsFruitText)
+ text_jump _HeyItsFruitText
db "@"
; 440bf
ObtainedFruitText: ; 440bf
- text_jump _ObtainedFruitText, BANK(_ObtainedFruitText)
+ text_jump _ObtainedFruitText
db "@"
; 440c4
FruitPackIsFullText: ; 440c4
- text_jump _FruitPackIsFullText, BANK(_FruitPackIsFullText)
+ text_jump _FruitPackIsFullText
db "@"
; 440c9
NothingHereText: ; 440c9
- text_jump _NothingHereText, BANK(_NothingHereText)
+ text_jump _NothingHereText
db "@"
; 440ce
diff --git a/engine/landmarks.asm b/engine/landmarks.asm
index 2109bd556..a6ea6be68 100644
--- a/engine/landmarks.asm
+++ b/engine/landmarks.asm
@@ -1,8 +1,8 @@
GetLandmarkCoords: ; 0x1ca896
-; given a landmark id in e, return the y coord in d, and the x coord in e.
+; Return coordinates (d, e) of landmark e.
push hl
ld l, e
- ld h, $0
+ ld h, 0
add hl, hl
add hl, hl
ld de, Landmarks
@@ -12,528 +12,246 @@ GetLandmarkCoords: ; 0x1ca896
ld d, [hl]
pop hl
ret
+; 0x1ca8a5
GetLandmarkName: ; 0x1ca8a5
-; given a landmark id in e, copy its name to $d073.
+; Copy the name of landmark e to StringBuffer1.
push hl
push de
push bc
+
ld l, e
- ld h, $0
+ ld h, 0
add hl, hl
add hl, hl
- ld de, Landmarks + 2 ; skip the coordinates, we only want the string
+ ld de, Landmarks + 2
add hl, de
ld a, [hli]
ld h, [hl]
ld l, a
- ld de, $d073
+
+ ld de, StringBuffer1
ld c, 18
-.loop
+.copy
ld a, [hli]
ld [de], a
inc de
dec c
- jr nz, .loop
+ jr nz, .copy
+
pop bc
pop de
pop hl
ret
+; 0x1ca8c3
-Landmarks: ; 0x1ca8c3
-;db x coord, y coord
-;dw pointer to name
- db 0,0
- dw SpecialMapString
-
- db 148,116
- dw NewBarkString
-
- db 136,116
- dw Route29String
-
- db 108,116
- dw CherrygroveString
-
- db 108,96
- dw Route30String
-
- db 104,76
- dw Route31String
-
- db 92,76
- dw VioletString
-
- db 93,74
- dw SproutString
-
- db 92,108
- dw Route32String
-
- db 84,92
- dw RuinsString
-
- db 92,140
- dw UnionString
-
- db 90,140
- dw Route33String
-
- db 76,140
- dw AzaleaString
-
- db 78,138
- dw WellString
-
- db 60,136
- dw IlexString
-
- db 60,128
- dw Route34String
-
- db 60,108
- dw GoldenrodString
-
- db 58,108
- dw RadioTowerString
-
- db 60,92
- dw Route35String
-
- db 60,76
- dw ParkString
-
- db 72,76
- dw Route36String
-
- db 76,68
- dw Route37String
-
- db 76,60
- dw EcruteakString
-
- db 78,58
- dw TinString
-
- db 74,58
- dw BurnedTowerString
-
- db 60,60
- dw Route38String
-
- db 44,64
- dw Route39String
-
- db 44,76
- dw OlivineString
-
- db 46,78
- dw LighthouseString
-
- db 36,72
- dw BattleTowerString
-
- db 36,80
- dw Route40String
-
- db 36,108
- dw WhirlString
-
- db 36,116
- dw Route41String
-
- db 28,116
- dw CianwoodString
-
- db 100,60
- dw Route42String
-
- db 92,60
- dw MortarString
-
- db 116,60
- dw MahoganyString
-
- db 116,52
- dw Route43String
-
- db 116,44
- dw LakeString
-
- db 128,60
- dw Route44String
-
- db 138,54
- dw PathString
-
- db 140,60
- dw BlackthornString
-
- db 140,52
- dw DenString
-
- db 140,80
- dw Route45String
-
- db 120,88
- dw DarkString
-
- db 132,104
- dw Route46String
-
- db 156,84
- dw SilverCaveString
- db 60,124
- dw PalletString
-
- db 60,108
- dw Route1String
-
- db 60,92
- dw ViridianString
-
- db 60,80
- dw Route2String
-
- db 60,68
- dw PewterString
-
- db 72,68
- dw Route3String
-
- db 84,68
- dw MoonString
-
- db 96,68
- dw Route4String
-
- db 108,68
- dw CeruleanString
-
- db 108,60
- dw Route24String
-
- db 116,52
- dw Route25String
-
- db 108,76
- dw Route5String
-
- db 116,92
- dw UndergroundString
-
- db 108,92
- dw Route6String
-
- db 108,100
- dw VermilionString
-
- db 96,76
- dw DiglettsCaveString
-
- db 96,84
- dw Route7String
-
- db 124,84
- dw Route8String
-
- db 124,68
- dw Route9String
-
- db 140,68
- dw TunnelString
-
- db 140,72
- dw Route10String
-
- db 140,76
- dw PlantString
-
- db 140,84
- dw LavenderString
-
- db 148,84
- dw LavTowerString
-
- db 84,84
- dw CeladonString
-
- db 108,84
- dw SaffronString
-
- db 124,100
- dw Route11String
-
- db 140,96
- dw Route12String
-
- db 132,116
- dw Route13String
-
- db 124,128
- dw Route14String
-
- db 112,132
- dw Route15String
-
- db 76,84
- dw Route16String
-
- db 76,108
- dw Route17String
-
- db 88,132
- dw Route18String
-
- db 100,132
- dw FuchsiaString
-
- db 100,144
- dw Route19String
-
- db 84,148
- dw Route20String
-
- db 76,148
- dw SeafoamString
-
- db 60,148
- dw CinnabarString
-
- db 60,136
- dw Route21String
-
- db 44,84
- dw Route22String
-
- db 36,68
- dw RoadString
-
- db 36,60
- dw Route23String
-
- db 36,52
- dw IndigoString
-
- db 36,108
- dw Route26String
-
- db 28,116
- dw Route27String
-
- db 20,116
- dw FallsString
-
- db 28,84
- dw Route28String
-
- db 148,132
- dw AquaString
+Landmarks: ; 0x1ca8c3
-NewBarkString:
- db "NEW BARK",$1F,"TOWN@"
-CherrygroveString:
- db "CHERRYGROVE",$1F,"CITY@"
-VioletString:
- db "VIOLET CITY@"
-AzaleaString:
- db "AZALEA TOWN@"
-GoldenrodString:
- db "GOLDENROD",$1F,"CITY@"
-EcruteakString:
- db "ECRUTEAK",$1F,"CITY@"
-OlivineString:
- db "OLIVINE",$1F,"CITY@"
-CianwoodString:
- db "CIANWOOD",$1F,"CITY@"
-MahoganyString:
- db "MAHOGANY",$1F,"TOWN@"
-BlackthornString:
- db "BLACKTHORN",$1F,"CITY@"
-LakeString:
- db "LAKE OF",$1F,"RAGE@"
-SilverCaveString:
- db "SILVER CAVE@"
-SproutString:
- db "SPROUT",$1F,"TOWER@"
-RuinsString:
- db "RUINS",$1F,"OF ALPH@"
-UnionString:
- db "UNION CAVE@"
-WellString:
- db "SLOWPOKE",$1F,"WELL@"
-RadioTowerString:
- db "RADIO TOWER@"
-PlantString:
- db "POWER PLANT@"
-ParkString:
- db "NATIONAL",$1F,"PARK@"
-TinString:
- db "TIN TOWER@"
-LighthouseString:
- db "LIGHTHOUSE@"
-WhirlString:
- db "WHIRL",$1F,"ISLANDS@"
-MortarString:
- db "MT.MORTAR@"
-DenString:
- db "DRAGON'S",$1F,"DEN@"
-PathString:
- db "ICE PATH@"
-NotApplicableString:
- db "N/A@"
-PalletString:
- db "PALLET TOWN@"
-ViridianString:
- db "VIRIDIAN",$1F,"CITY@"
-PewterString:
- db "PEWTER CITY@"
-CeruleanString:
- db "CERULEAN",$1F,"CITY@"
-LavenderString:
- db "LAVENDER",$1F,"TOWN@"
-VermilionString:
- db "VERMILION",$1F,"CITY@"
-CeladonString:
- db "CELADON",$1F,"CITY@"
-SaffronString:
- db "SAFFRON",$1F,"CITY@"
-FuchsiaString:
- db "FUCHSIA",$1F,"CITY@"
-CinnabarString:
- db "CINNABAR",$1F,"ISLAND@"
-IndigoString:
- db "INDIGO",$1F,"PLATEAU@"
-RoadString:
- db "VICTORY",$1F,"ROAD@"
-MoonString:
- db "MT.MOON@"
-TunnelString:
- db "ROCK TUNNEL@"
-LavTowerString:
- db "LAV",$1F,"RADIO TOWER@"
-SilphString:
- db "SILPH CO.@"
-ZoneString:
- db "SAFARI ZONE@"
-SeafoamString:
- db "SEAFOAM",$1F,"ISLANDS@"
-MansionString:
- db "#MON",$1F,"MANSION@"
-DungeonString:
- db "CERULEAN",$1F,"CAVE@"
-Route1String:
- db "ROUTE 1@"
-Route2String:
- db "ROUTE 2@"
-Route3String:
- db "ROUTE 3@"
-Route4String:
- db "ROUTE 4@"
-Route5String:
- db "ROUTE 5@"
-Route6String:
- db "ROUTE 6@"
-Route7String:
- db "ROUTE 7@"
-Route8String:
- db "ROUTE 8@"
-Route9String:
- db "ROUTE 9@"
-Route10String:
- db "ROUTE 10@"
-Route11String:
- db "ROUTE 11@"
-Route12String:
- db "ROUTE 12@"
-Route13String:
- db "ROUTE 13@"
-Route14String:
- db "ROUTE 14@"
-Route15String:
- db "ROUTE 15@"
-Route16String:
- db "ROUTE 16@"
-Route17String:
- db "ROUTE 17@"
-Route18String:
- db "ROUTE 18@"
-Route19String:
- db "ROUTE 19@"
-Route20String:
- db "ROUTE 20@"
-Route21String:
- db "ROUTE 21@"
-Route22String:
- db "ROUTE 22@"
-Route23String:
- db "ROUTE 23@"
-Route24String:
- db "ROUTE 24@"
-Route25String:
- db "ROUTE 25@"
-Route26String:
- db "ROUTE 26@"
-Route27String:
- db "ROUTE 27@"
-Route28String:
- db "ROUTE 28@"
-Route29String:
- db "ROUTE 29@"
-Route30String:
- db "ROUTE 30@"
-Route31String:
- db "ROUTE 31@"
-Route32String:
- db "ROUTE 32@"
-Route33String:
- db "ROUTE 33@"
-Route34String:
- db "ROUTE 34@"
-Route35String:
- db "ROUTE 35@"
-Route36String:
- db "ROUTE 36@"
-Route37String:
- db "ROUTE 37@"
-Route38String:
- db "ROUTE 38@"
-Route39String:
- db "ROUTE 39@"
-Route40String:
- db "ROUTE 40@"
-Route41String:
- db "ROUTE 41@"
-Route42String:
- db "ROUTE 42@"
-Route43String:
- db "ROUTE 43@"
-Route44String:
- db "ROUTE 44@"
-Route45String:
- db "ROUTE 45@"
-Route46String:
- db "ROUTE 46@"
-DarkString:
- db "DARK CAVE@"
-IlexString:
- db "ILEX",$1F,"FOREST@"
-BurnedTowerString:
- db "BURNED",$1F,"TOWER@"
-AquaString:
- db "FAST SHIP@"
-ViridianForestString:
- db "VIRIDIAN",$1F,"FOREST@"
-DiglettsCaveString:
- db "DIGLETT'S",$1F,"CAVE@"
-FallsString:
- db "TOHJO FALLS@"
-UndergroundString:
- db "UNDERGROUND@"
-BattleTowerString:
- db "BATTLE",$1F,"TOWER@"
-SpecialMapString:
- db "SPECIAL@"
+landmark: MACRO
+ db \1, \2
+ dw \3
+ENDM
+
+ landmark 0, 0, SpecialMapName
+ landmark 148, 116, NewBarkTownName
+ landmark 136, 116, Route29Name
+ landmark 108, 116, CherrygroveCityName
+ landmark 108, 96, Route30Name
+ landmark 104, 76, Route31Name
+ landmark 92, 76, VioletCityName
+ landmark 93, 74, SproutTowerName
+ landmark 92, 108, Route32Name
+ landmark 84, 92, RuinsOfAlphName
+ landmark 92, 140, UnionCaveName
+ landmark 90, 140, Route33Name
+ landmark 76, 140, AzaleaTownName
+ landmark 78, 138, SlowpokeWellName
+ landmark 60, 136, IlexForestName
+ landmark 60, 128, Route34Name
+ landmark 60, 108, GoldenrodCityName
+ landmark 58, 108, RadioTowerName
+ landmark 60, 92, Route35Name
+ landmark 60, 76, NationalParkName
+ landmark 72, 76, Route36Name
+ landmark 76, 68, Route37Name
+ landmark 76, 60, EcruteakCityName
+ landmark 78, 58, TinTowerName
+ landmark 74, 58, BurnedTowerName
+ landmark 60, 60, Route38Name
+ landmark 44, 64, Route39Name
+ landmark 44, 76, OlivineCityName
+ landmark 46, 78, LighthouseName
+ landmark 36, 72, BattleTowerName
+ landmark 36, 80, Route40Name
+ landmark 36, 108, WhirlIslandsName
+ landmark 36, 116, Route41Name
+ landmark 28, 116, CianwoodCityName
+ landmark 100, 60, Route42Name
+ landmark 92, 60, MtMortarName
+ landmark 116, 60, MahoganyTownName
+ landmark 116, 52, Route43Name
+ landmark 116, 44, LakeOfRageName
+ landmark 128, 60, Route44Name
+ landmark 138, 54, IcePathName
+ landmark 140, 60, BlackthornCityName
+ landmark 140, 52, DragonsDenName
+ landmark 140, 80, Route45Name
+ landmark 120, 88, DarkCaveName
+ landmark 132, 104, Route46Name
+ landmark 156, 84, SilverCaveName
+ landmark 60, 124, PalletTownName
+ landmark 60, 108, Route1Name
+ landmark 60, 92, ViridianCityName
+ landmark 60, 80, Route2Name
+ landmark 60, 68, PewterCityName
+ landmark 72, 68, Route3Name
+ landmark 84, 68, MtMoonName
+ landmark 96, 68, Route4Name
+ landmark 108, 68, CeruleanCityName
+ landmark 108, 60, Route24Name
+ landmark 116, 52, Route25Name
+ landmark 108, 76, Route5Name
+ landmark 116, 92, UndergroundName
+ landmark 108, 92, Route6Name
+ landmark 108, 100, VermilionCityName
+ landmark 96, 76, DiglettsCaveName
+ landmark 96, 84, Route7Name
+ landmark 124, 84, Route8Name
+ landmark 124, 68, Route9Name
+ landmark 140, 68, RockTunnelName
+ landmark 140, 72, Route10Name
+ landmark 140, 76, PowerPlantName
+ landmark 140, 84, LavenderTownName
+ landmark 148, 84, LavRadioTowerName
+ landmark 84, 84, CeladonCityName
+ landmark 108, 84, SaffronCityName
+ landmark 124, 100, Route11Name
+ landmark 140, 96, Route12Name
+ landmark 132, 116, Route13Name
+ landmark 124, 128, Route14Name
+ landmark 112, 132, Route15Name
+ landmark 76, 84, Route16Name
+ landmark 76, 108, Route17Name
+ landmark 88, 132, Route18Name
+ landmark 100, 132, FuchsiaCityName
+ landmark 100, 144, Route19Name
+ landmark 84, 148, Route20Name
+ landmark 76, 148, SeafoamIslandsName
+ landmark 60, 148, CinnabarIslandName
+ landmark 60, 136, Route21Name
+ landmark 44, 84, Route22Name
+ landmark 36, 68, VictoryRoadName
+ landmark 36, 60, Route23Name
+ landmark 36, 52, IndigoPlateauName
+ landmark 36, 108, Route26Name
+ landmark 28, 116, Route27Name
+ landmark 20, 116, TohjoFallsName
+ landmark 28, 84, Route28Name
+ landmark 148, 132, FastShipName
+
+
+NewBarkTownName: db "NEW BARK", $1f, "TOWN@"
+CherrygroveCityName: db "CHERRYGROVE", $1f, "CITY@"
+VioletCityName: db "VIOLET CITY@"
+AzaleaTownName: db "AZALEA TOWN@"
+GoldenrodCityName: db "GOLDENROD", $1f, "CITY@"
+EcruteakCityName: db "ECRUTEAK", $1f, "CITY@"
+OlivineCityName: db "OLIVINE", $1f, "CITY@"
+CianwoodCityName: db "CIANWOOD", $1f, "CITY@"
+MahoganyTownName: db "MAHOGANY", $1f, "TOWN@"
+BlackthornCityName: db "BLACKTHORN", $1f, "CITY@"
+LakeOfRageName: db "LAKE OF", $1f, "RAGE@"
+SilverCaveName: db "SILVER CAVE@"
+SproutTowerName: db "SPROUT", $1f, "TOWER@"
+RuinsOfAlphName: db "RUINS", $1f, "OF ALPH@"
+UnionCaveName: db "UNION CAVE@"
+SlowpokeWellName: db "SLOWPOKE", $1f, "WELL@"
+RadioTowerName: db "RADIO TOWER@"
+PowerPlantName: db "POWER PLANT@"
+NationalParkName: db "NATIONAL", $1f, "PARK@"
+TinTowerName: db "TIN TOWER@"
+LighthouseName: db "LIGHTHOUSE@"
+WhirlIslandsName: db "WHIRL", $1f, "ISLANDS@"
+MtMortarName: db "MT.MORTAR@"
+DragonsDenName: db "DRAGON'S", $1f, "DEN@"
+IcePathName: db "ICE PATH@"
+NotApplicableName: db "N/A@"
+PalletTownName: db "PALLET TOWN@"
+ViridianCityName: db "VIRIDIAN", $1f, "CITY@"
+PewterCityName: db "PEWTER CITY@"
+CeruleanCityName: db "CERULEAN", $1f, "CITY@"
+LavenderTownName: db "LAVENDER", $1f, "TOWN@"
+VermilionCityName: db "VERMILION", $1f, "CITY@"
+CeladonCityName: db "CELADON", $1f, "CITY@"
+SaffronCityName: db "SAFFRON", $1f, "CITY@"
+FuchsiaCityName: db "FUCHSIA", $1f, "CITY@"
+CinnabarIslandName: db "CINNABAR", $1f, "ISLAND@"
+IndigoPlateauName: db "INDIGO", $1f, "PLATEAU@"
+VictoryRoadName: db "VICTORY", $1f, "ROAD@"
+MtMoonName: db "MT.MOON@"
+RockTunnelName: db "ROCK TUNNEL@"
+LavRadioTowerName: db "LAV", $1f, "RADIO TOWER@"
+SilphCoName: db "SILPH CO.@"
+SafariZoneName: db "SAFARI ZONE@"
+SeafoamIslandsName: db "SEAFOAM", $1f, "ISLANDS@"
+PokemonMansionName: db "#MON", $1f, "MANSION@"
+CeruleanCaveNane: db "CERULEAN", $1f, "CAVE@"
+Route1Name: db "ROUTE 1@"
+Route2Name: db "ROUTE 2@"
+Route3Name: db "ROUTE 3@"
+Route4Name: db "ROUTE 4@"
+Route5Name: db "ROUTE 5@"
+Route6Name: db "ROUTE 6@"
+Route7Name: db "ROUTE 7@"
+Route8Name: db "ROUTE 8@"
+Route9Name: db "ROUTE 9@"
+Route10Name: db "ROUTE 10@"
+Route11Name: db "ROUTE 11@"
+Route12Name: db "ROUTE 12@"
+Route13Name: db "ROUTE 13@"
+Route14Name: db "ROUTE 14@"
+Route15Name: db "ROUTE 15@"
+Route16Name: db "ROUTE 16@"
+Route17Name: db "ROUTE 17@"
+Route18Name: db "ROUTE 18@"
+Route19Name: db "ROUTE 19@"
+Route20Name: db "ROUTE 20@"
+Route21Name: db "ROUTE 21@"
+Route22Name: db "ROUTE 22@"
+Route23Name: db "ROUTE 23@"
+Route24Name: db "ROUTE 24@"
+Route25Name: db "ROUTE 25@"
+Route26Name: db "ROUTE 26@"
+Route27Name: db "ROUTE 27@"
+Route28Name: db "ROUTE 28@"
+Route29Name: db "ROUTE 29@"
+Route30Name: db "ROUTE 30@"
+Route31Name: db "ROUTE 31@"
+Route32Name: db "ROUTE 32@"
+Route33Name: db "ROUTE 33@"
+Route34Name: db "ROUTE 34@"
+Route35Name: db "ROUTE 35@"
+Route36Name: db "ROUTE 36@"
+Route37Name: db "ROUTE 37@"
+Route38Name: db "ROUTE 38@"
+Route39Name: db "ROUTE 39@"
+Route40Name: db "ROUTE 40@"
+Route41Name: db "ROUTE 41@"
+Route42Name: db "ROUTE 42@"
+Route43Name: db "ROUTE 43@"
+Route44Name: db "ROUTE 44@"
+Route45Name: db "ROUTE 45@"
+Route46Name: db "ROUTE 46@"
+DarkCaveName: db "DARK CAVE@"
+IlexForestName: db "ILEX", $1f, "FOREST@"
+BurnedTowerName: db "BURNED", $1f, "TOWER@"
+FastShipName: db "FAST SHIP@"
+ViridianForestName: db "VIRIDIAN", $1f, "FOREST@"
+DiglettsCaveName: db "DIGLETT'S", $1f, "CAVE@"
+TohjoFallsName: db "TOHJO FALLS@"
+UndergroundName: db "UNDERGROUND@"
+BattleTowerName: db "BATTLE", $1f, "TOWER@"
+SpecialMapName: db "SPECIAL@"
diff --git a/engine/movement.asm b/engine/movement.asm
index da08280c1..4c3e1d03b 100644
--- a/engine/movement.asm
+++ b/engine/movement.asm
@@ -205,7 +205,7 @@ Function51b8: ; 51b8
; 51c1
Movement_step_end: ; 51c1
- call $4769
+ call Function4769
ld hl, $0003
add hl, bc
ld [hl], a
@@ -221,7 +221,7 @@ Movement_step_end: ; 51c1
; 51db
Function51db: ; 51db
- call $4769
+ call Function4769
ld hl, $0003
add hl, bc
ld [hl], a
@@ -241,7 +241,7 @@ Function51db: ; 51db
; 51fd
Movement_remove_person: ; 51fd
- call $4357
+ call Function4357
ld hl, $d4cd
ld a, [hConnectionStripLength]
cp [hl]
@@ -398,12 +398,12 @@ Movement_hide_person: ; 52c0
; 52c9
Movement_hide_emote: ; 52c9
- call $5579
+ call Function5579
jp Function5065
; 52cf
Movement_show_emote: ; 52cf
- call $5547
+ call Function5547
jp Function5065
; 52d5
@@ -412,7 +412,7 @@ Movement_step_shake: ; 52d5
; displacement (DecimalParam)
call Function505e
- call $5565
+ call Function5565
jp Function5065
; 52de
@@ -719,27 +719,29 @@ Function5400: ; 5400
; 5412
Function5412: ; 5412
- call $4690
- call $463f
+ call Function4690
+ call Function463f
ld hl, $000b
add hl, bc
ld [hl], $2
- ld hl, $000e
+ ld hl, OBJECT_STANDING_TILE
add hl, bc
ld a, [hl]
- call $188e
+ call Function188e
jr z, .asm_542d
- call $1875
+
+ call Function1875
jr c, .asm_5430
.asm_542d
- call $5556
+ call Function5556
.asm_5430
ld hl, $d4cf
ld a, [hConnectionStripLength]
cp [hl]
jr z, .asm_543f
+
ld hl, $0009
add hl, bc
ld [hl], $2
@@ -753,8 +755,8 @@ Function5412: ; 5412
; 5446
Function5446: ; 5446
- call $4690
- call $463f
+ call Function4690
+ call Function463f
ld hl, $000b
add hl, bc
ld [hl], $4
@@ -776,8 +778,8 @@ Function5446: ; 5446
Function5468: ; 5468
- call $4690
- call $463f
+ call Function4690
+ call Function463f
ld hl, $000b
add hl, bc
ld [hl], $1
@@ -799,7 +801,7 @@ Function5468: ; 5468
Function548a: ; 548a
- call $4690
+ call Function4690
ld hl, $001f
add hl, bc
ld [hl], $0
@@ -809,7 +811,7 @@ Function548a: ; 548a
ld hl, $000b
add hl, bc
ld [hl], $2
- call $5529
+ call Function5529
ld hl, $d4cf
ld a, [hConnectionStripLength]
cp [hl]
diff --git a/engine/scripting.asm b/engine/scripting.asm
index 4fabec928..f0d064d8e 100644
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -455,7 +455,7 @@ Script_keeptextopen: ; 0x96edc
Script_yesorno: ; 0x96eed
; script command 0x4e
- call Function1dcf
+ call YesNoBox
ld a, $0
jr c, .asm_96ef6 ; 0x96ef2 $2
ld a, $1
@@ -573,7 +573,7 @@ Function96f76: ; 96f76
; 96f77
GiveItemScript: ; 96f77
- 3callasm BANK(Function96f76), Function96f76
+ 3callasm Function96f76
2writetext ReceivedItemText
iffalse .Full
waitbutton
@@ -589,7 +589,7 @@ GiveItemScript: ; 96f77
; 96f89
ReceivedItemText: ; 96f89
- text_jump UnknownText_0x1c4719, BANK(UnknownText_0x1c4719)
+ text_jump UnknownText_0x1c4719
db "@"
; 96f8e
@@ -706,12 +706,12 @@ CurItemName: ; 97051
PutItemInPocketText: ; 9705b
- text_jump UnknownText_0x1c472c, BANK(UnknownText_0x1c472c)
+ text_jump UnknownText_0x1c472c
db "@"
; 97060
PocketIsFullText: ; 97060
- text_jump UnknownText_0x1c474b, BANK(UnknownText_0x1c474b)
+ text_jump UnknownText_0x1c474b
db "@"
; 97065
@@ -792,7 +792,7 @@ Script_askforphonenumber: ; 0x970be
; parameters:
; number (SingleByteParam)
- call Function1dcf
+ call YesNoBox
jr c, .asm_970d6 ; 0x970c1 $13
call GetScriptByte
ld c, a
diff --git a/engine/scripting_crystal.asm b/engine/scripting_crystal.asm
index 5a7468bda..6d80455a0 100644
--- a/engine/scripting_crystal.asm
+++ b/engine/scripting_crystal.asm
@@ -1,5 +1,7 @@
INCLUDE "pokecrystal.asm"
INCLUDE "includes.asm"
-SECTION "scripting", ROMX, BANK[$25]
+
+SECTION "Event Scripting", ROMX, BANK[EVENTS]
+
INCLUDE "engine/scripting.asm"
diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm
index 7b64ebe00..95283ad19 100644
--- a/engine/std_scripts.asm
+++ b/engine/std_scripts.asm
@@ -75,12 +75,12 @@ PokeCenterNurseScript: ; bc09c
checkevent $032a
iftrue .morn_comcenter
; Good morning! Welcome to ...
- 3writetext BANK(UnknownText_0x1b0000), UnknownText_0x1b0000
+ 3writetext UnknownText_0x1b0000
keeptextopen
2jump .heal
.morn_comcenter
; Good morning! This is the ...
- 3writetext BANK(UnknownText_0x1b008a), UnknownText_0x1b008a
+ 3writetext UnknownText_0x1b008a
keeptextopen
2jump .heal
@@ -89,12 +89,12 @@ PokeCenterNurseScript: ; bc09c
checkevent $032a
iftrue .day_comcenter
; Hello! Welcome to ...
- 3writetext BANK(UnknownText_0x1b002b), UnknownText_0x1b002b
+ 3writetext UnknownText_0x1b002b
keeptextopen
2jump .heal
.day_comcenter
; Hello! This is the ...
- 3writetext BANK(UnknownText_0x1b00d6), UnknownText_0x1b00d6
+ 3writetext UnknownText_0x1b00d6
keeptextopen
2jump .heal
@@ -103,12 +103,12 @@ PokeCenterNurseScript: ; bc09c
checkevent $032a
iftrue .nite_comcenter
; Good evening! You're out late. ...
- 3writetext BANK(UnknownText_0x1b004f), UnknownText_0x1b004f
+ 3writetext UnknownText_0x1b004f
keeptextopen
2jump .heal
.nite_comcenter
; Good to see you working so late. ...
- 3writetext BANK(UnknownText_0x1b011b), UnknownText_0x1b011b
+ 3writetext UnknownText_0x1b011b
keeptextopen
2jump .heal
@@ -116,11 +116,11 @@ PokeCenterNurseScript: ; bc09c
; If we come back, don't welcome us to the com center again
clearevent $032a
; Ask if you want to heal
- 3writetext BANK(UnknownText_0x1b017a), UnknownText_0x1b017a
+ 3writetext UnknownText_0x1b017a
yesorno
iffalse .end
; Go ahead and heal
- 3writetext BANK(UnknownText_0x1b01bd), UnknownText_0x1b01bd
+ 3writetext UnknownText_0x1b01bd
pause 20
special $009d
; Turn to the machine
@@ -145,11 +145,11 @@ PokeCenterNurseScript: ; bc09c
iftrue .pokerus
.done
; Thank you for waiting. ...
- 3writetext BANK(UnknownText_0x1b01d7), UnknownText_0x1b01d7
+ 3writetext UnknownText_0x1b01d7
pause 20
.end
; We hope to see you again.
- 3writetext BANK(UnknownText_0x1b020b), UnknownText_0x1b020b
+ 3writetext UnknownText_0x1b020b
; Curtsy
spriteface $fe, $1
pause 10
@@ -167,13 +167,13 @@ PokeCenterNurseScript: ; bc09c
checkevent $032a
iftrue .pokerus_comcenter
; Your Pokemon appear to be infected ...
- 3writetext BANK(UnknownText_0x1b0241), UnknownText_0x1b0241
+ 3writetext UnknownText_0x1b0241
closetext
loadmovesprites
2jump .endpokerus
.pokerus_comcenter
; Your Pokemon appear to be infected ...
- 3writetext BANK(UnknownText_0x1b02d6), UnknownText_0x1b02d6
+ 3writetext UnknownText_0x1b02d6
closetext
loadmovesprites
.endpokerus
@@ -185,32 +185,32 @@ PokeCenterNurseScript: ; bc09c
; bc162
UnknownScript_0xbc162: ; 0xbc162
- 3jumptext $6c, $435a
+ 3jumptext UnknownText_0x1b035a
; 0xbc166
UnknownScript_0xbc166: ; 0xbc166
- 3jumptext $6c, $4378
+ 3jumptext UnknownText_0x1b0378
; 0xbc16a
UnknownScript_0xbc16a: ; 0xbc16a
- 3jumptext $6c, $43a3
+ 3jumptext UnknownText_0x1b03a3
; 0xbc16e
UnknownScript_0xbc16e: ; 0xbc16e
- 3jumptext $6c, $43d9
+ 3jumptext UnknownText_0x1b03d9
; 0xbc172
UnknownScript_0xbc172: ; 0xbc172
- 3jumptext $6c, $4448
+ 3jumptext UnknownText_0x1b0448
; 0xbc176
UnknownScript_0xbc176: ; 0xbc176
- 3jumptext $6c, $4472
+ 3jumptext UnknownText_0x1b0472
; 0xbc17a
UnknownScript_0xbc17a: ; 0xbc17a
loadfont
- 3writetext $6c, $448d
+ 3writetext UnknownText_0x1b048d
closetext
special $0026
loadmovesprites
@@ -218,19 +218,19 @@ UnknownScript_0xbc17a: ; 0xbc17a
; 0xbc185
UnknownScript_0xbc185: ; 0xbc185
- 3jumptext $6c, $44a0
+ 3jumptext UnknownText_0x1b04a0
; 0xbc189
UnknownScript_0xbc189: ; 0xbc189
loadfont
- 3writetext $6c, $44be
+ 3writetext UnknownText_0x1b04be
closetext
loadmovesprites
end
; 0xbc191
UnknownScript_0xbc191: ; 0xbc191
- 3jumptext $6c, $44c9
+ 3jumptext UnknownText_0x1b04c9
; 0xbc195
UnknownScript_0xbc195: ; 0xbc195
@@ -250,7 +250,7 @@ UnknownScript_0xbc19d: ; 0xbc19d
; 0xbc1a5
UnknownScript_0xbc1a5: ; 0xbc1a5
- 3jumptext $6c, $4526
+ 3jumptext UnknownText_0x1b0526
; 0xbc1a9
UnknownScript_0xbc1a9: ; 0xbc1a9
@@ -268,19 +268,19 @@ UnknownScript_0xbc1af: ; 0xbc1af
; 0xbc1b8
UnknownScript_0xbc1b8: ; 0xbc1b8
- 3jump BANK(UnknownScript_0xcd4b), UnknownScript_0xcd4b
+ 3jump UnknownScript_0xcd4b
; 0xbc1bc
UnknownScript_0xbc1bc: ; 0xbc1bc
- 3jump BANK(UnknownScript_0xcf5d), UnknownScript_0xcf5d
+ 3jump UnknownScript_0xcf5d
; 0xbc1c0
UnknownScript_0xbc1c0: ; 0xbc1c0
- 3jumptext $6c, $457f
+ 3jumptext UnknownText_0x1b057f
; 0xbc1c4
UnknownScript_0xbc1c4: ; 0xbc1c4
- 3jumptext $6c, $459c
+ 3jumptext UnknownText_0x1b059c
; 0xbc1c8
UnknownScript_0xbc1c8: ; 0xbc1c8
@@ -387,35 +387,35 @@ UnknownScript_0xbc274: ; bc274
clearevent $0315
clearevent $0316
loadfont
- 3writetext $6c, $45bf
+ 3writetext UnknownText_0x1b05bf
closetext
special $0014
RAM2MEM $0
if_equal $1, UnknownScript_0xbc31e
if_equal $2, UnknownScript_0xbc332
if_equal $3, UnknownScript_0xbc343
- 3writetext $6c, $4681
+ 3writetext UnknownText_0x1b0681
keeptextopen
waitbutton
verbosegiveitem BERRY, 1
iffalse UnknownScript_0xbc375
- 3writetext $6c, $46b7
+ 3writetext UnknownText_0x1b06b7
keeptextopen
2jump $42b6
; 0xbc2b1
UnknownScript_0xbc2b1: ; 0xbc2b1
- 3writetext $6c, $465b
+ 3writetext UnknownText_0x1b065b
keeptextopen
checkevent $0308
iffalse $42c4
- 3writetext $6c, $46d9
+ 3writetext UnknownText_0x1b06d9
closetext
special $0017
special $0015
if_equal $0, $42d4
if_equal $2, $42d4
- 3writetext $6c, $470d
+ 3writetext UnknownText_0x1b070d
closetext
loadmovesprites
dotrigger $0
@@ -448,7 +448,7 @@ UnknownScript_0xbc2b1: ; 0xbc2b1
UnknownScript_0xbc31e: ; 0xbc31e
setevent $0000
itemtotext SUN_STONE, $1
- 3writetext $6c, $4621
+ 3writetext UnknownText_0x1b0621
closetext
verbosegiveitem SUN_STONE, 1
iffalse UnknownScript_0xbc354
@@ -457,7 +457,7 @@ UnknownScript_0xbc31e: ; 0xbc31e
UnknownScript_0xbc332: ; 0xbc332
itemtotext EVERSTONE, $1
- 3writetext $6c, $4621
+ 3writetext UnknownText_0x1b0621
closetext
verbosegiveitem EVERSTONE, 1
iffalse UnknownScript_0xbc35f
@@ -466,7 +466,7 @@ UnknownScript_0xbc332: ; 0xbc332
UnknownScript_0xbc343: ; 0xbc343
itemtotext GOLD_BERRY, $1
- 3writetext $6c, $4621
+ 3writetext UnknownText_0x1b0621
closetext
verbosegiveitem GOLD_BERRY, 1
iffalse UnknownScript_0xbc36a
@@ -474,28 +474,28 @@ UnknownScript_0xbc343: ; 0xbc343
; 0xbc354
UnknownScript_0xbc354: ; 0xbc354
- 3writetext $6c, $48cc
+ 3writetext UnknownText_0x1b08cc
keeptextopen
setevent $0313
2jump UnknownScript_0xbc2b1
; 0xbc35f
UnknownScript_0xbc35f: ; 0xbc35f
- 3writetext $6c, $48cc
+ 3writetext UnknownText_0x1b08cc
keeptextopen
setevent $0314
2jump UnknownScript_0xbc2b1
; 0xbc36a
UnknownScript_0xbc36a: ; 0xbc36a
- 3writetext $6c, $48cc
+ 3writetext UnknownText_0x1b08cc
keeptextopen
setevent $0315
2jump UnknownScript_0xbc2b1
; 0xbc375
UnknownScript_0xbc375: ; 0xbc375
- 3writetext $6c, $48cc
+ 3writetext UnknownText_0x1b08cc
keeptextopen
setevent $0316
2jump $42a9
@@ -710,102 +710,102 @@ UnknownScript_0xbc574: ; 0xbc574
if_equal $23, UnknownScript_0xbc628
UnknownScript_0xbc5c9: ; bc5c9
- 3writetext $6c, $49fe
+ 3writetext UnknownText_0x1b09fe
end
; 0xbc5ce
UnknownScript_0xbc5ce: ; 0xbc5ce
- 3writetext $6c, $4d9f
+ 3writetext UnknownText_0x1b0d9f
end
; 0xbc5d3
UnknownScript_0xbc5d3: ; 0xbc5d3
- 3writetext $6c, $502e
+ 3writetext UnknownText_0x1b102e
end
; 0xbc5d8
UnknownScript_0xbc5d8: ; 0xbc5d8
- 3writetext $6c, $542d
+ 3writetext UnknownText_0x1b142d
end
; 0xbc5dd
UnknownScript_0xbc5dd: ; 0xbc5dd
- 3writetext $6c, $5800
+ 3writetext UnknownText_0x1b1800
end
; 0xbc5e2
UnknownScript_0xbc5e2: ; 0xbc5e2
- 3writetext $6c, $5a71
+ 3writetext UnknownText_0x1b1a71
end
; 0xbc5e7
UnknownScript_0xbc5e7: ; 0xbc5e7
- 3writetext $6c, $5cd5
+ 3writetext UnknownText_0x1b1cd5
end
; 0xbc5ec
UnknownScript_0xbc5ec: ; 0xbc5ec
- 3writetext $29, $4000
+ 3writetext UnknownText_0xa4000
end
; 0xbc5f1
UnknownScript_0xbc5f1: ; 0xbc5f1
- 3writetext $29, $41c0
+ 3writetext UnknownText_0xa41c0
end
; 0xbc5f6
UnknownScript_0xbc5f6: ; 0xbc5f6
- 3writetext $29, $4642
+ 3writetext UnknownText_0xa4642
end
; 0xbc5fb
UnknownScript_0xbc5fb: ; 0xbc5fb
- 3writetext $29, $4829
+ 3writetext UnknownText_0xa4829
end
; 0xbc600
UnknownScript_0xbc600: ; 0xbc600
- 3writetext $29, $4a31
+ 3writetext UnknownText_0xa4a31
end
; 0xbc605
UnknownScript_0xbc605: ; 0xbc605
- 3writetext $29, $4ed4
+ 3writetext UnknownText_0xa4ed4
end
; 0xbc60a
UnknownScript_0xbc60a: ; 0xbc60a
- 3writetext $29, $50d5
+ 3writetext UnknownText_0xa50d5
end
; 0xbc60f
UnknownScript_0xbc60f: ; 0xbc60f
- 3writetext $29, $52e2
+ 3writetext UnknownText_0xa52e2
end
; 0xbc614
UnknownScript_0xbc614: ; 0xbc614
- 3writetext $29, $5545
+ 3writetext UnknownText_0xa5545
end
; 0xbc619
UnknownScript_0xbc619: ; 0xbc619
- 3writetext $29, $5937
+ 3writetext UnknownText_0xa5937
end
; 0xbc61e
UnknownScript_0xbc61e: ; 0xbc61e
- 3writetext $29, $5bc4
+ 3writetext UnknownText_0xa5bc4
end
; 0xbc623
UnknownScript_0xbc623: ; 0xbc623
- 3writetext $29, $5dc6
+ 3writetext UnknownText_0xa5dc6
end
; 0xbc628
UnknownScript_0xbc628: ; 0xbc628
- 3writetext $29, $600c
+ 3writetext UnknownText_0xa600c
end
; 0xbc62d
@@ -834,107 +834,107 @@ UnknownScript_0xbc62d: ; 0xbc62d
if_equal $23, UnknownScript_0xbc6e1
UnknownScript_0xbc682: ; bc682
- 3writetext $6c, $4a82
+ 3writetext UnknownText_0x1b0a82
end
; 0xbc687
UnknownScript_0xbc687: ; 0xbc687
- 3writetext $6c, $4e2c
+ 3writetext UnknownText_0x1b0e2c
end
; 0xbc68c
UnknownScript_0xbc68c: ; 0xbc68c
- 3writetext $6c, $50d3
+ 3writetext UnknownText_0x1b10d3
end
; 0xbc691
UnknownScript_0xbc691: ; 0xbc691
- 3writetext $6c, $54e4
+ 3writetext UnknownText_0x1b14e4
end
; 0xbc696
UnknownScript_0xbc696: ; 0xbc696
- 3writetext $6c, $587b
+ 3writetext UnknownText_0x1b187b
end
; 0xbc69b
UnknownScript_0xbc69b: ; 0xbc69b
- 3writetext $6c, $5b1d
+ 3writetext UnknownText_0x1b1b1d
end
; 0xbc6a0
UnknownScript_0xbc6a0: ; 0xbc6a0
- 3writetext $6c, $5d85
+ 3writetext UnknownText_0x1b1d85
end
; 0xbc6a5
UnknownScript_0xbc6a5: ; 0xbc6a5
- 3writetext $29, $40a9
+ 3writetext UnknownText_0xa40a9
end
; 0xbc6aa
UnknownScript_0xbc6aa: ; 0xbc6aa
- 3writetext $29, $426a
+ 3writetext UnknownText_0xa426a
end
; 0xbc6af
UnknownScript_0xbc6af: ; 0xbc6af
- 3writetext $29, $470b
+ 3writetext UnknownText_0xa470b
end
; 0xbc6b4
UnknownScript_0xbc6b4: ; 0xbc6b4
- 3writetext $29, $48fc
+ 3writetext UnknownText_0xa48fc
end
; 0xbc6b9
UnknownScript_0xbc6b9: ; 0xbc6b9
- 3writetext $29, $4b03
+ 3writetext UnknownText_0xa4b03
end
; 0xbc6be
UnknownScript_0xbc6be: ; 0xbc6be
- 3writetext $29, $4fc8
+ 3writetext UnknownText_0xa4fc8
end
; 0xbc6c3
UnknownScript_0xbc6c3: ; 0xbc6c3
- 3writetext $29, $5175
+ 3writetext UnknownText_0xa5175
end
; 0xbc6c8
UnknownScript_0xbc6c8: ; 0xbc6c8
- 3writetext $29, $5383
+ 3writetext UnknownText_0xa5383
end
; 0xbc6cd
UnknownScript_0xbc6cd: ; 0xbc6cd
- 3writetext $29, $5621
+ 3writetext UnknownText_0xa5621
end
; 0xbc6d2
UnknownScript_0xbc6d2: ; 0xbc6d2
- 3writetext $29, $59bc
+ 3writetext UnknownText_0xa59bc
end
; 0xbc6d7
UnknownScript_0xbc6d7: ; 0xbc6d7
- 3writetext $29, $5c4b
+ 3writetext UnknownText_0xa5c4b
end
; 0xbc6dc
UnknownScript_0xbc6dc: ; 0xbc6dc
- 3writetext $29, $5e63
+ 3writetext UnknownText_0xa5e63
end
; 0xbc6e1
UnknownScript_0xbc6e1: ; 0xbc6e1
- 3writetext $29, $6076
+ 3writetext UnknownText_0xa6076
end
; 0xbc6e6
UnknownScript_0xbc6e6: ; 0xbc6e6
- 3writetext $6c, $49c4
+ 3writetext UnknownText_0x1b09c4
playsound $0093
waitbutton
keeptextopen
@@ -963,140 +963,140 @@ UnknownScript_0xbc6f0: ; 0xbc6f0
if_equal $21, UnknownScript_0xbc7b9
if_equal $22, UnknownScript_0xbc7c0
if_equal $23, UnknownScript_0xbc7c7
- 3writetext $6c, $4adb
+ 3writetext UnknownText_0x1b0adb
closetext
loadmovesprites
end
; 0xbc749
UnknownScript_0xbc749: ; 0xbc749
- 3writetext $6c, $4e89
+ 3writetext UnknownText_0x1b0e89
closetext
loadmovesprites
end
; 0xbc750
UnknownScript_0xbc750: ; 0xbc750
- 3writetext $6c, $5136
+ 3writetext UnknownText_0x1b1136
closetext
loadmovesprites
end
; 0xbc757
UnknownScript_0xbc757: ; 0xbc757
- 3writetext $6c, $5553
+ 3writetext UnknownText_0x1b1553
closetext
loadmovesprites
end
; 0xbc75e
UnknownScript_0xbc75e: ; 0xbc75e
- 3writetext $6c, $58d7
+ 3writetext UnknownText_0x1b18d7
closetext
loadmovesprites
end
; 0xbc765
UnknownScript_0xbc765: ; 0xbc765
- 3writetext $6c, $5b8e
+ 3writetext UnknownText_0x1b1b8e
closetext
loadmovesprites
end
; 0xbc76c
UnknownScript_0xbc76c: ; 0xbc76c
- 3writetext $6c, $5db9
+ 3writetext UnknownText_0x1b1db9
closetext
loadmovesprites
end
; 0xbc773
UnknownScript_0xbc773: ; 0xbc773
- 3writetext $29, $40f8
+ 3writetext UnknownText_0xa40f8
closetext
loadmovesprites
end
; 0xbc77a
UnknownScript_0xbc77a: ; 0xbc77a
- 3writetext $29, $42ab
+ 3writetext UnknownText_0xa42ab
closetext
loadmovesprites
end
; 0xbc781
UnknownScript_0xbc781: ; 0xbc781
- 3writetext $29, $4730
+ 3writetext UnknownText_0xa4730
closetext
loadmovesprites
end
; 0xbc788
UnknownScript_0xbc788: ; 0xbc788
- 3writetext $29, $494d
+ 3writetext UnknownText_0xa494d
closetext
loadmovesprites
end
; 0xbc78f
UnknownScript_0xbc78f: ; 0xbc78f
- 3writetext $29, $4b47
+ 3writetext UnknownText_0xa4b47
closetext
loadmovesprites
end
; 0xbc796
UnknownScript_0xbc796: ; 0xbc796
- 3writetext $29, $502e
+ 3writetext UnknownText_0xa502e
closetext
loadmovesprites
end
; 0xbc79d
UnknownScript_0xbc79d: ; 0xbc79d
- 3writetext $29, $51ac
+ 3writetext UnknownText_0xa51ac
closetext
loadmovesprites
end
; 0xbc7a4
UnknownScript_0xbc7a4: ; 0xbc7a4
- 3writetext $29, $53de
+ 3writetext UnknownText_0xa53de
closetext
loadmovesprites
end
; 0xbc7ab
UnknownScript_0xbc7ab: ; 0xbc7ab
- 3writetext $29, $5666
+ 3writetext UnknownText_0xa5666
closetext
loadmovesprites
end
; 0xbc7b2
UnknownScript_0xbc7b2: ; 0xbc7b2
- 3writetext $29, $5a28
+ 3writetext UnknownText_0xa5a28
closetext
loadmovesprites
end
; 0xbc7b9
UnknownScript_0xbc7b9: ; 0xbc7b9
- 3writetext $29, $5c8e
+ 3writetext UnknownText_0xa5c8e
closetext
loadmovesprites
end
; 0xbc7c0
UnknownScript_0xbc7c0: ; 0xbc7c0
- 3writetext $29, $5ea8
+ 3writetext UnknownText_0xa5ea8
closetext
loadmovesprites
end
; 0xbc7c7
UnknownScript_0xbc7c7: ; 0xbc7c7
- 3writetext $29, $60b5
+ 3writetext UnknownText_0xa60b5
closetext
loadmovesprites
end
@@ -1124,140 +1124,140 @@ UnknownScript_0xbc7ce: ; 0xbc7ce
if_equal $21, UnknownScript_0xbc897
if_equal $22, UnknownScript_0xbc89e
if_equal $23, UnknownScript_0xbc8a5
- 3writetext $6c, $4afd
+ 3writetext UnknownText_0x1b0afd
closetext
loadmovesprites
end
; 0xbc827
UnknownScript_0xbc827: ; 0xbc827
- 3writetext $6c, $4ea2
+ 3writetext UnknownText_0x1b0ea2
closetext
loadmovesprites
end
; 0xbc82e
UnknownScript_0xbc82e: ; 0xbc82e
- 3writetext $6c, $517b
+ 3writetext UnknownText_0x1b117b
closetext
loadmovesprites
end
; 0xbc835
UnknownScript_0xbc835: ; 0xbc835
- 3writetext $6c, $5584
+ 3writetext UnknownText_0x1b1584
closetext
loadmovesprites
end
; 0xbc83c
UnknownScript_0xbc83c: ; 0xbc83c
- 3writetext $6c, $5908
+ 3writetext UnknownText_0x1b1908
closetext
loadmovesprites
end
; 0xbc843
UnknownScript_0xbc843: ; 0xbc843
- 3writetext $6c, $5bd2
+ 3writetext UnknownText_0x1b1bd2
closetext
loadmovesprites
end
; 0xbc84a
UnknownScript_0xbc84a: ; 0xbc84a
- 3writetext $6c, $5df4
+ 3writetext UnknownText_0x1b1df4
closetext
loadmovesprites
end
; 0xbc851
UnknownScript_0xbc851: ; 0xbc851
- 3writetext $29, $4126
+ 3writetext UnknownText_0xa4126
closetext
loadmovesprites
end
; 0xbc858
UnknownScript_0xbc858: ; 0xbc858
- 3writetext $29, $42f2
+ 3writetext UnknownText_0xa42f2
closetext
loadmovesprites
end
; 0xbc85f
UnknownScript_0xbc85f: ; 0xbc85f
- 3writetext $29, $4794
+ 3writetext UnknownText_0xa4794
closetext
loadmovesprites
end
; 0xbc866
UnknownScript_0xbc866: ; 0xbc866
- 3writetext $29, $498a
+ 3writetext UnknownText_0xa498a
closetext
loadmovesprites
end
; 0xbc86d
UnknownScript_0xbc86d: ; 0xbc86d
- 3writetext $29, $4b87
+ 3writetext UnknownText_0xa4b87
closetext
loadmovesprites
end
; 0xbc874
UnknownScript_0xbc874: ; 0xbc874
- 3writetext $29, $505f
+ 3writetext UnknownText_0xa505f
closetext
loadmovesprites
end
; 0xbc87b
UnknownScript_0xbc87b: ; 0xbc87b
- 3writetext $29, $51ee
+ 3writetext UnknownText_0xa51ee
closetext
loadmovesprites
end
; 0xbc882
UnknownScript_0xbc882: ; 0xbc882
- 3writetext $29, $5412
+ 3writetext UnknownText_0xa5412
closetext
loadmovesprites
end
; 0xbc889
UnknownScript_0xbc889: ; 0xbc889
- 3writetext $29, $56b6
+ 3writetext UnknownText_0xa56b6
closetext
loadmovesprites
end
; 0xbc890
UnknownScript_0xbc890: ; 0xbc890
- 3writetext $29, $5a5a
+ 3writetext UnknownText_0xa5a5a
closetext
loadmovesprites
end
; 0xbc897
UnknownScript_0xbc897: ; 0xbc897
- 3writetext $29, $5cc5
+ 3writetext UnknownText_0xa5cc5
closetext
loadmovesprites
end
; 0xbc89e
UnknownScript_0xbc89e: ; 0xbc89e
- 3writetext $29, $5ed6
+ 3writetext UnknownText_0xa5ed6
closetext
loadmovesprites
end
; 0xbc8a5
UnknownScript_0xbc8a5: ; 0xbc8a5
- 3writetext $29, $60e2
+ 3writetext UnknownText_0xa60e2
closetext
loadmovesprites
end
@@ -1285,140 +1285,140 @@ UnknownScript_0xbc8ac: ; 0xbc8ac
if_equal $21, UnknownScript_0xbc975
if_equal $22, UnknownScript_0xbc97c
if_equal $23, UnknownScript_0xbc983
- 3writetext $6c, $4b42
+ 3writetext UnknownText_0x1b0b42
closetext
loadmovesprites
end
; 0xbc905
UnknownScript_0xbc905: ; 0xbc905
- 3writetext $6c, $4ebc
+ 3writetext UnknownText_0x1b0ebc
closetext
loadmovesprites
end
; 0xbc90c
UnknownScript_0xbc90c: ; 0xbc90c
- 3writetext $6c, $51c4
+ 3writetext UnknownText_0x1b11c4
closetext
loadmovesprites
end
; 0xbc913
UnknownScript_0xbc913: ; 0xbc913
- 3writetext $6c, $55b6
+ 3writetext UnknownText_0x1b15b6
closetext
loadmovesprites
end
; 0xbc91a
UnknownScript_0xbc91a: ; 0xbc91a
- 3writetext $6c, $5936
+ 3writetext UnknownText_0x1b1936
closetext
loadmovesprites
end
; 0xbc921
UnknownScript_0xbc921: ; 0xbc921
- 3writetext $6c, $5c06
+ 3writetext UnknownText_0x1b1c06
closetext
loadmovesprites
end
; 0xbc928
UnknownScript_0xbc928: ; 0xbc928
- 3writetext $6c, $5e50
+ 3writetext UnknownText_0x1b1e50
closetext
loadmovesprites
end
; 0xbc92f
UnknownScript_0xbc92f: ; 0xbc92f
- 3writetext $29, $4158
+ 3writetext UnknownText_0xa4158
closetext
loadmovesprites
end
; 0xbc936
UnknownScript_0xbc936: ; 0xbc936
- 3writetext $29, $434a
+ 3writetext UnknownText_0xa434a
closetext
loadmovesprites
end
; 0xbc93d
UnknownScript_0xbc93d: ; 0xbc93d
- 3writetext $29, $47eb
+ 3writetext UnknownText_0xa47eb
closetext
loadmovesprites
end
; 0xbc944
UnknownScript_0xbc944: ; 0xbc944
- 3writetext $29, $49bd
+ 3writetext UnknownText_0xa49bd
closetext
loadmovesprites
end
; 0xbc94b
UnknownScript_0xbc94b: ; 0xbc94b
- 3writetext $29, $4bcd
+ 3writetext UnknownText_0xa4bcd
closetext
loadmovesprites
end
; 0xbc952
UnknownScript_0xbc952: ; 0xbc952
- 3writetext $29, $508c
+ 3writetext UnknownText_0xa508c
closetext
loadmovesprites
end
; 0xbc959
UnknownScript_0xbc959: ; 0xbc959
- 3writetext $29, $5216
+ 3writetext UnknownText_0xa5216
closetext
loadmovesprites
end
; 0xbc960
UnknownScript_0xbc960: ; 0xbc960
- 3writetext $29, $5446
+ 3writetext UnknownText_0xa5446
closetext
loadmovesprites
end
; 0xbc967
UnknownScript_0xbc967: ; 0xbc967
- 3writetext $29, $56e2
+ 3writetext UnknownText_0xa56e2
closetext
loadmovesprites
end
; 0xbc96e
UnknownScript_0xbc96e: ; 0xbc96e
- 3writetext $29, $5aa6
+ 3writetext UnknownText_0xa5aa6
closetext
loadmovesprites
end
; 0xbc975
UnknownScript_0xbc975: ; 0xbc975
- 3writetext $29, $5cfa
+ 3writetext UnknownText_0xa5cfa
closetext
loadmovesprites
end
; 0xbc97c
UnknownScript_0xbc97c: ; 0xbc97c
- 3writetext $29, $5f06
+ 3writetext UnknownText_0xa5f06
closetext
loadmovesprites
end
; 0xbc983
UnknownScript_0xbc983: ; 0xbc983
- 3writetext $29, $6144
+ 3writetext UnknownText_0xa6144
closetext
loadmovesprites
end
@@ -1443,119 +1443,119 @@ UnknownScript_0xbc98a: ; 0xbc98a
if_equal $20, UnknownScript_0xbca32
if_equal $21, UnknownScript_0xbca39
if_equal $23, UnknownScript_0xbca40
- 3writetext $6c, $4b75
+ 3writetext UnknownText_0x1b0b75
closetext
loadmovesprites
end
; 0xbc9d7
UnknownScript_0xbc9d7: ; 0xbc9d7
- 3writetext $6c, $4edc
+ 3writetext UnknownText_0x1b0edc
closetext
loadmovesprites
end
; 0xbc9de
UnknownScript_0xbc9de: ; 0xbc9de
- 3writetext $6c, $51fe
+ 3writetext UnknownText_0x1b11fe
closetext
loadmovesprites
end
; 0xbc9e5
UnknownScript_0xbc9e5: ; 0xbc9e5
- 3writetext $6c, $55d5
+ 3writetext UnknownText_0x1b15d5
closetext
loadmovesprites
end
; 0xbc9ec
UnknownScript_0xbc9ec: ; 0xbc9ec
- 3writetext $6c, $5954
+ 3writetext UnknownText_0x1b1954
closetext
loadmovesprites
end
; 0xbc9f3
UnknownScript_0xbc9f3: ; 0xbc9f3
- 3writetext $6c, $5c32
+ 3writetext UnknownText_0x1b1c32
closetext
loadmovesprites
end
; 0xbc9fa
UnknownScript_0xbc9fa: ; 0xbc9fa
- 3writetext $6c, $5e98
+ 3writetext UnknownText_0x1b1e98
closetext
loadmovesprites
end
; 0xbca01
UnknownScript_0xbca01: ; 0xbca01
- 3writetext $29, $418d
+ 3writetext UnknownText_0xa418d
closetext
loadmovesprites
end
; 0xbca08
UnknownScript_0xbca08: ; 0xbca08
- 3writetext $29, $4382
+ 3writetext UnknownText_0xa4382
closetext
loadmovesprites
end
; 0xbca0f
UnknownScript_0xbca0f: ; 0xbca0f
- 3writetext $29, $49fc
+ 3writetext UnknownText_0xa49fc
closetext
loadmovesprites
end
; 0xbca16
UnknownScript_0xbca16: ; 0xbca16
- 3writetext $29, $4bec
+ 3writetext UnknownText_0xa4bec
closetext
loadmovesprites
end
; 0xbca1d
UnknownScript_0xbca1d: ; 0xbca1d
- 3writetext $29, $50b1
+ 3writetext UnknownText_0xa50b1
closetext
loadmovesprites
end
; 0xbca24
UnknownScript_0xbca24: ; 0xbca24
- 3writetext $29, $548c
+ 3writetext UnknownText_0xa548c
closetext
loadmovesprites
end
; 0xbca2b
UnknownScript_0xbca2b: ; 0xbca2b
- 3writetext $29, $571e
+ 3writetext UnknownText_0xa571e
closetext
loadmovesprites
end
; 0xbca32
UnknownScript_0xbca32: ; 0xbca32
- 3writetext $29, $5ada
+ 3writetext UnknownText_0xa5ada
closetext
loadmovesprites
end
; 0xbca39
UnknownScript_0xbca39: ; 0xbca39
- 3writetext $29, $5d1d
+ 3writetext UnknownText_0xa5d1d
closetext
loadmovesprites
end
; 0xbca40
UnknownScript_0xbca40: ; 0xbca40
- 3writetext $29, $6175
+ 3writetext UnknownText_0xa6175
closetext
loadmovesprites
end
@@ -1570,43 +1570,43 @@ UnknownScript_0xbca47: ; 0xbca47
if_equal $1d, UnknownScript_0xbca7d
if_equal $21, UnknownScript_0xbca83
if_equal $22, UnknownScript_0xbca89
- 3writetext $6c, $5607
+ 3writetext UnknownText_0x1b1607
keeptextopen
end
; 0xbca6b
UnknownScript_0xbca6b: ; 0xbca6b
- 3writetext $6c, $5c57
+ 3writetext UnknownText_0x1b1c57
keeptextopen
end
; 0xbca71
UnknownScript_0xbca71: ; 0xbca71
- 3writetext $29, $4c24
+ 3writetext UnknownText_0xa4c24
keeptextopen
end
; 0xbca77
UnknownScript_0xbca77: ; 0xbca77
- 3writetext $29, $523a
+ 3writetext UnknownText_0xa523a
keeptextopen
end
; 0xbca7d
UnknownScript_0xbca7d: ; 0xbca7d
- 3writetext $29, $54e3
+ 3writetext UnknownText_0xa54e3
keeptextopen
end
; 0xbca83
UnknownScript_0xbca83: ; 0xbca83
- 3writetext $29, $5d4d
+ 3writetext UnknownText_0xa5d4d
keeptextopen
end
; 0xbca89
UnknownScript_0xbca89: ; 0xbca89
- 3writetext $29, $5f37
+ 3writetext UnknownText_0xa5f37
keeptextopen
end
; 0xbca8f
@@ -1624,77 +1624,77 @@ UnknownScript_0xbca8f: ; 0xbca8f
if_equal $21, UnknownScript_0xbcaf5
if_equal $22, UnknownScript_0xbcafc
if_equal $23, UnknownScript_0xbcb03
- 3writetext $6c, $4eff
+ 3writetext UnknownText_0x1b0eff
closetext
loadmovesprites
end
; 0xbcac4
UnknownScript_0xbcac4: ; 0xbcac4
- 3writetext $6c, $564d
+ 3writetext UnknownText_0x1b164d
closetext
loadmovesprites
end
; 0xbcacb
UnknownScript_0xbcacb: ; 0xbcacb
- 3writetext $6c, $5978
+ 3writetext UnknownText_0x1b1978
closetext
loadmovesprites
end
; 0xbcad2
UnknownScript_0xbcad2: ; 0xbcad2
- 3writetext $6c, $5c91
+ 3writetext UnknownText_0x1b1c91
closetext
loadmovesprites
end
; 0xbcad9
UnknownScript_0xbcad9: ; 0xbcad9
- 3writetext $29, $4c47
+ 3writetext UnknownText_0xa4c47
closetext
loadmovesprites
end
; 0xbcae0
UnknownScript_0xbcae0: ; 0xbcae0
- 3writetext $29, $52a0
+ 3writetext UnknownText_0xa52a0
closetext
loadmovesprites
end
; 0xbcae7
UnknownScript_0xbcae7: ; 0xbcae7
- 3writetext $29, $5513
+ 3writetext UnknownText_0xa5513
closetext
loadmovesprites
end
; 0xbcaee
UnknownScript_0xbcaee: ; 0xbcaee
- 3writetext $29, $5aff
+ 3writetext UnknownText_0xa5aff
closetext
loadmovesprites
end
; 0xbcaf5
UnknownScript_0xbcaf5: ; 0xbcaf5
- 3writetext $29, $5d9a
+ 3writetext UnknownText_0xa5d9a
closetext
loadmovesprites
end
; 0xbcafc
UnknownScript_0xbcafc: ; 0xbcafc
- 3writetext $29, $5faa
+ 3writetext UnknownText_0xa5faa
closetext
loadmovesprites
end
; 0xbcb03
UnknownScript_0xbcb03: ; 0xbcb03
- 3writetext $29, $61c9
+ 3writetext UnknownText_0xa61c9
closetext
loadmovesprites
end
@@ -1707,25 +1707,25 @@ UnknownScript_0xbcb0a: ; 0xbcb0a
if_equal $f, UnknownScript_0xbcb23
if_equal $20, UnknownScript_0xbcb29
if_equal $23, UnknownScript_0xbcb2f
- 3writetext $6c, $4f2f
+ 3writetext UnknownText_0x1b0f2f
keeptextopen
end
; 0xbcb23
UnknownScript_0xbcb23: ; 0xbcb23
- 3writetext $6c, $59be
+ 3writetext UnknownText_0x1b19be
keeptextopen
end
; 0xbcb29
UnknownScript_0xbcb29: ; 0xbcb29
- 3writetext $29, $5b3f
+ 3writetext UnknownText_0xa5b3f
keeptextopen
end
; 0xbcb2f
UnknownScript_0xbcb2f: ; 0xbcb2f
- 3writetext $29, $6200
+ 3writetext UnknownText_0xa6200
keeptextopen
end
; 0xbcb35
@@ -1740,42 +1740,42 @@ UnknownScript_0xbcb35: ; 0xbcb35
if_equal $1a, UnknownScript_0xbcb70
if_equal $1f, UnknownScript_0xbcb75
if_equal $24, UnknownScript_0xbcb7a
- 3writetext $6c, $4bb6
+ 3writetext UnknownText_0x1b0bb6
end
; 0xbcb5c
UnknownScript_0xbcb5c: ; 0xbcb5c
- 3writetext $6c, $5239
+ 3writetext UnknownText_0x1b1239
end
; 0xbcb61
UnknownScript_0xbcb61: ; 0xbcb61
- 3writetext $6c, $5690
+ 3writetext UnknownText_0x1b1690
end
; 0xbcb66
UnknownScript_0xbcb66: ; 0xbcb66
- 3writetext $6c, $5ebe
+ 3writetext UnknownText_0x1b1ebe
end
; 0xbcb6b
UnknownScript_0xbcb6b: ; 0xbcb6b
- 3writetext $29, $4405
+ 3writetext UnknownText_0xa4405
end
; 0xbcb70
UnknownScript_0xbcb70: ; 0xbcb70
- 3writetext $29, $4c8c
+ 3writetext UnknownText_0xa4c8c
end
; 0xbcb75
UnknownScript_0xbcb75: ; 0xbcb75
- 3writetext $29, $574a
+ 3writetext UnknownText_0xa574a
end
; 0xbcb7a
UnknownScript_0xbcb7a: ; 0xbcb7a
- 3writetext $29, $6295
+ 3writetext UnknownText_0xa6295
end
; 0xbcb7f
@@ -1789,47 +1789,47 @@ UnknownScript_0xbcb7f: ; 0xbcb7f
if_equal $1a, UnknownScript_0xbcbba
if_equal $1f, UnknownScript_0xbcbbf
if_equal $24, UnknownScript_0xbcbc4
- 3writetext $6c, $4c37
+ 3writetext UnknownText_0x1b0c37
end
; 0xbcba6
UnknownScript_0xbcba6: ; 0xbcba6
- 3writetext $6c, $5314
+ 3writetext UnknownText_0x1b1314
end
; 0xbcbab
UnknownScript_0xbcbab: ; 0xbcbab
- 3writetext $6c, $5710
+ 3writetext UnknownText_0x1b1710
end
; 0xbcbb0
UnknownScript_0xbcbb0: ; 0xbcbb0
- 3writetext $6c, $5f4e
+ 3writetext UnknownText_0x1b1f4e
end
; 0xbcbb5
UnknownScript_0xbcbb5: ; 0xbcbb5
- 3writetext $29, $44db
+ 3writetext UnknownText_0xa44db
end
; 0xbcbba
UnknownScript_0xbcbba: ; 0xbcbba
- 3writetext $29, $4d36
+ 3writetext UnknownText_0xa4d36
end
; 0xbcbbf
UnknownScript_0xbcbbf: ; 0xbcbbf
- 3writetext $29, $57e3
+ 3writetext UnknownText_0xa57e3
end
; 0xbcbc4
UnknownScript_0xbcbc4: ; 0xbcbc4
- 3writetext $29, $6316
+ 3writetext UnknownText_0xa6316
end
; 0xbcbc9
UnknownScript_0xbcbc9: ; 0xbcbc9
- 3writetext $6c, $49e1
+ 3writetext UnknownText_0x1b09e1
playsound $0093
waitbutton
keeptextopen
@@ -1846,56 +1846,56 @@ UnknownScript_0xbcbd3: ; 0xbcbd3
if_equal $1a, UnknownScript_0xbcc18
if_equal $1f, UnknownScript_0xbcc1f
if_equal $24, UnknownScript_0xbcc26
- 3writetext $6c, $4c9b
+ 3writetext UnknownText_0x1b0c9b
closetext
loadmovesprites
end
; 0xbcbfc
UnknownScript_0xbcbfc: ; 0xbcbfc
- 3writetext $6c, $5392
+ 3writetext UnknownText_0x1b1392
closetext
loadmovesprites
end
; 0xbcc03
UnknownScript_0xbcc03: ; 0xbcc03
- 3writetext $6c, $5755
+ 3writetext UnknownText_0x1b1755
closetext
loadmovesprites
end
; 0xbcc0a
UnknownScript_0xbcc0a: ; 0xbcc0a
- 3writetext $6c, $5faa
+ 3writetext UnknownText_0x1b1faa
closetext
loadmovesprites
end
; 0xbcc11
UnknownScript_0xbcc11: ; 0xbcc11
- 3writetext $29, $451d
+ 3writetext UnknownText_0xa451d
closetext
loadmovesprites
end
; 0xbcc18
UnknownScript_0xbcc18: ; 0xbcc18
- 3writetext $29, $4d72
+ 3writetext UnknownText_0xa4d72
closetext
loadmovesprites
end
; 0xbcc1f
UnknownScript_0xbcc1f: ; 0xbcc1f
- 3writetext $29, $5820
+ 3writetext UnknownText_0xa5820
closetext
loadmovesprites
end
; 0xbcc26
UnknownScript_0xbcc26: ; 0xbcc26
- 3writetext $29, $6359
+ 3writetext UnknownText_0xa6359
closetext
loadmovesprites
end
@@ -1911,56 +1911,56 @@ UnknownScript_0xbcc2d: ; 0xbcc2d
if_equal $1a, UnknownScript_0xbcc72
if_equal $1f, UnknownScript_0xbcc79
if_equal $24, UnknownScript_0xbcc80
- 3writetext $6c, $4ce0
+ 3writetext UnknownText_0x1b0ce0
closetext
loadmovesprites
end
; 0xbcc56
UnknownScript_0xbcc56: ; 0xbcc56
- 3writetext $6c, $53af
+ 3writetext UnknownText_0x1b13af
closetext
loadmovesprites
end
; 0xbcc5d
UnknownScript_0xbcc5d: ; 0xbcc5d
- 3writetext $6c, $578a
+ 3writetext UnknownText_0x1b178a
closetext
loadmovesprites
end
; 0xbcc64
UnknownScript_0xbcc64: ; 0xbcc64
- 3writetext $6c, $5fdd
+ 3writetext UnknownText_0x1b1fdd
closetext
loadmovesprites
end
; 0xbcc6b
UnknownScript_0xbcc6b: ; 0xbcc6b
- 3writetext $29, $4542
+ 3writetext UnknownText_0xa4542
closetext
loadmovesprites
end
; 0xbcc72
UnknownScript_0xbcc72: ; 0xbcc72
- 3writetext $29, $4dcd
+ 3writetext UnknownText_0xa4dcd
closetext
loadmovesprites
end
; 0xbcc79
UnknownScript_0xbcc79: ; 0xbcc79
- 3writetext $29, $5842
+ 3writetext UnknownText_0xa5842
closetext
loadmovesprites
end
; 0xbcc80
UnknownScript_0xbcc80: ; 0xbcc80
- 3writetext $29, $638c
+ 3writetext UnknownText_0xa638c
closetext
loadmovesprites
end
@@ -1976,56 +1976,56 @@ UnknownScript_0xbcc87: ; 0xbcc87
if_equal $1a, UnknownScript_0xbcccc
if_equal $1f, UnknownScript_0xbccd3
if_equal $24, UnknownScript_0xbccda
- 3writetext $6c, $4d0b
+ 3writetext UnknownText_0x1b0d0b
closetext
loadmovesprites
end
; 0xbccb0
UnknownScript_0xbccb0: ; 0xbccb0
- 3writetext $6c, $53e4
+ 3writetext UnknownText_0x1b13e4
closetext
loadmovesprites
end
; 0xbccb7
UnknownScript_0xbccb7: ; 0xbccb7
- 3writetext $6c, $57ba
+ 3writetext UnknownText_0x1b17ba
closetext
loadmovesprites
end
; 0xbccbe
UnknownScript_0xbccbe: ; 0xbccbe
- 3writetext $6c, $5ffa
+ 3writetext UnknownText_0x1b1ffa
closetext
loadmovesprites
end
; 0xbccc5
UnknownScript_0xbccc5: ; 0xbccc5
- 3writetext $29, $4573
+ 3writetext UnknownText_0xa4573
closetext
loadmovesprites
end
; 0xbcccc
UnknownScript_0xbcccc: ; 0xbcccc
- 3writetext $29, $4e01
+ 3writetext UnknownText_0xa4e01
closetext
loadmovesprites
end
; 0xbccd3
UnknownScript_0xbccd3: ; 0xbccd3
- 3writetext $29, $5881
+ 3writetext UnknownText_0xa5881
closetext
loadmovesprites
end
; 0xbccda
UnknownScript_0xbccda: ; 0xbccda
- 3writetext $29, $63cc
+ 3writetext UnknownText_0xa63cc
closetext
loadmovesprites
end
@@ -2040,49 +2040,49 @@ UnknownScript_0xbcce1: ; 0xbcce1
if_equal $1a, UnknownScript_0xbcd1b
if_equal $1f, UnknownScript_0xbcd22
if_equal $24, UnknownScript_0xbcd29
- 3writetext $6c, $5409
+ 3writetext UnknownText_0x1b1409
closetext
loadmovesprites
end
; 0xbcd06
UnknownScript_0xbcd06: ; 0xbcd06
- 3writetext $6c, $57de
+ 3writetext UnknownText_0x1b17de
closetext
loadmovesprites
end
; 0xbcd0d
UnknownScript_0xbcd0d: ; 0xbcd0d
- 3writetext $6c, $601f
+ 3writetext UnknownText_0x1b201f
closetext
loadmovesprites
end
; 0xbcd14
UnknownScript_0xbcd14: ; 0xbcd14
- 3writetext $29, $4595
+ 3writetext UnknownText_0xa4595
closetext
loadmovesprites
end
; 0xbcd1b
UnknownScript_0xbcd1b: ; 0xbcd1b
- 3writetext $29, $4e21
+ 3writetext UnknownText_0xa4e21
closetext
loadmovesprites
end
; 0xbcd22
UnknownScript_0xbcd22: ; 0xbcd22
- 3writetext $29, $58a3
+ 3writetext UnknownText_0xa58a3
closetext
loadmovesprites
end
; 0xbcd29
UnknownScript_0xbcd29: ; 0xbcd29
- 3writetext $29, $63f1
+ 3writetext UnknownText_0xa63f1
closetext
loadmovesprites
end
@@ -2094,25 +2094,25 @@ UnknownScript_0xbcd30: ; 0xbcd30
if_equal $15, UnknownScript_0xbcd48
if_equal $1a, UnknownScript_0xbcd4e
if_equal $1f, UnknownScript_0xbcd54
- 3writetext $6c, $4d2c
+ 3writetext UnknownText_0x1b0d2c
keeptextopen
end
; 0xbcd48
UnknownScript_0xbcd48: ; 0xbcd48
- 3writetext $29, $45c9
+ 3writetext UnknownText_0xa45c9
keeptextopen
end
; 0xbcd4e
UnknownScript_0xbcd4e: ; 0xbcd4e
- 3writetext $29, $4e4c
+ 3writetext UnknownText_0xa4e4c
keeptextopen
end
; 0xbcd54
UnknownScript_0xbcd54: ; 0xbcd54
- 3writetext $29, $58d5
+ 3writetext UnknownText_0xa58d5
keeptextopen
end
; 0xbcd5a
@@ -2124,35 +2124,35 @@ UnknownScript_0xbcd5a: ; 0xbcd5a
if_equal $1a, UnknownScript_0xbcd7e
if_equal $1f, UnknownScript_0xbcd85
if_equal $24, UnknownScript_0xbcd8c
- 3writetext $6c, $4d69
+ 3writetext UnknownText_0x1b0d69
closetext
loadmovesprites
end
; 0xbcd77
UnknownScript_0xbcd77: ; 0xbcd77
- 3writetext $29, $4603
+ 3writetext UnknownText_0xa4603
closetext
loadmovesprites
end
; 0xbcd7e
UnknownScript_0xbcd7e: ; 0xbcd7e
- 3writetext $29, $4e8f
+ 3writetext UnknownText_0xa4e8f
closetext
loadmovesprites
end
; 0xbcd85
UnknownScript_0xbcd85: ; 0xbcd85
- 3writetext $29, $5914
+ 3writetext UnknownText_0xa5914
closetext
loadmovesprites
end
; 0xbcd8c
UnknownScript_0xbcd8c: ; 0xbcd8c
- 3writetext $29, $6411
+ 3writetext UnknownText_0xa6411
closetext
loadmovesprites
end
@@ -2162,7 +2162,7 @@ UnknownScript_0xbcd93: ; 0xbcd93
checkcode $17
if_equal $24, $4d99
loadfont
- 3writetext $29, $6454
+ 3writetext UnknownText_0xa6454
keeptextopen
end
; 0xbcda0
@@ -2170,7 +2170,7 @@ UnknownScript_0xbcd93: ; 0xbcd93
UnknownScript_0xbcda0: ; 0xbcda0
mapnametotext $0
loadfont
- 3writetext $6c, $474e
+ 3writetext UnknownText_0x1b074e
closetext
loadmovesprites
end
@@ -2179,9 +2179,9 @@ UnknownScript_0xbcda0: ; 0xbcda0
UnknownScript_0xbcdaa: ; 0xbcdaa
mapnametotext $0
loadfont
- 3writetext $6c, $474e
+ 3writetext UnknownText_0x1b074e
keeptextopen
- 3writetext $6c, $475c
+ 3writetext UnknownText_0x1b075c
closetext
loadmovesprites
end
@@ -2189,7 +2189,7 @@ UnknownScript_0xbcdaa: ; 0xbcdaa
UnknownScript_0xbcdb9: ; 0xbcdb9
waitbutton
- 3writetext $6c, $4648
+ 3writetext UnknownText_0x1b0648
playsound $0001
waitbutton
end
@@ -2197,7 +2197,7 @@ UnknownScript_0xbcdb9: ; 0xbcdb9
UnknownScript_0xbcdc3: ; 0xbcdc3
waitbutton
- 3writetext $6c, $4648
+ 3writetext UnknownText_0x1b0648
playsound $0096
waitbutton
end
@@ -2206,18 +2206,18 @@ UnknownScript_0xbcdc3: ; 0xbcdc3
UnknownScript_0xbcdcd: ; 0xbcdcd
faceplayer
loadfont
- 3writetext $6c, $477f
+ 3writetext UnknownText_0x1b077f
keeptextopen
checkitem COIN_CASE
iftrue UnknownScript_0xbcde0
- 3writetext $6c, $479c
+ 3writetext UnknownText_0x1b079c
closetext
loadmovesprites
end
; 0xbcde0
UnknownScript_0xbcde0: ; 0xbcde0
- 3writetext $6c, $47e3
+ 3writetext UnknownText_0x1b07e3
special $0050
loadmenudata MenuDataHeader_0xbce54
interpretmenu2
@@ -2236,7 +2236,7 @@ UnknownScript_0xbcdf7: ; 0xbcdf7
takemoney $0, 1000
waitbutton
playsound $0022
- 3writetext $6c, $4830
+ 3writetext UnknownText_0x1b0830
closetext
2jump $4de4
; 0xbce1b
@@ -2250,27 +2250,27 @@ UnknownScript_0xbce1b: ; 0xbce1b
takemoney $0, 10000
waitbutton
playsound $0022
- 3writetext $6c, $484f
+ 3writetext UnknownText_0x1b084f
closetext
2jump $4de4
; 0xbce3f
UnknownScript_0xbce3f: ; 0xbce3f
- 3writetext $6c, $486f
+ 3writetext UnknownText_0x1b086f
closetext
loadmovesprites
end
; 0xbce46
UnknownScript_0xbce46: ; 0xbce46
- 3writetext $6c, $488c
+ 3writetext UnknownText_0x1b088c
closetext
loadmovesprites
end
; 0xbce4d
UnknownScript_0xbce4d: ; 0xbce4d
- 3writetext $6c, $48ad
+ 3writetext UnknownText_0x1b08ad
closetext
loadmovesprites
end
@@ -2300,21 +2300,21 @@ UnknownScript_0xbce7f: ; 0xbce7f
special $0059
if_less_than $32, UnknownScript_0xbce9a
if_less_than $96, UnknownScript_0xbce93
- 3writetext $6c, $492a
+ 3writetext UnknownText_0x1b092a
closetext
loadmovesprites
end
; 0xbce93
UnknownScript_0xbce93: ; 0xbce93
- 3writetext $6c, $4954
+ 3writetext UnknownText_0x1b0954
closetext
loadmovesprites
end
; 0xbce9a
UnknownScript_0xbce9a: ; 0xbce9a
- 3writetext $6c, $4989
+ 3writetext UnknownText_0x1b0989
closetext
loadmovesprites
end
@@ -2328,7 +2328,7 @@ MovementData_0xbcea1: ; bcea1
; bcea5
UnusedPhoneScript: ; 0xbcea5
- 3writetext BANK(UnusedPhoneText), UnusedPhoneText
+ 3writetext UnusedPhoneText
end
MomPhoneScript: ; 0xbceaa
@@ -2345,7 +2345,7 @@ MomPhoneScript: ; 0xbceaa
.bcec5 ; 0xbcec5
checkevent $0007
iftrue MomPhoneHangUpScript
- 3writetext BANK(MomPhoneGreetingText), MomPhoneGreetingText
+ 3writetext MomPhoneGreetingText
keeptextopen
mapnametotext $0
checkcode $f
@@ -2354,7 +2354,7 @@ MomPhoneScript: ; 0xbceaa
2jump UnknownScript_0xbcf2f
UnknownScript_0xbcedf: ; 0xbcedf
- 3writetext $6d, $4021
+ 3writetext UnknownText_0x1b4021
keeptextopen
2jump UnknownScript_0xbcf37
@@ -2365,17 +2365,17 @@ UnknownScript_0xbcee7: ; 0xbcee7
if_equal GROUP_VIOLET_CITY, .violet
if_equal GROUP_AZALEA_TOWN, .azalea
if_equal GROUP_GOLDENROD_CITY, .goldenrod
- 3writetext BANK(MomPhoneGenericAreaText), MomPhoneGenericAreaText
+ 3writetext MomPhoneGenericAreaText
keeptextopen
2jump UnknownScript_0xbcf37
.newbark ; 0xbcf05
- 3writetext BANK(MomPhoneNewBarkText), MomPhoneNewBarkText
+ 3writetext MomPhoneNewBarkText
keeptextopen
2jump UnknownScript_0xbcf37
.cherrygrove ; 0xbcf0d
- 3writetext BANK(MomPhoneCherrygroveText), MomPhoneCherrygroveText
+ 3writetext MomPhoneCherrygroveText
keeptextopen
2jump UnknownScript_0xbcf37
@@ -2390,12 +2390,12 @@ UnknownScript_0xbcee7: ; 0xbcee7
2jump UnknownScript_0xbcedf
UnknownScript_0xbcf27: ; 0xbcf27
- 3writetext $6d, $411c
+ 3writetext UnknownText_0x1b411c
keeptextopen
2jump UnknownScript_0xbcf37
UnknownScript_0xbcf2f: ; 0xbcf2f
- 3writetext $6d, $4150
+ 3writetext UnknownText_0x1b4150
keeptextopen
2jump UnknownScript_0xbcf37
@@ -2413,63 +2413,63 @@ UnknownScript_0xbcf49: ; 0xbcf49
UnknownScript_0xbcf55: ; 0xbcf55
readmoney $1, $0
- 3writetext $6d, $41a7
+ 3writetext UnknownText_0x1b41a7
yesorno
iftrue MomPhoneSaveMoneyScript
2jump MomPhoneWontSaveMoneyScript
UnknownScript_0xbcf63: ; 0xbcf63
- 3writetext $6d, $41ea
+ 3writetext UnknownText_0x1b41ea
yesorno
iftrue MomPhoneSaveMoneyScript
2jump MomPhoneWontSaveMoneyScript
UnknownScript_0xbcf6e: ; 0xbcf6e
- 3writetext $6d, $420d
+ 3writetext UnknownText_0x1b420d
yesorno
iftrue MomPhoneSaveMoneyScript
2jump MomPhoneWontSaveMoneyScript
UnknownScript_0xbcf79: ; 0xbcf79
readmoney $1, $0
- 3writetext $6d, $4249
+ 3writetext UnknownText_0x1b4249
yesorno
iftrue MomPhoneSaveMoneyScript
2jump MomPhoneWontSaveMoneyScript
MomPhoneSaveMoneyScript: ; 0xbcf87
setflag $0008
- 3writetext $6d, $4289
+ 3writetext UnknownText_0x1b4289
keeptextopen
2jump MomPhoneHangUpScript
MomPhoneWontSaveMoneyScript: ; 0xbcf92
clearflag $0008
- 3writetext BANK(MomPhoneWontSaveMoneyText), MomPhoneWontSaveMoneyText
+ 3writetext MomPhoneWontSaveMoneyText
keeptextopen
2jump MomPhoneHangUpScript
MomPhoneHangUpScript: ; 0xbcf9d
- 3writetext BANK(MomPhoneHangUpText), MomPhoneHangUpText
+ 3writetext MomPhoneHangUpText
end
MomPhoneNoPokemonScript: ; 0xbcfa2
- 3writetext BANK(MomPhoneNoPokemonText), MomPhoneNoPokemonText
+ 3writetext MomPhoneNoPokemonText
end
MomPhoneNoPokedexScript: ; 0xbcfa7
- 3writetext BANK(MomPhoneNoPokedexText), MomPhoneNoPokedexText
+ 3writetext MomPhoneNoPokedexText
end
MomPhoneNoGymQuestScript: ; 0xbcfac
- 3writetext BANK(MomPhoneNoGymQuestText), MomPhoneNoGymQuestText
+ 3writetext MomPhoneNoGymQuestText
end
MomPhoneLectureScript: ; 0xbcfb1
setevent $0040
setflag $0009
specialphonecall $0000
- 3writetext BANK(MomPhoneLectureText), MomPhoneLectureText
+ 3writetext MomPhoneLectureText
yesorno
iftrue MomPhoneSaveMoneyScript
2jump MomPhoneWontSaveMoneyScript
@@ -2479,40 +2479,40 @@ BillPhoneScript1: ; 0xbcfc5
iftrue .daygreet
checktime $4
iftrue .nitegreet
- 3writetext BANK(BillPhoneMornGreetingText), BillPhoneMornGreetingText
+ 3writetext BillPhoneMornGreetingText
keeptextopen
2jump .main
.daygreet ; 0xbcfd7
- 3writetext BANK(BillPhoneDayGreetingText), BillPhoneDayGreetingText
+ 3writetext BillPhoneDayGreetingText
keeptextopen
2jump .main
.nitegreet ; 0xbcfdf
- 3writetext BANK(BillPhoneNiteGreetingText), BillPhoneNiteGreetingText
+ 3writetext BillPhoneNiteGreetingText
keeptextopen
2jump .main
.main ; 0xbcfe7
- 3writetext BANK(BillPhoneGeneriText), BillPhoneGeneriText
+ 3writetext BillPhoneGeneriText
keeptextopen
checkcode $10
RAM2MEM $0
if_equal $0, .full
if_less_than $6, .nearlyfull
- 3writetext BANK(BillPhoneNotFullText), BillPhoneNotFullText
+ 3writetext BillPhoneNotFullText
end
.nearlyfull ; 0xbcffd
- 3writetext BANK(BillPhoneNearlyFullText), BillPhoneNearlyFullText
+ 3writetext BillPhoneNearlyFullText
end
.full ; 0xbd002
- 3writetext BANK(BillPhoneFullText), BillPhoneFullText
+ 3writetext BillPhoneFullText
end
BillPhoneScript2: ; 0xbd007
- 3writetext BANK(BillPhoneNewlyFullText), BillPhoneNewlyFullText
+ 3writetext BillPhoneNewlyFullText
closetext
end
@@ -2536,46 +2536,46 @@ ElmPhoneScript1: ; 0xbd00d
iftrue .stolen
checkevent $001e
iftrue .sawmrpokemon
- 3writetext BANK(ElmPhoneStartText), ElmPhoneStartText
+ 3writetext ElmPhoneStartText
end
.sawmrpokemon ; 0xbd048
- 3writetext BANK(ElmPhoneSawMrPokemonText), ElmPhoneSawMrPokemonText
+ 3writetext ElmPhoneSawMrPokemonText
end
.stolen ; 0xbd04d
- 3writetext BANK(ElmPhonePokemonStolenText), ElmPhonePokemonStolenText
+ 3writetext ElmPhonePokemonStolenText
end
.checkingegg ; 0xbd052
- 3writetext BANK(ElmPhoneCheckingEggText), ElmPhoneCheckingEggText
+ 3writetext ElmPhoneCheckingEggText
end
.assistant ; 0xbd057
- 3writetext BANK(ElmPhoneAssistantText), ElmPhoneAssistantText
+ 3writetext ElmPhoneAssistantText
end
.eggunhatched ; 0xbd05c
- 3writetext BANK(ElmPhoneEggUnhatchedText), ElmPhoneEggUnhatchedText
+ 3writetext ElmPhoneEggUnhatchedText
end
.egghatched ; 0xbd061
- 3writetext BANK(ElmPhoneEggHatchedText), ElmPhoneEggHatchedText
+ 3writetext ElmPhoneEggHatchedText
setevent $0077
end
.discovery ; 0xbd069
random $2
if_equal $0, .nextdiscovery
- 3writetext BANK(ElmPhoneDiscovery1Text), ElmPhoneDiscovery1Text
+ 3writetext ElmPhoneDiscovery1Text
end
.nextdiscovery ; 0xbd074
- 3writetext BANK(ElmPhoneDiscovery2Text), ElmPhoneDiscovery2Text
+ 3writetext ElmPhoneDiscovery2Text
end
.pokerus ; 0xbd079
- 3writetext BANK(ElmPhonePokerusText), ElmPhonePokerusText
+ 3writetext ElmPhonePokerusText
specialphonecall $0000
end
@@ -2586,35 +2586,35 @@ ElmPhoneScript2: ; 0xbd081
if_equal $4, .rocket
if_equal $5, .gift
if_equal $8, .gift
- 3writetext BANK(ElmPhonePokerusText), ElmPhonePokerusText
+ 3writetext ElmPhonePokerusText
specialphonecall $0000
end
.disaster ; 0xbd09f
- 3writetext BANK(ElmPhoneDisasterText), ElmPhoneDisasterText
+ 3writetext ElmPhoneDisasterText
specialphonecall $0000
setevent $0043
end
.assistant ; 0xbd0aa
- 3writetext BANK(ElmPhoneEggAssistantText), ElmPhoneEggAssistantText
+ 3writetext ElmPhoneEggAssistantText
specialphonecall $0000
clearevent $0700
setevent $0701
end
.rocket ; 0xbd0b8
- 3writetext BANK(ElmPhoneRocketText), ElmPhoneRocketText
+ 3writetext ElmPhoneRocketText
specialphonecall $0000
end
.gift ; 0xbd0c0
- 3writetext BANK(ElmPhoneGiftText), ElmPhoneGiftText
+ 3writetext ElmPhoneGiftText
specialphonecall $0000
end
.unused ; 0xbd0c8
- 3writetext BANK(ElmPhoneUnusedText), ElmPhoneUnusedText
+ 3writetext ElmPhoneUnusedText
specialphonecall $0000
end
; bd0d0
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-06 05:53:57 +0000