From 855a643d31178dc081d77d40925e83bec5d274c6 Mon Sep 17 00:00:00 2001 From: TD Date: Sat, 21 Oct 2023 00:45:17 -0400 Subject: [PATCH 01/11] bank03.asm Function Descriptions & Translations Comments added to many functions and text strings that were not fully disassembled. Also translated to some of the text within the file related to the functions that have been researched. --- engine/dumps/bank03.asm | 100 ++++++++++++++++++++-------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/engine/dumps/bank03.asm b/engine/dumps/bank03.asm index 519d2a19..83d4ba26 100755 --- a/engine/dumps/bank03.asm +++ b/engine/dumps/bank03.asm @@ -2270,7 +2270,7 @@ _BillsPC: ret Texte224: - text "なんに するん?" + text "なんに するん?" ; (lit. "What are you going to do?") done Datae22e: @@ -2285,19 +2285,19 @@ Datae236: dw Texte23e Texte23e: - db "#の ようすをみる@" + db "#の ようすをみる@" ; (lit "look at Pokemon") Texte248: - db "#を つれていく@" + db "#を つれていく@" ; "Withdrawal (Pokemon)" Texte251: - db "#を あずける@" + db "#を あずける@" ; "Deposit (Pokemon)" Texte259: - db "#を にがす@" + db "#を にがす@" ; "Release (Pokemon)" Texte260: - db "ボックスを かえる@" + db "ボックスを かえる@" ; "Change Box" Texte26a: db "さようなら@" @@ -2305,9 +2305,9 @@ Texte26a: Tablee270: dw Functione5c5 dw Functione31b - dw Functione2a6 - dw Functione37b - dw Functione3c3 + dw Functione2a6 ; Bill's PC > Deposit Pokemon menu item + dw Functione37b ; Bill's PC > Release Pokemon menu item + dw Functione3c3 ; Bill's PC > Box Change menu item dw Functione2a4 Datae27c: @@ -2331,7 +2331,7 @@ Functione2a4: scf ret -Functione2a6: +Functione2a6: ; Bill's PC > Deposit Pokemon menu item call Functione2b0 jr c, .sub_e2ae call Functione2f0 @@ -2353,7 +2353,7 @@ Functione2b0: scf ret .sub_e2c4 - ld hl, Texte2dc + ld hl, Texte2dc ; failed deposit last mon call MenuTextBoxBackup scf ret @@ -2362,15 +2362,15 @@ Texte2cc: text "1ぴきも もってへんやんか!" prompt -Texte2dc: - text "それ あずけたら" +Texte2dc: ; failed deposit last mon + text "それ あずけたら" ; telling you that you can't deposit your last mon line "こまるんとちゃう?" prompt Functione2f0: call LoadStandardMenuHeader ld hl, Tablee6da - call Functione6a4 + call Functione6a4 ; has something to do with releasing mon from PC call CloseWindow ret c ld a, [wScrollingMenuCursorPosition] @@ -2413,7 +2413,7 @@ Texte336: Functione350: call LoadStandardMenuHeader ld hl, Datae6f8 - call Functione6a4 + call Functione6a4 ; has something to do with releasing mon from PC call CloseWindow ret c ld a, [wScrollingMenuCursorPosition] @@ -2429,21 +2429,21 @@ Functione350: call Functiondecd ret -Functione37b: +Functione37b: ; Bill's PC > Release Pokemon menu item call .sub_e380 and a ret .sub_e380 call LoadStandardMenuHeader ld hl, Datae6f8 - call Functione6a4 + call Functione6a4 ; has something to do with releasing mon from PC call CloseWindow ld a, [wScrollingMenuCursorPosition] ld [wWhichPokemon], a ld a, [wMenuSelection] ld [wMonDexIndex], a ret c - ld hl, Texte3af + ld hl, Texte3af ; confirm release of mon call MenuTextBox call YesNoBox call CloseWindow @@ -2453,19 +2453,19 @@ Functione37b: call Functiondecd ret -Texte3af: +Texte3af: ; confirm release of mon text_from_ram wStringBuffer1 - text " をほんとうに" + text " をほんとうに" ; essentially confirming if you want to release the mon next "にがしますか?" done -Functione3c3: - call Functione3c8 +Functione3c3: ; Bill's PC > Box Change menu item? + call Functione3c8 ; has something to do with dummy boxes in box change screen and a ret -Functione3c8: - call Functione3ed +Functione3c8: ; has something to do with dummy boxes in box change screen + call Functione3ed ; probably creating the 4 dummy boxes in change box screen but unsure call LoadStandardMenuHeader call ClearPalettes call ClearTileMap @@ -2476,18 +2476,18 @@ Functione3c8: ld a, [wMenuJoypad] cp $02 jr z, .sub_e3e9 - call Functione505 + call Functione505 ; box editing menu function jr .sub_e3d4 .sub_e3e9 call CloseWindow ret -Functione3ed: +Functione3ed: ; probably creating the 4 dummy boxes in change box screen but unsure ld hl, wd4b9 ld c, $00 .sub_e3f2 push hl - ld de, Texte40c + ld de, Texte40c ; used for name of 4 dummy boxes (all clones of box 1) call CopyString ld a, $f6 add c @@ -2503,8 +2503,8 @@ Functione3ed: jr c, .sub_e3f2 ret -Texte40c: - db "ダミーボックス@" +Texte40c: ; used for name of 4 dummy boxes (all clones of box 1) + db "ダミーボックス@" ; "Dummy Box" Datae414: db $40, $00, $00, $0c, $13, $1c, $64, $01 @@ -2603,17 +2603,17 @@ Datae4e7: db $03, $d8, $af db $03, $20, $b5 -Functione505: - ld hl, Datae5a5 +Functione505: ; box editing menu function + ld hl, Datae5a5 ; box editing menu list call LoadMenuHeader call VerticalMenu call CloseWindow ret c ld a, [w2DMenuDataEnd] cp $01 - jr z, Functione53e + jr z, Functione53e ; box change function cp $02 - jr z, Functione57e + jr z, Functione57e ; box name change screen display function and a ret @@ -2623,30 +2623,30 @@ Functione51f: call CloseWindow ret -Texte529: +Texte529: ; confirming box was changed successfully text "バンクチェンジは" next "かいはつちゅうです!" prompt -Functione53e: - ld hl, Texte551 +Functione53e: ; box change function + ld hl, Texte551 ; asking to save game data before box change call MenuTextBox call YesNoBox call CloseWindow ret c - jr Functione51f + jr Functione51f ; confirming box was changed successfully Functione54d: ld a, [wMenuSelection] ret -Texte551: +Texte551: ; asking to save game data before box change text "# ボックスを かえると" line "どうじに レポートが かかれます" para "<⋯⋯> それでも いいですか?" done -Functione57e: +Functione57e: ; box name change screen display function ld b, $04 ld de, wMovementBufferCount ld a, BANK(NamingScreen) @@ -2664,16 +2664,16 @@ Functione57e: call CopyString ret -Datae5a5: +Datae5a5: ; box editing menu list db $40, $06, $00, $0e, $0e - dw Datae5ad + dw Datae5ad ; box editing menu list items db $01 -Datae5ad: +Datae5ad: ; box editing menu list items db $80, $03 - db "ボックスきりかえ@" - db "なまえを かえる@" - db "やめる@" + db "ボックスきりかえ@" ; "Change Box" + db "なまえを かえる@" ; " Change Name" + db "やめる@" ; (lit "stop") Functione5c5: call LoadStandardMenuHeader @@ -2769,7 +2769,7 @@ Texte697: text "どの#が みたいねん?" done -Functione6a4: +Functione6a4: ; has something to do with releasing mon from PC ld a, l ld [wcd70], a ld a, h @@ -2782,11 +2782,11 @@ Functione6a4: ld a, [hli] ld h, [hl] ld l, a - call Function3810 + call Function3810 ; in home/scrolling_menu.asm but likely calls the select mon choice for release ld a, [wMenuJoypad] cp $02 jr z, .sub_e6ce - ld hl, Texte6d0 + ld hl, Texte6d0 ; text after selecting mon to release call MenuTextBoxBackup and a ret @@ -2794,8 +2794,8 @@ Functione6a4: scf ret -Texte6d0: - text "#を えらんだ!" +Texte6d0: ; text after selecting mon to release + text "#を えらんだ!" ; (lit. "I choose ") prompt Tablee6da: From ece4504732128ce105d602ea2eaf23cc75b83191 Mon Sep 17 00:00:00 2001 From: TD Date: Thu, 2 Nov 2023 03:09:20 -0400 Subject: [PATCH 02/11] Update bank03.asm Beginning to rename functions/text names to match gold/yellow/red depending on which final game was closest to the code/text in the demo. Also updating/adding some translations. --- engine/dumps/bank03.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/engine/dumps/bank03.asm b/engine/dumps/bank03.asm index 83d4ba26..84eedc9b 100755 --- a/engine/dumps/bank03.asm +++ b/engine/dumps/bank03.asm @@ -2353,18 +2353,18 @@ Functione2b0: scf ret .sub_e2c4 - ld hl, Texte2dc ; failed deposit last mon + ld hl, CantDepositLastMonText call MenuTextBoxBackup scf ret Texte2cc: - text "1ぴきも もってへんやんか!" + text "1ぴきも もってへんやんか!" ; (lit: "I can't even have one!") prompt -Texte2dc: ; failed deposit last mon - text "それ あずけたら" ; telling you that you can't deposit your last mon - line "こまるんとちゃう?" +CantDepositLastMonText: + text "それ あずけたら" ; "You can't deposit" + line "こまるんとちゃう?" ; "the last #MON!" prompt Functione2f0: @@ -2455,7 +2455,7 @@ Functione37b: ; Bill's PC > Release Pokemon menu item Texte3af: ; confirm release of mon text_from_ram wStringBuffer1 - text " をほんとうに" ; essentially confirming if you want to release the mon + text " をほんとうに" ; "Are you sure you want to release (MON)?" next "にがしますか?" done From 12baccb19c93dfb016d9a5560f200715c17178e5 Mon Sep 17 00:00:00 2001 From: TD Date: Sat, 4 Nov 2023 04:35:07 -0400 Subject: [PATCH 03/11] Update bank03.asm Continuing to rename functions/text names to match gold/yellow/red depending on which final game was closest to the code/text in the demo. Also updated/added some more translations. --- engine/dumps/bank03.asm | 58 ++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/engine/dumps/bank03.asm b/engine/dumps/bank03.asm index 84eedc9b..7696acf7 100755 --- a/engine/dumps/bank03.asm +++ b/engine/dumps/bank03.asm @@ -2154,7 +2154,7 @@ Function60a0: ld hl, wd41c bit 4, [hl] jr z, .sub_e10d - ld hl, Texte198 + ld hl, _ItemUseBallText06 call PrintText call ClearSprites ld a, [wMonDexIndex] @@ -2199,7 +2199,7 @@ Function60a0: and a ret z ld hl, Texte168 - ld hl, Texte181 + ld hl, _ItemUseBallText08 call PrintText ld b, $01 ret @@ -2213,27 +2213,27 @@ Texte168: line "てんそうされた!" prompt -Texte181: +_ItemUseBallText08: text_from_ram wStringBuffer1 - text "は だれかの に" - line "てんそうされた!" + text "は だれかの に" ; "was transferred to" + line "てんそうされた!" ; "Someone's PC!" prompt -Texte198: +_ItemUseBallText06: text_from_ram wStringBuffer1 - text "の データが あたらしく" - line "#ずかんに セーブされます!@" + text "の データが あたらしく" ; "New Dex data will" + line "#ずかんに セーブされます!@" ; "be added for (MON)!" Texte1b8: db "ドギ@" Texte1bb: - text "ゲットした @" + text "ゲットした @" ; "Got it!" Texte1c3: text_from_ram wStringBuffer1 - text "に" - line "なまえを つけますか?" + text "に" ; "Would you like to" + line "なまえを つけますか?" ; "give it a name?" done _BillsPC: @@ -2288,7 +2288,7 @@ Texte23e: db "#の ようすをみる@" ; (lit "look at Pokemon") Texte248: - db "#を つれていく@" ; "Withdrawal (Pokemon)" + db "#を つれていく@" ; "Withdraw (Pokemon)" Texte251: db "#を あずける@" ; "Deposit (Pokemon)" @@ -2307,8 +2307,8 @@ Tablee270: dw Functione31b dw Functione2a6 ; Bill's PC > Deposit Pokemon menu item dw Functione37b ; Bill's PC > Release Pokemon menu item - dw Functione3c3 ; Bill's PC > Box Change menu item - dw Functione2a4 + dw BillsPC_ChangeBoxMenu + dw BillsPC_SeeYa Datae27c: db $05, $00, $01, $02, $03, $04, $05, $ff @@ -2327,7 +2327,7 @@ Texte291: line "おことわりや!" prompt -Functione2a4: +BillsPC_SeeYa: scf ret @@ -2443,7 +2443,7 @@ Functione37b: ; Bill's PC > Release Pokemon menu item ld a, [wMenuSelection] ld [wMonDexIndex], a ret c - ld hl, Texte3af ; confirm release of mon + ld hl, _OnceReleasedText call MenuTextBox call YesNoBox call CloseWindow @@ -2453,18 +2453,18 @@ Functione37b: ; Bill's PC > Release Pokemon menu item call Functiondecd ret -Texte3af: ; confirm release of mon +_OnceReleasedText: text_from_ram wStringBuffer1 - text " をほんとうに" ; "Are you sure you want to release (MON)?" - next "にがしますか?" + text " をほんとうに" ; "Are you sure you" + next "にがしますか?" ; "want to release (MON)?" done -Functione3c3: ; Bill's PC > Box Change menu item? - call Functione3c8 ; has something to do with dummy boxes in box change screen +BillsPC_ChangeBoxMenu: + call _ChangeBox and a ret -Functione3c8: ; has something to do with dummy boxes in box change screen +_ChangeBox: call Functione3ed ; probably creating the 4 dummy boxes in change box screen but unsure call LoadStandardMenuHeader call ClearPalettes @@ -2760,13 +2760,13 @@ Functione5d3: ret Texte679: - db "ボックス/いまの ボックス@" + db "ボックス/いまの ボックス@" ; "Box/Current Box (Name)" Texte687: - db "しゅるい  なまえ   レべル@" + db "しゅるい  なまえ   レべル@" ; "Species Name Level" Texte697: - text "どの#が みたいねん?" + text "どの#が みたいねん?" ; "Which would you like to see?" done Functione6a4: ; has something to do with releasing mon from PC @@ -2782,11 +2782,11 @@ Functione6a4: ; has something to do with releasing mon from PC ld a, [hli] ld h, [hl] ld l, a - call Function3810 ; in home/scrolling_menu.asm but likely calls the select mon choice for release + call Function3810 ; in home/scrolling_menu.asm and appears to be related to the smaller mon selection box like G1 (still investigating) ld a, [wMenuJoypad] cp $02 jr z, .sub_e6ce - ld hl, Texte6d0 ; text after selecting mon to release + ld hl, _ReleaseMonSelectedText call MenuTextBoxBackup and a ret @@ -2794,8 +2794,8 @@ Functione6a4: ; has something to do with releasing mon from PC scf ret -Texte6d0: ; text after selecting mon to release - text "#を えらんだ!" ; (lit. "I choose ") +_ReleaseMonSelectedText: + text "#を えらんだ!" ; "(MON) selected!" prompt Tablee6da: From ea55c140328c771a4907e7f6493e290563b5af29 Mon Sep 17 00:00:00 2001 From: TD Date: Sat, 4 Nov 2023 04:44:22 -0400 Subject: [PATCH 04/11] Update bank03.asm - Missed One Missed this change in the last commit since I apparently didn't save the file. Whoops. Last commit for this session. --- engine/dumps/bank03.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/dumps/bank03.asm b/engine/dumps/bank03.asm index 7696acf7..101a30f4 100755 --- a/engine/dumps/bank03.asm +++ b/engine/dumps/bank03.asm @@ -2786,7 +2786,7 @@ Functione6a4: ; has something to do with releasing mon from PC ld a, [wMenuJoypad] cp $02 jr z, .sub_e6ce - ld hl, _ReleaseMonSelectedText + ld hl, _MonSelectedText call MenuTextBoxBackup and a ret @@ -2794,7 +2794,7 @@ Functione6a4: ; has something to do with releasing mon from PC scf ret -_ReleaseMonSelectedText: +_MonSelectedText: text "#を えらんだ!" ; "(MON) selected!" prompt From 4e9baa927b21d8db44bfad4dd3a9372731b5f70c Mon Sep 17 00:00:00 2001 From: TD Date: Sat, 4 Nov 2023 05:05:13 -0400 Subject: [PATCH 05/11] Update README.md Adding the setup instructions from my personal story mode patch fork so that more new devs can maybe attempt to assist with the disassembly further. This README may change down the road to be more in-line with the main PRET repo to see if they possibly allow me to merge the Build Instructions section to their README to help the project continue to grow. --- README.md | 107 ++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 84 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 57d4c5c0..2d86efeb 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,63 @@ +# Pokémon Gold: Space World 1997 Demo Disassembly + +This is a work-in-progress disassembly build of the Pokémon Gold prototype demoed at Space World 1997. This is my fork attempting to help further the disassembly progress as well as providing some guidance on how you may also assist in this important historical project. + +At the very bottom of this README, you will find the original README provided on the PRET disassembly repository that this was initially forked from. Below you will also find the necessary tools for building or contributing to this project. + +## CONTRIBUTIONS EXTREMELY WELCOMED! +Please feel free to help with this as much as you want. I am doing this solo as of the time of writing this README and do not have a ton of experience working with ROMs at this level. Any and all help is immensely appreciated! + +## Necessary Tools +- RGBDS: [**rgbds github**] and/or [**rgbds Install**] +- Programming Application Suggestions: [**Sublime Text Editor**] or [**Visual Studio Code**] (If you use VSCode, try out this syntax highlighter. It isn't perfect but it is still helpful. Please let me know if there is a better option that you recommend instead. [**VSCode Assembly Syntax Highlight**]) +- A copy of Gold_debug.sgb renamed **baserom.gb** to build the ROMs (you will need to provide yourself) + +[**rgbds github**]: https://github.com/gbdev/rgbds +[**rgbds Install**]: https://rgbds.gbdev.io/install +[**Sublime Text Editor**]: https://www.sublimetext.com/ +[**Visual Studio Code**]: https://code.visualstudio.com/ +[**VSCode Assembly Syntax Highlight**]: https://marketplace.visualstudio.com/items?itemName=Toeffe3.asm-syntaxhighlight + +## macOS Mojave (10.14.6) Clean Setup Instructions +Please note, this is only tested with a clean install of macOS Mojave (10.14.6) on a 2018 MacBook Pro 15" with the following specs (CPU: 2.6 GHz Intel Core i7)(RAM: 16 GB 2400 MHz DDR4)(GPU: Intel UHD Graphics 630 1536 MB) (mores specs here [**Models**]) using an external SSD setup and may not be the same process for other macOS or Mac Hardware. This version was used as it is the most recent version of macOS that still supports 32-bit applications. This is helpful for tools like polished-map which will require Wine to be able to run them for map editing. + +1) Download Xcode 11.3.1 from [**All Dev Downloads**] +2) Extract "Xcode_11.3.1.xip" to get the Xcode application +3) Move the Xcode application to your "Applications" folder +4) Run Xcode, read and agree to the terms of service, make sure it downloads all the necessary requirements +5) Install Homebrew following this tutorial [**Homebrew Install**] but ignore the first section about the Command Line Tools as this installs the wrong version and might not even be necessary since you already have Xcode installed and that should also automatically install the Command Line Tools that are needed +6) Install [**make**] as it is required by RGBDS +7) Install [**gcc**] as it is required by RGBDS +8) Install [**bison**] as it is required by RGBDS +9) Open a Terminal window and run the following command without the quotation marks: "cp /usr/local/opt/bison/bin/bison /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/bison" +10) Install [**pkg-config**] as it is required by RGBDS +11) Download and install [**Python 3**] so that you may compile everything properly +12) Download [**RGBDS 0.6.1**] for manual building +13) Extract "rgbds-0.6.1-macos-x86-64.zip" inside of your Downloads folder +14) In your Terminal window, CD to the root directory of the extracted folder +15) In your Terminal window, type "sh" (without the quotations) and then drag and drop the file named "install.sh" into your terminal window +16) Download and install [**Visual Studio Code**] +17) Download and install (insert text format reader name here later) +18) Install [**WineHQ**] +19) Download and install [**polished-map**] to run via WineHQ +20) In your Terminal window, CD to the root directory of the project +21) In your Terminal window, run the following command without the quotation marks: "gmake" +22) If you get an error stating "gmake: *** [Makefile:129: build/gfx/sgb/sgb_border.sgb.tilemap] Error 1", running the gmake command a second time seems to fix the issue + +[**All Dev Downloads**]: https://developer.apple.com/download/all/ +[**Homebrew Install**]: https://ralphjsmit.com/install-homebrew-macos +[**RGBDS 0.6.1**]: https://github.com/gbdev/rgbds/releases/v0.6.1#:~:text=rgbds%2D0.6.1%2Dmacos%2Dx86%2D64.zip +[**make**]: https://formulae.brew.sh/formula/make +[**gcc**]: https://formulae.brew.sh/formula/gcc#default +[**bison**]: https://formulae.brew.sh/formula/bison#default +[**pkg-config**]: https://formulae.brew.sh/formula/pkg-config +[**Python 3**]: https://www.python.org/downloads/ +[**WineHQ**]: https://wiki.winehq.org/MacOS +[**polished-map**]: https://github.com/Rangi42/polished-map/releases +[**Models**]: https://support.apple.com/kb/SP776?viewlocale=en_US&locale=en_US + +# Original PRET README for the repository + # Pokémon Gold and Silver: Space World 1997 Demo [![Build Status][ci-badge]][ci] This is a work-in-progress disassembly of the Pokémon Gold and Pokémon Silver prototypes demoed at Space World 1997. @@ -10,32 +70,33 @@ It builds the following ROMs: You will need to provide a copy of Gold_debug.sgb renamed **baserom.gb** to build the ROMs. -## See also - -Other disassembly and/or decompilation projects: -* [**Pokémon Red and Blue**](https://github.com/pret/pokered) -* [**Pokémon Yellow**](https://github.com/pret/pokeyellow) -* [**Pokémon Trading Card Game**](https://github.com/pret/poketcg) -* [**Pokémon Pinball**](https://github.com/pret/pokepinball) -* [**Pokémon Stadium**](https://github.com/pret/pokestadium) -* [**Pokémon Gold and Silver**](https://github.com/pret/pokegold) -* [**Pokémon Crystal**](https://github.com/pret/pokecrystal) -* [**Pokémon Ruby and Sapphire**](https://github.com/pret/pokeruby) -* [**Pokémon Pinball: Ruby & Sapphire**](https://github.com/pret/pokepinballrs) -* [**Pokémon FireRed and LeafGreen**](https://github.com/pret/pokefirered) -* [**Pokémon Emerald**](https://github.com/pret/pokeemerald) -* [**Pokémon Mystery Dungeon: Red Rescue Team**](https://github.com/pret/pmd-red) -* [**Pokémon Diamond and Pearl**](https://github.com/pret/pokediamond) -* [**Pokémon Platinum**](https://github.com/pret/pokeplatinum) -* [**Pokémon HeartGold and SoulSilver**](https://github.com/pret/pokeheartgold) -* [**Pokémon Mystery Dungeon: Explorers of Sky**](https://github.com/pret/pmd-sky) +### See also -## Contacts +- **Discord:** [pret][discord] +- **IRC:** [libera#pret][irc] -You can find us on: +Other disassembly projects: -* [Discord (PRET, #prototypes-and-leaks)](https://discord.gg/d5dubZ3) -* [IRC](https://web.libera.chat/?#pret) +- [**Pokémon Red/Blue**][pokered] +- [**Pokémon Yellow**][pokeyellow] +- [**Pokémon Gold**][pokegold] +- [**Pokémon Crystal**][pokecrystal] +- [**Pokémon Pinball**][pokepinball] +- [**Pokémon TCG**][poketcg] +- [**Pokémon Ruby**][pokeruby] +- [**Pokémon FireRed**][pokefirered] +- [**Pokémon Emerald**][pokeemerald] +[pokered]: https://github.com/pret/pokered +[pokeyellow]: https://github.com/pret/pokeyellow +[pokegold]: https://github.com/pret/pokegold +[pokecrystal]: https://github.com/pret/pokecrystal +[pokepinball]: https://github.com/pret/pokepinball +[poketcg]: https://github.com/pret/poketcg +[pokeruby]: https://github.com/pret/pokeruby +[pokefirered]: https://github.com/pret/pokefirered +[pokeemerald]: https://github.com/pret/pokeemerald +[discord]: https://discord.gg/d5dubZ3 +[irc]: https://web.libera.chat/?#pret [ci]: https://github.com/pret/pokegold-spaceworld/actions [ci-badge]: https://github.com/pret/pokegold-spaceworld/actions/workflows/main.yml/badge.svg From 41fbbf8f576d2a7c9a85aa8d48743eec6556b06c Mon Sep 17 00:00:00 2001 From: TD Date: Mon, 6 Nov 2023 22:50:06 -0500 Subject: [PATCH 06/11] bank03.asm Func/Data/Text Names Adding a hopefully relatively consistent naming scheme for some more func/data/text that was not previously named. Trying to keep consistent with final Gold/Yellow/Red naming schemes as much as possible. This should hopefully be the final bits of what was necessary for the pull request to the PRET repo. --- engine/dumps/bank03.asm | 64 ++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/engine/dumps/bank03.asm b/engine/dumps/bank03.asm index 101a30f4..484270f5 100755 --- a/engine/dumps/bank03.asm +++ b/engine/dumps/bank03.asm @@ -2305,8 +2305,8 @@ Texte26a: Tablee270: dw Functione5c5 dw Functione31b - dw Functione2a6 ; Bill's PC > Deposit Pokemon menu item - dw Functione37b ; Bill's PC > Release Pokemon menu item + dw BillsPC_DepositMon + dw BillsPC_ReleaseMon dw BillsPC_ChangeBoxMenu dw BillsPC_SeeYa @@ -2331,7 +2331,7 @@ BillsPC_SeeYa: scf ret -Functione2a6: ; Bill's PC > Deposit Pokemon menu item +BillsPC_DepositMon: call Functione2b0 jr c, .sub_e2ae call Functione2f0 @@ -2370,7 +2370,7 @@ CantDepositLastMonText: Functione2f0: call LoadStandardMenuHeader ld hl, Tablee6da - call Functione6a4 ; has something to do with releasing mon from PC + call Functione6a4 call CloseWindow ret c ld a, [wScrollingMenuCursorPosition] @@ -2413,7 +2413,7 @@ Texte336: Functione350: call LoadStandardMenuHeader ld hl, Datae6f8 - call Functione6a4 ; has something to do with releasing mon from PC + call Functione6a4 call CloseWindow ret c ld a, [wScrollingMenuCursorPosition] @@ -2429,14 +2429,14 @@ Functione350: call Functiondecd ret -Functione37b: ; Bill's PC > Release Pokemon menu item +BillsPC_ReleaseMon: call .sub_e380 and a ret .sub_e380 call LoadStandardMenuHeader ld hl, Datae6f8 - call Functione6a4 ; has something to do with releasing mon from PC + call Functione6a4 call CloseWindow ld a, [wScrollingMenuCursorPosition] ld [wWhichPokemon], a @@ -2465,7 +2465,7 @@ BillsPC_ChangeBoxMenu: ret _ChangeBox: - call Functione3ed ; probably creating the 4 dummy boxes in change box screen but unsure + call BoxSelectFunc call LoadStandardMenuHeader call ClearPalettes call ClearTileMap @@ -2476,18 +2476,18 @@ _ChangeBox: ld a, [wMenuJoypad] cp $02 jr z, .sub_e3e9 - call Functione505 ; box editing menu function + call BoxEditMenu jr .sub_e3d4 .sub_e3e9 call CloseWindow ret -Functione3ed: ; probably creating the 4 dummy boxes in change box screen but unsure +BoxSelectFunc: ld hl, wd4b9 ld c, $00 .sub_e3f2 push hl - ld de, Texte40c ; used for name of 4 dummy boxes (all clones of box 1) + ld de, _DummyBoxText call CopyString ld a, $f6 add c @@ -2503,7 +2503,7 @@ Functione3ed: ; probably creating the 4 dummy boxes in change box screen but uns jr c, .sub_e3f2 ret -Texte40c: ; used for name of 4 dummy boxes (all clones of box 1) +_DummyBoxText: db "ダミーボックス@" ; "Dummy Box" Datae414: @@ -2603,50 +2603,50 @@ Datae4e7: db $03, $d8, $af db $03, $20, $b5 -Functione505: ; box editing menu function - ld hl, Datae5a5 ; box editing menu list +BoxEditMenu: + ld hl, BoxEditMenuList call LoadMenuHeader call VerticalMenu call CloseWindow ret c ld a, [w2DMenuDataEnd] cp $01 - jr z, Functione53e ; box change function + jr z, WhenYouChangeBoxTextFunc cp $02 - jr z, Functione57e ; box name change screen display function + jr z, BoxNameChangeFunc and a ret -Functione51f: - ld hl, Texte529 +BoxChangeUnderDevTextFunc: + ld hl, _BoxChangeUnderDevText call MenuTextBox call CloseWindow ret -Texte529: ; confirming box was changed successfully - text "バンクチェンジは" - next "かいはつちゅうです!" +_BoxChangeUnderDevText: + text "バンクチェンジは" ; "Box change is" + next "かいはつちゅうです!" ; "under development!" prompt -Functione53e: ; box change function - ld hl, Texte551 ; asking to save game data before box change +WhenYouChangeBoxTextFunc: + ld hl, _WhenYouChangeBoxText call MenuTextBox call YesNoBox call CloseWindow ret c - jr Functione51f ; confirming box was changed successfully + jr BoxChangeUnderDevTextFunc Functione54d: ld a, [wMenuSelection] ret -Texte551: ; asking to save game data before box change - text "# ボックスを かえると" - line "どうじに レポートが かかれます" - para "<⋯⋯> それでも いいですか?" +_WhenYouChangeBoxText: + text "# ボックスを かえると" ; "When you change a box" + line "どうじに レポートが かかれます" ; "data will be saved." + para "<⋯⋯> それでも いいですか?" ; "Is that okay?" done -Functione57e: ; box name change screen display function +BoxNameChangeFunc: ld b, $04 ld de, wMovementBufferCount ld a, BANK(NamingScreen) @@ -2664,12 +2664,12 @@ Functione57e: ; box name change screen display function call CopyString ret -Datae5a5: ; box editing menu list +BoxEditMenuList: db $40, $06, $00, $0e, $0e - dw Datae5ad ; box editing menu list items + dw BoxEditMenuListItems db $01 -Datae5ad: ; box editing menu list items +BoxEditMenuListItems: db $80, $03 db "ボックスきりかえ@" ; "Change Box" db "なまえを かえる@" ; " Change Name" From 31942b81484aabdb162f98ca5d7fa9f602d2f3c7 Mon Sep 17 00:00:00 2001 From: TD Date: Mon, 6 Nov 2023 23:56:24 -0500 Subject: [PATCH 07/11] bank03.asm 2 Reverts, Translations, & Comments I reverted 2 text name changes as they might be incorrect assumptions based on recent findings while continuing to translate text within the file. I also added a comment or two on some functions that I need to research further in the future when I have more time. --- engine/dumps/bank03.asm | 82 ++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/engine/dumps/bank03.asm b/engine/dumps/bank03.asm index 484270f5..644f376e 100755 --- a/engine/dumps/bank03.asm +++ b/engine/dumps/bank03.asm @@ -317,21 +317,21 @@ Functiond41d: scf ret -Textd46b: +Textd46b: ; maybe _ThrewAwayText text_from_ram wStringBuffer1 - text "を" - line "すてました!" + text "を" ; "Threw away" + line "すてました!" ; "(item?)!" prompt Textd478: text_from_ram wStringBuffer2 - text "を すてます" - line "ほんとに よろしいですか?" + text "を すてます" ; "Are you sure you want" + line "ほんとに よろしいですか?" ; "to throw (item?) away?" prompt Textd491: - text "それは とても たいせつなモノです" - line "すてることは できません!" + text "それは とても たいせつなモノです" ; "You can't throw away" + line "すてることは できません!" ; "something that special!" prompt Functiond4b2: @@ -2300,7 +2300,7 @@ Texte260: db "ボックスを かえる@" ; "Change Box" Texte26a: - db "さようなら@" + db "さようなら@" ; "Goodbye" Tablee270: dw Functione5c5 @@ -2548,7 +2548,7 @@ Texte461: db "・.09 @" db "・.10 @" -Functione49d: +Functione49d: ; change box screen items ld h, d ld l, e ld de, Texte4bf @@ -2566,14 +2566,14 @@ Functione49d: call PlaceString ret -Texte4bf: - db "あずかっている#" +Texte4bf: ; unfinished feature to show how many mon are in your box + db "あずかっている#" ; "Mon in my care" next " @" -Texte4ca: +Texte4ca: ; max mon per box db "/30@" -Functione4ce: +Functione4ce: ; counts available mon in highlighted box ld a, [wMenuSelection] dec a ld c, a @@ -2591,7 +2591,7 @@ Functione4ce: call CloseSRAM ret -Datae4e7: +Datae4e7: ; checks box slots for mon counting db $02, $00, $a0 db $02, $48, $a5 db $02, $90, $aa @@ -3220,16 +3220,16 @@ Functione8f9: jr nz, .sub_ea29 ld a, [wMapBlocksAddress] cp $01 - ld hl, Texteb98 + ld hl, _BallBrokeFreeText jp z, .sub_eb59 cp $02 - ld hl, Textebaf + ld hl, _BallAppearedCaughtText jp z, .sub_eb59 cp $03 - ld hl, Textebc3 + ld hl, _BallAlmostHadItText jp z, .sub_eb59 cp $04 - ld hl, Textebdc + ld hl, _BallSoCloseText jp z, .sub_eb59 .sub_ea29 ld hl, wcde9 @@ -3390,38 +3390,38 @@ Functione8f9: ld [wItemQuantity], a jp TossItem -Texteb6e: - text "よけられた!" - line "こいつは つかまりそうにないぞ!" +_BallDodgedText: + text "よけられた!" ; "It dodged the thrown BALL!" + line "こいつは つかまりそうにないぞ!" ; "This MON can't be caught!" prompt -Texteb87: - text "#に" - line "うまく あたらなかった!" +_BallMissedText: + text "#に" ; "You missed the" + line "うまく あたらなかった!" ; "(MON)!" prompt -Texteb98: - text "だめだ! #が" - line "ボールから でてしまった!" +_BallBrokeFreeText: + text "だめだ! #が" ; "Oh no! The (MON)" + line "ボールから でてしまった!" ; "broke free!" prompt -Textebaf: - text "ああ!" - line "つかまえたと おもったのに!" +_BallAppearedCaughtText: + text "ああ!" ; "Aww! It appeared" + line "つかまえたと おもったのに!" ; "to be caught!" prompt -Textebc3: - text "ざんねん!" - line "もうすこしで つかまえられたのに!" +_BallAlmostHadItText: ; _BallAppearedCaughtText + text "ざんねん!" ; "Aargh!" + line "もうすこしで つかまえられたのに!" ; "Almost had it!" prompt -Textebdc: - text "おしい!" - line "あと ちょっとの ところだったのに!" +_BallSoCloseText: + text "おしい!" ; "Shoot! It was so" + line "あと ちょっとの ところだったのに!" ; "close too!" prompt Textebf5: - text "やったー!" + text "やったー!" ; "Gotcha" line "@" Textebfd: @@ -3441,14 +3441,14 @@ Textec0e: Textec27: text_from_ram wdf17 - text "は だれかの に" - line "てんそうされた!" + text "は だれかの に" ; "was transferred to" + line "てんそうされた!" ; "Someone's PC!" prompt Textec3e: text_from_ram wBattleMonNickname - text "の データが あたらしく" - line "#ずかんに セーブされます!@" + text "の データが あたらしく" ; "New Dex data will" + line "#ずかんに セーブされます!@" ; "be added for (MON)!" Textec5e: sound_slot_machine_start From 6dd17d0f33841cb671a3ff25e18910657d3f9854 Mon Sep 17 00:00:00 2001 From: TD Date: Tue, 14 Nov 2023 21:07:25 -0500 Subject: [PATCH 08/11] Revert "Update README.md" This reverts commit 4e9baa927b21d8db44bfad4dd3a9372731b5f70c. --- README.md | 107 ++++++++++++------------------------------------------ 1 file changed, 23 insertions(+), 84 deletions(-) diff --git a/README.md b/README.md index 2d86efeb..57d4c5c0 100644 --- a/README.md +++ b/README.md @@ -1,63 +1,3 @@ -# Pokémon Gold: Space World 1997 Demo Disassembly - -This is a work-in-progress disassembly build of the Pokémon Gold prototype demoed at Space World 1997. This is my fork attempting to help further the disassembly progress as well as providing some guidance on how you may also assist in this important historical project. - -At the very bottom of this README, you will find the original README provided on the PRET disassembly repository that this was initially forked from. Below you will also find the necessary tools for building or contributing to this project. - -## CONTRIBUTIONS EXTREMELY WELCOMED! -Please feel free to help with this as much as you want. I am doing this solo as of the time of writing this README and do not have a ton of experience working with ROMs at this level. Any and all help is immensely appreciated! - -## Necessary Tools -- RGBDS: [**rgbds github**] and/or [**rgbds Install**] -- Programming Application Suggestions: [**Sublime Text Editor**] or [**Visual Studio Code**] (If you use VSCode, try out this syntax highlighter. It isn't perfect but it is still helpful. Please let me know if there is a better option that you recommend instead. [**VSCode Assembly Syntax Highlight**]) -- A copy of Gold_debug.sgb renamed **baserom.gb** to build the ROMs (you will need to provide yourself) - -[**rgbds github**]: https://github.com/gbdev/rgbds -[**rgbds Install**]: https://rgbds.gbdev.io/install -[**Sublime Text Editor**]: https://www.sublimetext.com/ -[**Visual Studio Code**]: https://code.visualstudio.com/ -[**VSCode Assembly Syntax Highlight**]: https://marketplace.visualstudio.com/items?itemName=Toeffe3.asm-syntaxhighlight - -## macOS Mojave (10.14.6) Clean Setup Instructions -Please note, this is only tested with a clean install of macOS Mojave (10.14.6) on a 2018 MacBook Pro 15" with the following specs (CPU: 2.6 GHz Intel Core i7)(RAM: 16 GB 2400 MHz DDR4)(GPU: Intel UHD Graphics 630 1536 MB) (mores specs here [**Models**]) using an external SSD setup and may not be the same process for other macOS or Mac Hardware. This version was used as it is the most recent version of macOS that still supports 32-bit applications. This is helpful for tools like polished-map which will require Wine to be able to run them for map editing. - -1) Download Xcode 11.3.1 from [**All Dev Downloads**] -2) Extract "Xcode_11.3.1.xip" to get the Xcode application -3) Move the Xcode application to your "Applications" folder -4) Run Xcode, read and agree to the terms of service, make sure it downloads all the necessary requirements -5) Install Homebrew following this tutorial [**Homebrew Install**] but ignore the first section about the Command Line Tools as this installs the wrong version and might not even be necessary since you already have Xcode installed and that should also automatically install the Command Line Tools that are needed -6) Install [**make**] as it is required by RGBDS -7) Install [**gcc**] as it is required by RGBDS -8) Install [**bison**] as it is required by RGBDS -9) Open a Terminal window and run the following command without the quotation marks: "cp /usr/local/opt/bison/bin/bison /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/bison" -10) Install [**pkg-config**] as it is required by RGBDS -11) Download and install [**Python 3**] so that you may compile everything properly -12) Download [**RGBDS 0.6.1**] for manual building -13) Extract "rgbds-0.6.1-macos-x86-64.zip" inside of your Downloads folder -14) In your Terminal window, CD to the root directory of the extracted folder -15) In your Terminal window, type "sh" (without the quotations) and then drag and drop the file named "install.sh" into your terminal window -16) Download and install [**Visual Studio Code**] -17) Download and install (insert text format reader name here later) -18) Install [**WineHQ**] -19) Download and install [**polished-map**] to run via WineHQ -20) In your Terminal window, CD to the root directory of the project -21) In your Terminal window, run the following command without the quotation marks: "gmake" -22) If you get an error stating "gmake: *** [Makefile:129: build/gfx/sgb/sgb_border.sgb.tilemap] Error 1", running the gmake command a second time seems to fix the issue - -[**All Dev Downloads**]: https://developer.apple.com/download/all/ -[**Homebrew Install**]: https://ralphjsmit.com/install-homebrew-macos -[**RGBDS 0.6.1**]: https://github.com/gbdev/rgbds/releases/v0.6.1#:~:text=rgbds%2D0.6.1%2Dmacos%2Dx86%2D64.zip -[**make**]: https://formulae.brew.sh/formula/make -[**gcc**]: https://formulae.brew.sh/formula/gcc#default -[**bison**]: https://formulae.brew.sh/formula/bison#default -[**pkg-config**]: https://formulae.brew.sh/formula/pkg-config -[**Python 3**]: https://www.python.org/downloads/ -[**WineHQ**]: https://wiki.winehq.org/MacOS -[**polished-map**]: https://github.com/Rangi42/polished-map/releases -[**Models**]: https://support.apple.com/kb/SP776?viewlocale=en_US&locale=en_US - -# Original PRET README for the repository - # Pokémon Gold and Silver: Space World 1997 Demo [![Build Status][ci-badge]][ci] This is a work-in-progress disassembly of the Pokémon Gold and Pokémon Silver prototypes demoed at Space World 1997. @@ -70,33 +10,32 @@ It builds the following ROMs: You will need to provide a copy of Gold_debug.sgb renamed **baserom.gb** to build the ROMs. -### See also +## See also + +Other disassembly and/or decompilation projects: +* [**Pokémon Red and Blue**](https://github.com/pret/pokered) +* [**Pokémon Yellow**](https://github.com/pret/pokeyellow) +* [**Pokémon Trading Card Game**](https://github.com/pret/poketcg) +* [**Pokémon Pinball**](https://github.com/pret/pokepinball) +* [**Pokémon Stadium**](https://github.com/pret/pokestadium) +* [**Pokémon Gold and Silver**](https://github.com/pret/pokegold) +* [**Pokémon Crystal**](https://github.com/pret/pokecrystal) +* [**Pokémon Ruby and Sapphire**](https://github.com/pret/pokeruby) +* [**Pokémon Pinball: Ruby & Sapphire**](https://github.com/pret/pokepinballrs) +* [**Pokémon FireRed and LeafGreen**](https://github.com/pret/pokefirered) +* [**Pokémon Emerald**](https://github.com/pret/pokeemerald) +* [**Pokémon Mystery Dungeon: Red Rescue Team**](https://github.com/pret/pmd-red) +* [**Pokémon Diamond and Pearl**](https://github.com/pret/pokediamond) +* [**Pokémon Platinum**](https://github.com/pret/pokeplatinum) +* [**Pokémon HeartGold and SoulSilver**](https://github.com/pret/pokeheartgold) +* [**Pokémon Mystery Dungeon: Explorers of Sky**](https://github.com/pret/pmd-sky) -- **Discord:** [pret][discord] -- **IRC:** [libera#pret][irc] +## Contacts -Other disassembly projects: +You can find us on: -- [**Pokémon Red/Blue**][pokered] -- [**Pokémon Yellow**][pokeyellow] -- [**Pokémon Gold**][pokegold] -- [**Pokémon Crystal**][pokecrystal] -- [**Pokémon Pinball**][pokepinball] -- [**Pokémon TCG**][poketcg] -- [**Pokémon Ruby**][pokeruby] -- [**Pokémon FireRed**][pokefirered] -- [**Pokémon Emerald**][pokeemerald] +* [Discord (PRET, #prototypes-and-leaks)](https://discord.gg/d5dubZ3) +* [IRC](https://web.libera.chat/?#pret) -[pokered]: https://github.com/pret/pokered -[pokeyellow]: https://github.com/pret/pokeyellow -[pokegold]: https://github.com/pret/pokegold -[pokecrystal]: https://github.com/pret/pokecrystal -[pokepinball]: https://github.com/pret/pokepinball -[poketcg]: https://github.com/pret/poketcg -[pokeruby]: https://github.com/pret/pokeruby -[pokefirered]: https://github.com/pret/pokefirered -[pokeemerald]: https://github.com/pret/pokeemerald -[discord]: https://discord.gg/d5dubZ3 -[irc]: https://web.libera.chat/?#pret [ci]: https://github.com/pret/pokegold-spaceworld/actions [ci-badge]: https://github.com/pret/pokegold-spaceworld/actions/workflows/main.yml/badge.svg From 5eb00a5ce259357f0c9bd3be86afd428fb57762c Mon Sep 17 00:00:00 2001 From: TD Date: Mon, 20 Nov 2023 19:34:40 -0500 Subject: [PATCH 09/11] Revert a few function names Reverting a few function names that I discovered I named poorly. Will be trying to make more changes based on the feedback received by the team as soon as I can. Just want to get these few reverted for now so that I can properly research them further without reverting all of the other changes I did in a previous commit that were actually helpful. --- engine/dumps/bank03.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/engine/dumps/bank03.asm b/engine/dumps/bank03.asm index 644f376e..630197dc 100755 --- a/engine/dumps/bank03.asm +++ b/engine/dumps/bank03.asm @@ -2154,7 +2154,7 @@ Function60a0: ld hl, wd41c bit 4, [hl] jr z, .sub_e10d - ld hl, _ItemUseBallText06 + ld hl, Texte198 call PrintText call ClearSprites ld a, [wMonDexIndex] @@ -2199,7 +2199,7 @@ Function60a0: and a ret z ld hl, Texte168 - ld hl, _ItemUseBallText08 + ld hl, Texte181 call PrintText ld b, $01 ret @@ -2213,13 +2213,13 @@ Texte168: line "てんそうされた!" prompt -_ItemUseBallText08: +Texte181: text_from_ram wStringBuffer1 text "は だれかの に" ; "was transferred to" line "てんそうされた!" ; "Someone's PC!" prompt -_ItemUseBallText06: +Texte198: text_from_ram wStringBuffer1 text "の データが あたらしく" ; "New Dex data will" line "#ずかんに セーブされます!@" ; "be added for (MON)!" From a88dd0ef190d1d6f5434bed6c04f62af34bb8640 Mon Sep 17 00:00:00 2001 From: TD Date: Thu, 23 Nov 2023 22:40:06 -0500 Subject: [PATCH 10/11] Corrections & Additions from vulcandth Making corrections and additional name changes based on the amazing suggestions from vulcandth. --- engine/dumps/bank03.asm | 106 ++++++++++++++++++++-------------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/engine/dumps/bank03.asm b/engine/dumps/bank03.asm index d3d01dc7..f9be773c 100755 --- a/engine/dumps/bank03.asm +++ b/engine/dumps/bank03.asm @@ -291,7 +291,7 @@ Functiond41d: ld [wce37], a call GetItemName call CopyStringToStringBuffer2 - ld hl, Textd478 + ld hl, ItemsThrowAwayText call MenuTextBox call YesNoBox call CloseWindow @@ -303,13 +303,13 @@ Functiond41d: ld [wce37], a call GetItemName call CopyStringToStringBuffer2 - ld hl, Textd46b + ld hl, ItemsDiscardedText call MenuTextBox call CloseWindow and a ret .sub_d45f - ld hl, Textd491 + ld hl, ItemsThrowAwayText call MenuTextBox call CloseWindow .sub_d468 @@ -317,19 +317,19 @@ Functiond41d: scf ret -Textd46b: ; maybe _ThrewAwayText +ItemsDiscardedText: text_from_ram wStringBuffer1 text "を" ; "Threw away" line "すてました!" ; "(item?)!" prompt -Textd478: +ItemsThrowAwayText: text_from_ram wStringBuffer2 text "を すてます" ; "Are you sure you want" line "ほんとに よろしいですか?" ; "to throw (item?) away?" prompt -Textd491: +ItemsThrowAwayText: text "それは とても たいせつなモノです" ; "You can't throw away" line "すてることは できません!" ; "something that special!" prompt @@ -2154,7 +2154,7 @@ Function60a0: ld hl, wd41c bit 4, [hl] jr z, .sub_e10d - ld hl, Texte198 + ld hl, NewDexDataText call PrintText call ClearSprites ld a, [wMonDexIndex] @@ -2163,7 +2163,7 @@ Function60a0: call Predef call LoadTilesetGFX_LCDOff .sub_e10d - ld hl, Texte1bb + ld hl, GotItText call PrintText call YesNoBox pop de @@ -2198,8 +2198,8 @@ Function60a0: ld a, b and a ret z - ld hl, Texte168 - ld hl, Texte181 + ld hl, BallSentToPCText + ld hl, BallSentToSomeonesPCText call PrintText ld b, $01 ret @@ -2207,19 +2207,19 @@ Function60a0: ld b, $02 ret -Texte168: +BallSentToPCText: text_from_ram wStringBuffer1 text "は マサキの ところへ" line "てんそうされた!" prompt -Texte181: +BallSentToSomeonesPCText: text_from_ram wStringBuffer1 text "は だれかの に" ; "was transferred to" line "てんそうされた!" ; "Someone's PC!" prompt -Texte198: +NewDexDataText: text_from_ram wStringBuffer1 text "の データが あたらしく" ; "New Dex data will" line "#ずかんに セーブされます!@" ; "be added for (MON)!" @@ -2227,10 +2227,10 @@ Texte198: Texte1b8: db "ドギ@" -Texte1bb: +GotItText: text "ゲットした @" ; "Got it!" -Texte1c3: +AskGiveNicknameText: text_from_ram wStringBuffer1 text "に" ; "Would you like to" line "なまえを つけますか?" ; "give it a name?" @@ -2246,7 +2246,7 @@ _BillsPC: ld de, PokeBallsGFX lb bc, BANK(PokeBallsGFX), $01 call Request2bpp - ld hl, Texte224 + ld hl, WhatAreYouGoingToDoText call MenuTextBox ld hl, Datae22e call LoadMenuHeader @@ -2269,7 +2269,7 @@ _BillsPC: call CloseWindow ret -Texte224: +WhatAreYouGoingToDoText: text "なんに するん?" ; (lit. "What are you going to do?") done @@ -2282,24 +2282,24 @@ Datae236: db $80, $00 dw Datae27c db $8a, $1f - dw Texte23e + dw LookAtPokemonText -Texte23e: +LookAtPokemonText: db "#の ようすをみる@" ; (lit "look at Pokemon") -Texte248: +WithdrawMonText: db "#を つれていく@" ; "Withdraw (Pokemon)" -Texte251: +DepositMonText: db "#を あずける@" ; "Deposit (Pokemon)" -Texte259: +ReleaseMonText: db "#を にがす@" ; "Release (Pokemon)" -Texte260: +ChangeBoxText: db "ボックスを かえる@" ; "Change Box" -Texte26a: +GoodbyeText: db "さようなら@" ; "Goodbye" Tablee270: @@ -2348,7 +2348,7 @@ Functione2b0: and a ret .sub_e2bc - ld hl, Texte2cc + ld hl, YouDontEventHaveOnePokemonText call MenuTextBoxBackup scf ret @@ -2358,7 +2358,7 @@ Functione2b0: scf ret -Texte2cc: +YouDontEventHaveOnePokemonText: text "1ぴきも もってへんやんか!" ; (lit: "I can't even have one!") prompt @@ -2443,7 +2443,7 @@ BillsPC_ReleaseMon: ld a, [wMenuSelection] ld [wMonDexIndex], a ret c - ld hl, _OnceReleasedText + ld hl, OnceReleasedText call MenuTextBox call YesNoBox call CloseWindow @@ -2453,7 +2453,7 @@ BillsPC_ReleaseMon: call Functiondecd ret -_OnceReleasedText: +OnceReleasedText: text_from_ram wStringBuffer1 text " をほんとうに" ; "Are you sure you" next "にがしますか?" ; "want to release (MON)?" @@ -2487,7 +2487,7 @@ BoxSelectFunc: ld c, $00 .sub_e3f2 push hl - ld de, _DummyBoxText + ld de, DummyBoxText call CopyString ld a, $f6 add c @@ -2503,7 +2503,7 @@ BoxSelectFunc: jr c, .sub_e3f2 ret -_DummyBoxText: +DummyBoxText: db "ダミーボックス@" ; "Dummy Box" Datae414: @@ -2618,18 +2618,18 @@ BoxEditMenu: ret BoxChangeUnderDevTextFunc: - ld hl, _BoxChangeUnderDevText + ld hl, BoxChangeUnderDevText call MenuTextBox call CloseWindow ret -_BoxChangeUnderDevText: +BoxChangeUnderDevText: text "バンクチェンジは" ; "Box change is" next "かいはつちゅうです!" ; "under development!" prompt WhenYouChangeBoxTextFunc: - ld hl, _WhenYouChangeBoxText + ld hl, WhenYouChangeBoxText call MenuTextBox call YesNoBox call CloseWindow @@ -2640,7 +2640,7 @@ Functione54d: ld a, [wMenuSelection] ret -_WhenYouChangeBoxText: +WhenYouChangeBoxText: text "# ボックスを かえると" ; "When you change a box" line "どうじに レポートが かかれます" ; "data will be saved." para "<⋯⋯> それでも いいですか?" ; "Is that okay?" @@ -2786,7 +2786,7 @@ Functione6a4: ; has something to do with releasing mon from PC ld a, [wMenuJoypad] cp $02 jr z, .sub_e6ce - ld hl, _MonSelectedText + ld hl, MonSelectedText call MenuTextBoxBackup and a ret @@ -2794,7 +2794,7 @@ Functione6a4: ; has something to do with releasing mon from PC scf ret -_MonSelectedText: +MonSelectedText: text "#を えらんだ!" ; "(MON) selected!" prompt @@ -3220,16 +3220,16 @@ Functione8f9: jr nz, .sub_ea29 ld a, [wMapBlocksAddress] cp $01 - ld hl, _BallBrokeFreeText + ld hl, BallBrokeFreeText jp z, .sub_eb59 cp $02 - ld hl, _BallAppearedCaughtText + ld hl, BallAppearedCaughtText jp z, .sub_eb59 cp $03 - ld hl, _BallAlmostHadItText + ld hl, BallAlmostHadItText jp z, .sub_eb59 cp $04 - ld hl, _BallSoCloseText + ld hl, BallSoCloseText jp z, .sub_eb59 .sub_ea29 ld hl, wcde9 @@ -3284,7 +3284,7 @@ Functione8f9: ld a, [wce03] dec a jp z, .sub_eb56 - ld hl, Textebf5 + ld hl, GotchaText call PrintText call ClearSprites ld a, [wce37] @@ -3306,7 +3306,7 @@ Functione8f9: pop af and a jr nz, .sub_eac7 - ld hl, Textec3e + ld hl, NewDexDataText_2 call PrintText call ClearSprites ld a, [wcdd9] @@ -3372,12 +3372,12 @@ Functione8f9: ld hl, Textec0e bit 0, a jr nz, .sub_eb51 - ld hl, Textec27 + ld hl, BallSentToSomeonesPCText_2 .sub_eb51 call PrintText jr .sub_eb5f .sub_eb56 - ld hl, Textebf5 + ld hl, GotchaText .sub_eb59 call PrintText call ClearSprites @@ -3390,37 +3390,37 @@ Functione8f9: ld [wItemQuantity], a jp TossItem -_BallDodgedText: +BallDodgedText: text "よけられた!" ; "It dodged the thrown BALL!" line "こいつは つかまりそうにないぞ!" ; "This MON can't be caught!" prompt -_BallMissedText: +BallMissedText: text "#に" ; "You missed the" line "うまく あたらなかった!" ; "(MON)!" prompt -_BallBrokeFreeText: +BallBrokeFreeText: text "だめだ! #が" ; "Oh no! The (MON)" line "ボールから でてしまった!" ; "broke free!" prompt -_BallAppearedCaughtText: +BallAppearedCaughtText: text "ああ!" ; "Aww! It appeared" line "つかまえたと おもったのに!" ; "to be caught!" prompt -_BallAlmostHadItText: ; _BallAppearedCaughtText +BallAlmostHadItText:BallSoCloseText text "ざんねん!" ; "Aargh!" line "もうすこしで つかまえられたのに!" ; "Almost had it!" prompt -_BallSoCloseText: +BallSoCloseText: text "おしい!" ; "Shoot! It was so" line "あと ちょっとの ところだったのに!" ; "close too!" prompt -Textebf5: +GotchaText: text "やったー!" ; "Gotcha" line "@" @@ -3439,13 +3439,13 @@ Textec0e: line "てんそうされた!" prompt -Textec27: +BallSentToSomeonesPCText_2: text_from_ram wdf17 text "は だれかの に" ; "was transferred to" line "てんそうされた!" ; "Someone's PC!" prompt -Textec3e: +NewDexDataText_2: text_from_ram wBattleMonNickname text "の データが あたらしく" ; "New Dex data will" line "#ずかんに セーブされます!@" ; "be added for (MON)!" From b8847445c9a7839faec01aafde938a617c1ea574 Mon Sep 17 00:00:00 2001 From: TD Date: Fri, 24 Nov 2023 23:36:31 -0500 Subject: [PATCH 11/11] Vulcandth bank03.asm sugggestions & build fix This should fix the build error as well as make the suggested corrections from Vulcandth so that it should be compatible. I hope. Lol. --- engine/dumps/bank03.asm | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/engine/dumps/bank03.asm b/engine/dumps/bank03.asm index f9be773c..e199f94c 100755 --- a/engine/dumps/bank03.asm +++ b/engine/dumps/bank03.asm @@ -309,7 +309,7 @@ Functiond41d: and a ret .sub_d45f - ld hl, ItemsThrowAwayText + ld hl, ItemsTooImportantText call MenuTextBox call CloseWindow .sub_d468 @@ -329,7 +329,7 @@ ItemsThrowAwayText: line "ほんとに よろしいですか?" ; "to throw (item?) away?" prompt -ItemsThrowAwayText: +ItemsTooImportantText: text "それは とても たいせつなモノです" ; "You can't throw away" line "すてることは できません!" ; "something that special!" prompt @@ -2551,7 +2551,7 @@ Texte461: Functione49d: ; change box screen items ld h, d ld l, e - ld de, Texte4bf + ld de, MonInMyCareText call PlaceString ld hl, $0003 add hl, bc @@ -2562,15 +2562,15 @@ Functione49d: ; change box screen items ld [de], a ld bc, $0102 call PrintNumber - ld de, Texte4ca + ld de, OutOfThirtyText call PlaceString ret -Texte4bf: ; unfinished feature to show how many mon are in your box +MonInMyCareText: ; unfinished feature to show how many mon are in your box db "あずかっている#" ; "Mon in my care" next " @" -Texte4ca: ; max mon per box +OutOfThirtyText: ; max mon per box db "/30@" Functione4ce: ; counts available mon in highlighted box @@ -2611,13 +2611,13 @@ BoxEditMenu: ret c ld a, [w2DMenuDataEnd] cp $01 - jr z, WhenYouChangeBoxTextFunc + jr z, PromptChangeBoxWillYouSave cp $02 - jr z, BoxNameChangeFunc + jr z, ChangeBoxName and a ret -BoxChangeUnderDevTextFunc: +PrintBoxChangeUnderDev: ld hl, BoxChangeUnderDevText call MenuTextBox call CloseWindow @@ -2628,13 +2628,13 @@ BoxChangeUnderDevText: next "かいはつちゅうです!" ; "under development!" prompt -WhenYouChangeBoxTextFunc: +PromptChangeBoxWillYouSave: ld hl, WhenYouChangeBoxText call MenuTextBox call YesNoBox call CloseWindow ret c - jr BoxChangeUnderDevTextFunc + jr PrintBoxChangeUnderDev Functione54d: ld a, [wMenuSelection] @@ -2646,7 +2646,7 @@ WhenYouChangeBoxText: para "<⋯⋯> それでも いいですか?" ; "Is that okay?" done -BoxNameChangeFunc: +ChangeBoxName: ld b, $04 ld de, wMovementBufferCount ld a, BANK(NamingScreen) @@ -2731,7 +2731,7 @@ Functione5d3: ld d, h ld e, l coord hl, 1, 1 - ld de, Texte679 + ld de, CurrentBoxText call PlaceString coord hl, 0, 3 ld a, $79 @@ -2751,21 +2751,21 @@ Functione5d3: dec c jr nz, .sub_e660 coord hl, 2, 3 - ld de, Texte687 + ld de, SpeciesNameLevelText call PlaceString - ld hl, Texte697 + ld hl, WhichOneWouldYouLikeToSeeText call PrintText pop af ld [wce5f], a ret -Texte679: +CurrentBoxText: db "ボックス/いまの ボックス@" ; "Box/Current Box (Name)" -Texte687: +SpeciesNameLevelText: db "しゅるい  なまえ   レべル@" ; "Species Name Level" -Texte697: +WhichOneWouldYouLikeToSeeText: text "どの#が みたいねん?" ; "Which would you like to see?" done @@ -3410,7 +3410,7 @@ BallAppearedCaughtText: line "つかまえたと おもったのに!" ; "to be caught!" prompt -BallAlmostHadItText:BallSoCloseText +BallAlmostHadItText: text "ざんねん!" ; "Aargh!" line "もうすこしで つかまえられたのに!" ; "Almost had it!" prompt