From f71b489ad8c194a392ca79b07261816b61cb55e2 Mon Sep 17 00:00:00 2001 From: Logan Date: Mon, 30 May 2016 00:47:55 +1200 Subject: Initial decompilation of FR Red --- scripts/bikeshop.asm | 6 +++--- scripts/pewtercity.asm | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/bikeshop.asm b/scripts/bikeshop.asm index e639caf9..32351289 100755 --- a/scripts/bikeshop.asm +++ b/scripts/bikeshop.asm @@ -79,11 +79,11 @@ BikeShopText1: ; 1d745 (7:5745) jp TextScriptEnd BikeShopMenuText: ; 1d7f8 (7:57f8) - db "BICYCLE" - next "CANCEL@" + db "BICYCLETTE" + next "RETOUR@" BikeShopMenuPrice: ; 1d807 (7:5807) - db "¥1000000@" + db "1000000¥@" BikeShopText_1d810: ; 1d810 (7:5810) TX_FAR _BikeShopText_1d810 diff --git a/scripts/pewtercity.asm b/scripts/pewtercity.asm index 28fa1cc3..4dcfe790 100755 --- a/scripts/pewtercity.asm +++ b/scripts/pewtercity.asm @@ -277,6 +277,8 @@ PewterCityText_19431: ; 19431 (6:5431) PewterCityText5: ; 19436 (6:5436) TX_ASM + ld a,$FC + ld [$CD6B],a ld hl, PewterCityText_1945d call PrintText xor a -- cgit v1.2.3 From 492c0961713e18f0828bc2f88bfc8cfff2b0b8ab Mon Sep 17 00:00:00 2001 From: Logan Date: Mon, 30 May 2016 00:54:10 +1200 Subject: Merge branch 'master' of https://github.com/einstein95/pokered --- scripts/blueshouse.asm | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) (limited to 'scripts') diff --git a/scripts/blueshouse.asm b/scripts/blueshouse.asm index eadcd388..806fbcab 100755 --- a/scripts/blueshouse.asm +++ b/scripts/blueshouse.asm @@ -1,7 +1,7 @@ BluesHouseScript: ; 19b3b (6:5b3b) call EnableAutoTextBoxDrawing - ld hl,BluesHouseScriptPointers - ld a,[wBluesHouseCurScript] + ld hl, BluesHouseScriptPointers + ld a, [wBluesHouseCurScript] jp CallFunctionInTable BluesHouseScriptPointers: ; 19b47 (6:5b47) @@ -12,8 +12,8 @@ BluesHouseScript0: ; 19b4b (6:5b4b) SetEvent EVENT_ENTERED_BLUES_HOUSE ; trigger the next script - ld a,1 - ld [wBluesHouseCurScript],a + ld a, 1 + ld [wBluesHouseCurScript], a ret BluesHouseScript1: ; 19b56 (6:5b56) @@ -27,31 +27,34 @@ BluesHouseTextPointers: ; 19b57 (6:5b57) BluesHouseText1: ; 19b5d (6:5b5d) TX_ASM CheckEvent EVENT_GOT_TOWN_MAP - jr nz,.GotMap + jr nz, .GotMap CheckEvent EVENT_GOT_POKEDEX - jr nz,.GiveMap - ld hl,DaisyInitialText + jr nz, .GiveMap + ld hl, DaisyInitialText call PrintText jr .done + .GiveMap - ld hl,DaisyOfferMapText + ld hl, DaisyOfferMapText call PrintText lb bc, TOWN_MAP, 1 call GiveItem jr nc, .BagFull - ld a,HS_TOWN_MAP - ld [wMissableObjectIndex],a + ld a, HS_TOWN_MAP + ld [wMissableObjectIndex], a predef HideObject ; hide table map object - ld hl,GotMapText + ld hl, GotMapText call PrintText SetEvent EVENT_GOT_TOWN_MAP jr .done + .GotMap - ld hl,DaisyUseMapText + ld hl, DaisyUseMapText call PrintText jr .done + .BagFull - ld hl,DaisyBagFullText + ld hl, DaisyBagFullText call PrintText .done jp TextScriptEnd @@ -66,7 +69,8 @@ DaisyOfferMapText: ; 19baf (6:5baf) GotMapText: ; 19bb4 (6:5bb4) TX_FAR _GotMapText - db $11,"@" + sound0x0A + db "@" DaisyBagFullText: ; 19bba (6:5bba) TX_FAR _DaisyBagFullText -- cgit v1.2.3 From dfa7040a4b75284069a62590b747101448e7c3be Mon Sep 17 00:00:00 2001 From: Logan Date: Wed, 1 Jun 2016 19:00:41 +1200 Subject: More disasm --- scripts/celadongamecorner.asm | 6 +++--- scripts/celadongym.asm | 2 +- scripts/ceruleangym.asm | 4 ++-- scripts/pewtergym.asm | 4 ++-- scripts/route23.asm | 14 +++++++------- scripts/saffrongym.asm | 4 ++-- scripts/vermiliongym.asm | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) (limited to 'scripts') diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index 9a6dcd6d..b580a1e7 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -505,13 +505,13 @@ CeladonGameCornerScript_48f1e: ; 48f1e (12:4f1e) ret GameCornerMoneyText: ; 48f7a (12:4f7a) - db "MONEY@" + db "ARG.@" GameCornerCoinText: ; 48f80 (12:4f80) - db "COIN@" + db "JETONS@" GameCornerBlankText1: ; 48f85 (12:4f85) - db " @" + db " ¥@" GameCornerBlankText2: ; 48f8d (12:4f8d) db " @" diff --git a/scripts/celadongym.asm b/scripts/celadongym.asm index a9c017d0..f625cfad 100755 --- a/scripts/celadongym.asm +++ b/scripts/celadongym.asm @@ -17,7 +17,7 @@ CeladonGymScript_48927: ; 48927 (12:4927) jp LoadGymLeaderAndCityName Gym4CityName: ; 48930 (12:4930) - db "CELADON CITY@" + db "CELADOPOLE@" Gym4LeaderName: ; 4893d (12:493d) db "ERIKA@" diff --git a/scripts/ceruleangym.asm b/scripts/ceruleangym.asm index 4b1514b8..809e0f99 100755 --- a/scripts/ceruleangym.asm +++ b/scripts/ceruleangym.asm @@ -17,10 +17,10 @@ CeruleanGymScript_5c6d0: ; 5c6d0 (17:46d0) jp LoadGymLeaderAndCityName Gym2CityName: ; 5c6d9 (17:46d9) - db "CERULEAN CITY@" + db "AZURIA@" Gym2LeaderName: ; 5c6e7 (17:46e7) - db "MISTY@" + db "ONDINE@" CeruleanGymScript_5c6ed: ; 5c6ed (17:46ed) xor a diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm index 52e28cb8..256f818f 100755 --- a/scripts/pewtergym.asm +++ b/scripts/pewtergym.asm @@ -17,10 +17,10 @@ PewterGymScript_5c3a4: ; 5c3a4 (17:43a4) jp LoadGymLeaderAndCityName Gym1CityName: ; 5c3ad (17:43ad) - db "PEWTER CITY@" + db "ARGENTA@" Gym1LeaderName: ; 5c3b9 (17:43b9) - db "BROCK@" + db "PIERRE@" PewterGymScript_5c3bf: ; 5c3bf (17:43bf) xor a diff --git a/scripts/route23.asm b/scripts/route23.asm index ca72c9fe..9344ddb4 100755 --- a/scripts/route23.asm +++ b/scripts/route23.asm @@ -92,25 +92,25 @@ BadgeTextPointers: ; 51276 (14:5276) dw EarthBadgeText EarthBadgeText: ; 51284 (14:5284) - db "EARTHBADGE@" + db "BADGE TERRE@" VolcanoBadgeText: ; 5128f (14:528f) - db "VOLCANOBADGE@" + db "BADGE VOLCAN@" MarshBadgeText: ; 5129c (14:529c) - db "MARSHBADGE@" + db "BADGE MARAIS@" SoulBadgeText: ; 512a7 (14:52a7) - db "SOULBADGE@" + db "BADGE AME@" RainbowBadgeText: ; 512b1 (14:52b1) - db "RAINBOWBADGE@" + db "BADGE PRISME@" ThunderBadgeText: ; 512be (14:52be) - db "THUNDERBADGE@" + db "BADGE FOUDRE@" CascadeBadgeText: ; 512cb (14:52cb) - db "CASCADEBADGE@" + db "BADGECASCADE@" Route23Script_512d8: ; 512d8 (14:52d8) ld a, $1 diff --git a/scripts/saffrongym.asm b/scripts/saffrongym.asm index aae06103..ec9fbdcc 100755 --- a/scripts/saffrongym.asm +++ b/scripts/saffrongym.asm @@ -17,10 +17,10 @@ SaffronGymScript: ; 5d00d (17:500d) jp LoadGymLeaderAndCityName Gym6CityName: ; 5d033 (17:5033) - db "SAFFRON CITY@" + db "SAFRANIA@" Gym6LeaderName: ; 5d040 (17:5040) - db "SABRINA@" + db "MORGANE@" SaffronGymText_5d048: ; 5d048 (17:5048) xor a diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm index cd2b5b3c..9fedb98b 100755 --- a/scripts/vermiliongym.asm +++ b/scripts/vermiliongym.asm @@ -22,10 +22,10 @@ VermilionGymScript_5ca4c: ; 5ca4c (17:4a4c) jp LoadGymLeaderAndCityName Gym3CityName: ; 5ca55 (17:4a55) - db "VERMILION CITY@" + db "CARMIN SUR MER@" Gym3LeaderName: ; 5ca64 (17:4a64) - db "LT.SURGE@" + db "MAJOR BOB@" VermilionGymScript_5ca6d: ; 5ca6d (17:4a6d) CheckEvent EVENT_2ND_LOCK_OPENED -- cgit v1.2.3 From 67c22ca572e7976ccb6b1811602e956dbe0221ff Mon Sep 17 00:00:00 2001 From: Logan Date: Fri, 3 Jun 2016 22:40:28 +1200 Subject: More text, filled out charmap.asm --- scripts/cinnabargym.asm | 4 ++-- scripts/fuchsiagym.asm | 2 +- scripts/viridiangym.asm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts') diff --git a/scripts/cinnabargym.asm b/scripts/cinnabargym.asm index c4905d59..04e56e62 100755 --- a/scripts/cinnabargym.asm +++ b/scripts/cinnabargym.asm @@ -23,9 +23,9 @@ CinnabarGymScript_75772: ; 75772 (1d:5772) jp LoadGymLeaderAndCityName Gym7CityName: ; 7577b (1d:577b) - db "CINNABAR ISLAND@" + db "CRAMOIS'ILE@" Gym7LeaderName: ; 7578b (1d:578b) - db "BLAINE@" + db "AUGUSTE@" CinnabarGymScript_75792: ; 75792 (1d:5792) xor a diff --git a/scripts/fuchsiagym.asm b/scripts/fuchsiagym.asm index 54c3ae1a..6f932bc5 100755 --- a/scripts/fuchsiagym.asm +++ b/scripts/fuchsiagym.asm @@ -19,7 +19,7 @@ FuchsiaGymScript_75453: ; 75453 (1d:5453) ret Gym5CityName: ; 75465 (1d:5465) - db "FUCHSIA CITY@" + db "PARMANIE@" Gym5LeaderName: ; 75472 (1d:5472) db "KOGA@" diff --git a/scripts/viridiangym.asm b/scripts/viridiangym.asm index cdbe939b..df3c203d 100755 --- a/scripts/viridiangym.asm +++ b/scripts/viridiangym.asm @@ -11,7 +11,7 @@ ViridianGymScript: ; 748a3 (1d:48a3) ret Gym8CityName: ; 748bf (1d:48bf) - db "VIRIDIAN CITY@" + db "JADIELLE@" Gym8LeaderName: ; 748cd (1d:48cd) db "GIOVANNI@" -- cgit v1.2.3