diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/bikeshop.asm | 6 | ||||
| -rwxr-xr-x | scripts/celadongamecorner.asm | 8 | ||||
| -rwxr-xr-x | scripts/celadongym.asm | 2 | ||||
| -rwxr-xr-x | scripts/ceruleangym.asm | 2 | ||||
| -rwxr-xr-x | scripts/cinnabargym.asm | 4 | ||||
| -rwxr-xr-x | scripts/fuchsiagym.asm | 2 | ||||
| -rwxr-xr-x | scripts/pewtercity.asm | 2 | ||||
| -rwxr-xr-x | scripts/pewtergym.asm | 4 | ||||
| -rwxr-xr-x | scripts/route23.asm | 14 | ||||
| -rwxr-xr-x | scripts/saffrongym.asm | 4 | ||||
| -rwxr-xr-x | scripts/vermiliongym.asm | 4 | ||||
| -rwxr-xr-x | scripts/viridiangym.asm | 2 |
12 files changed, 28 insertions, 26 deletions
diff --git a/scripts/bikeshop.asm b/scripts/bikeshop.asm index 4d6853be..97aaed15 100755 --- a/scripts/bikeshop.asm +++ b/scripts/bikeshop.asm @@ -79,11 +79,11 @@ BikeShopText1: jp TextScriptEnd BikeShopMenuText: - db "BICYCLE" - next "CANCEL@" + db "BICYCLETTE" + next "RETOUR@" BikeShopMenuPrice: - db "¥1000000@" + db "1000000¥@" BikeShopText_1d810: TX_FAR _BikeShopText_1d810 diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index 09d2df37..89aa3b03 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -491,7 +491,7 @@ CeladonGameCornerScript_48f1e: call PlaceString coord hl, 12, 3 ld de, wPlayerMoney - ld c, $a3 + ld c, $83 call PrintBCDNumber coord hl, 12, 4 ld de, GameCornerCoinText @@ -508,13 +508,13 @@ CeladonGameCornerScript_48f1e: ret GameCornerMoneyText: - db "MONEY@" + db "ARG.@" GameCornerCoinText: - db "COIN@" + db "JETONS@" GameCornerBlankText1: - db " @" + db " ¥@" GameCornerBlankText2: db " @" diff --git a/scripts/celadongym.asm b/scripts/celadongym.asm index ae7e6846..c0a9df6f 100755 --- a/scripts/celadongym.asm +++ b/scripts/celadongym.asm @@ -17,7 +17,7 @@ CeladonGymScript_48927: jp LoadGymLeaderAndCityName Gym4CityName: - db "CELADON CITY@" + db "CELADOPOLE@" Gym4LeaderName: db "ERIKA@" diff --git a/scripts/ceruleangym.asm b/scripts/ceruleangym.asm index b82b89f6..a1e772ef 100755 --- a/scripts/ceruleangym.asm +++ b/scripts/ceruleangym.asm @@ -17,7 +17,7 @@ CeruleanGymScript_5c6d0: jp LoadGymLeaderAndCityName Gym2CityName: - db "CERULEAN CITY@" + db "AZURIA CITY@" Gym2LeaderName: db "MISTY@" diff --git a/scripts/cinnabargym.asm b/scripts/cinnabargym.asm index 8af7bbd3..f1b8d31b 100755 --- a/scripts/cinnabargym.asm +++ b/scripts/cinnabargym.asm @@ -23,9 +23,9 @@ CinnabarGymScript_75772: jp LoadGymLeaderAndCityName Gym7CityName: - db "CINNABAR ISLAND@" + db "ZINNOBERINSEL@" Gym7LeaderName: - db "BLAINE@" + db "PYRO@" CinnabarGymScript_75792: xor a diff --git a/scripts/fuchsiagym.asm b/scripts/fuchsiagym.asm index 3628ebc0..77760a02 100755 --- a/scripts/fuchsiagym.asm +++ b/scripts/fuchsiagym.asm @@ -19,7 +19,7 @@ FuchsiaGymScript_75453: ret Gym5CityName: - db "FUCHSIA CITY@" + db "FUCHSANIA CITY@" Gym5LeaderName: db "KOGA@" diff --git a/scripts/pewtercity.asm b/scripts/pewtercity.asm index 80acede8..494298b8 100755 --- a/scripts/pewtercity.asm +++ b/scripts/pewtercity.asm @@ -277,6 +277,8 @@ PewterCityText_19431: PewterCityText5: TX_ASM + ld a,$FC + ld [$CD6B],a ld hl, PewterCityText_1945d call PrintText xor a diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm index 2cfee6c0..5376ee37 100755 --- a/scripts/pewtergym.asm +++ b/scripts/pewtergym.asm @@ -17,10 +17,10 @@ PewterGymScript_5c3a4: jp LoadGymLeaderAndCityName Gym1CityName: - db "PEWTER CITY@" + db "MARMORIA CITY@" Gym1LeaderName: - db "BROCK@" + db "ROCKO@" PewterGymScript_5c3bf: xor a diff --git a/scripts/route23.asm b/scripts/route23.asm index 4eb6b5f7..1a24ecf6 100755 --- a/scripts/route23.asm +++ b/scripts/route23.asm @@ -92,25 +92,25 @@ BadgeTextPointers: dw EarthBadgeText EarthBadgeText: - db "EARTHBADGE@" + db "BADGE TERRE@" VolcanoBadgeText: - db "VOLCANOBADGE@" + db "BADGE VOLCAN@" MarshBadgeText: - db "MARSHBADGE@" + db "BADGE MARAIS@" SoulBadgeText: - db "SOULBADGE@" + db "BADGE AME@" RainbowBadgeText: - db "RAINBOWBADGE@" + db "BADGE PRISME@" ThunderBadgeText: - db "THUNDERBADGE@" + db "BADGE FOUDRE@" CascadeBadgeText: - db "CASCADEBADGE@" + db "BADGECASCADE@" Route23Script_512d8: ld a, $1 diff --git a/scripts/saffrongym.asm b/scripts/saffrongym.asm index cbf935e7..2dcaed44 100755 --- a/scripts/saffrongym.asm +++ b/scripts/saffrongym.asm @@ -17,10 +17,10 @@ SaffronGymScript: jp LoadGymLeaderAndCityName Gym6CityName: - db "SAFFRON CITY@" + db "SAFRANIA@" Gym6LeaderName: - db "SABRINA@" + db "MORGANE@" SaffronGymText_5d048: xor a diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm index c22ce9ce..f2c3f7c4 100755 --- a/scripts/vermiliongym.asm +++ b/scripts/vermiliongym.asm @@ -22,10 +22,10 @@ VermilionGymScript_5ca4c: jp LoadGymLeaderAndCityName Gym3CityName: - db "VERMILION CITY@" + db "CARMIN SUR MER@" Gym3LeaderName: - db "LT.SURGE@" + db "MAJOR BOB@" VermilionGymScript_5ca6d: CheckEvent EVENT_2ND_LOCK_OPENED diff --git a/scripts/viridiangym.asm b/scripts/viridiangym.asm index cc8dcb90..059a180d 100755 --- a/scripts/viridiangym.asm +++ b/scripts/viridiangym.asm @@ -11,7 +11,7 @@ ViridianGymScript: ret Gym8CityName: - db "VIRIDIAN CITY@" + db "VERTANIA CITY@" Gym8LeaderName: db "GIOVANNI@" |