bank03.asm Function Descriptions & Translations #110

tdadvocate · 2023-10-21T04:47:45Z

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.

vulcandth · 2023-10-21T04:49:48Z

Thanks i'll look this over soon.

mid-kid

Comments are not a substitute for function names. Most of these labels can be renamed to the exact contents of your comments. The moment you start copy-pasting comments, it should raise red flags that something is deeply wrong.

engine/dumps/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.

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.

Missed this change in the last commit since I apparently didn't save the file. Whoops. Last commit for this session.

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.

vulcandth · 2023-11-04T17:37:31Z

@tdadvocate Just comment when you are ready for another review.

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.

tdadvocate · 2023-11-07T03:52:16Z

So I did this across multiple commits as I had time on my fork. How would I go about requesting a review? This is my first time doing pull requests so I am not sure if it is best for me to close this and request a new pull based on all the commits that I made over the past 2 weeks or if there is some way that I can just merge them all together on this request. Sorry for being a pain and thank you for all of the help so far!

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.

mid-kid · 2023-11-14T08:39:42Z

Feel free to ping me or people in the discord if you need quicker reviews. I only noticed your fixes right now, and I won't have time to look at it for another few days at least.

vulcandth · 2023-11-14T14:41:00Z

So I did this across multiple commits as I had time on my fork. How would I go about requesting a review? This is my first time doing pull requests so I am not sure if it is best for me to close this and request a new pull based on all the commits that I made over the past 2 weeks or if there is some way that I can just merge them all together on this request. Sorry for being a pain and thank you for all of the help so far!

My bad; I thought you were still making commits and missed your comment here. It's easier to skip past notifications on GitHub. Within reason of course, you are more than welcome to ping us on discord in the future to let us know you are ready for reviews as mid-kid stated. I'll review this tonight when I get home from work. Again, thank you for contributing!!!

vulcandth

Didn't have time to review all of it; but this should give you some stuff to work on.

As mid-kid pointed out; the labels don't need to be perfect.. We can always go back and refine them later... however they will make reading the code easier even if they are not 100% accurate.

README.md

engine/dumps/bank03.asm

vulcandth · 2023-11-15T00:26:37Z

engine/dumps/bank03.asm

-	text "を　すてます"
-	line "ほんとに　よろしいですか？"
+	text "を　すてます" ; "Are you sure you want"
+	line "ほんとに　よろしいですか？" ; "to throw (item?) away?"
 	prompt

 Textd491:


Suggested change

Textd491:

ItemsTooImportantText:

engine/dumps/bank03.asm

This reverts commit 4e9baa9.

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.

Merge PRET Master Changes (More Decomp Work)

Making corrections and additional name changes based on the amazing suggestions from vulcandth.

tdadvocate · 2023-11-24T03:42:14Z

I believe that all the changes requested should now match up to what was suggested. I skimmed back through and I don't see any immediately noticeable errors from my new understanding of things. If I did miss something, please let me know and I will be more than happy to correct them! Thank you both for all of your help on so far on supporting this project!

vulcandth · 2023-11-24T16:42:27Z

This currently fails to build. Make sure you do a make compare and verify it is matching, and it builds before pushing :).

error: engine/dumps/bank03.asm(332):
    'ItemsThrowAwayText' already defined at engine/dumps/bank03.asm(326)

error: engine/dumps/bank03.asm(3413):
    "BallSoCloseText" is not a macro

vulcandth · 2023-11-24T17:55:17Z

engine/dumps/bank03.asm

-Textebc3:
-	text "ざんねん！"
-	line "もうすこしで　つかまえられたのに！"
+BallAlmostHadItText:BallSoCloseText


Suggested change

BallAlmostHadItText:BallSoCloseText

BallAlmostHadItText:

Here is one of your build errors.

vulcandth

After fixing the build, and finishing out these last few changes.. This looks good enough to merge.

vulcandth · 2023-11-24T18:02:21Z

engine/dumps/bank03.asm

@@ -2566,14 +2566,14 @@ Functione49d:
 	call PlaceString
 	ret

-Texte4bf:
-	db "あずかっている#"
+Texte4bf: ; unfinished feature to show how many mon are in your box


Suggested change

Texte4bf: ; unfinished feature to show how many mon are in your box

MonInMyCareText:

Something like this is fine.

vulcandth · 2023-11-24T18:03:48Z

engine/dumps/bank03.asm

 	next "　@"

-Texte4ca:
+Texte4ca: ; max mon per box


Suggested change

Texte4ca: ; max mon per box

OutOfThirtyText:

vulcandth · 2023-11-24T18:05:00Z

engine/dumps/bank03.asm

 	and a
 	ret

-Functione51f:
-	ld hl, Texte529
+BoxChangeUnderDevTextFunc:


Suggested change

BoxChangeUnderDevTextFunc:

PrintBoxChangeUnderDev:

vulcandth · 2023-11-24T18:06:10Z

engine/dumps/bank03.asm

 	prompt

-Functione53e:
-	ld hl, Texte551
+WhenYouChangeBoxTextFunc:


Suggested change

WhenYouChangeBoxTextFunc:

PromptChangeBoxWillYouSave:

vulcandth · 2023-11-24T18:08:56Z

engine/dumps/bank03.asm

 	done

-Functione57e:
+BoxNameChangeFunc:


Suggested change

BoxNameChangeFunc:

ChangeBoxName:

Since we append things like Text, RLE, Data, ect at the end of data labels... It doesn't add value to add Func at the end of Routines.

vulcandth · 2023-11-24T18:10:04Z

engine/dumps/bank03.asm

@@ -2760,16 +2760,16 @@ Functione5d3:
 	ret

 Texte679:


Suggested change

Texte679:

CurrentBoxText:

Something like..

vulcandth · 2023-11-24T18:10:41Z

engine/dumps/bank03.asm

@@ -2760,16 +2760,16 @@ Functione5d3:
 	ret

 Texte679:
-	db "ボックス／いまの　ボックス@"
+	db "ボックス／いまの　ボックス@" ; "Box/Current Box (Name)"

 Texte687:


Suggested change

Texte687:

SpeciesNameLevelText:

vulcandth · 2023-11-24T18:11:30Z

engine/dumps/bank03.asm


 Texte687:
-	db "しゅるい　　なまえ　　　レべル@"
+	db "しゅるい　　なまえ　　　レべル@" ; "Species Name Level"

 Texte697:


Suggested change

Texte697:

WhichOneWouldYouLikeToSeeText:

This should fix the build error as well as make the suggested corrections from Vulcandth so that it should be compatible. I hope. Lol.

bank03.asm Function Descriptions & Translations

855a643

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.

mid-kid requested changes Oct 21, 2023

View reviewed changes

engine/dumps/bank03.asm Outdated Show resolved Hide resolved

engine/dumps/bank03.asm Outdated Show resolved Hide resolved

engine/dumps/bank03.asm Outdated Show resolved Hide resolved

tdadvocate added 4 commits November 2, 2023 03:09

Update bank03.asm

ece4504

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.

Update bank03.asm

12baccb

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.

Update bank03.asm - Missed One

ea55c14

Missed this change in the last commit since I apparently didn't save the file. Whoops. Last commit for this session.

vulcandth requested changes Nov 15, 2023

View reviewed changes

tdadvocate added 4 commits November 14, 2023 21:07

Revert "Update README.md"

6dd17d0

This reverts commit 4e9baa9.

Merge pull request #1 from pret/master

e4d7988

Merge PRET Master Changes (More Decomp Work)

Corrections & Additions from vulcandth

a88dd0e

Making corrections and additional name changes based on the amazing suggestions from vulcandth.

tdadvocate requested review from mid-kid and vulcandth November 24, 2023 03:40

vulcandth requested changes Nov 24, 2023

View reviewed changes

Vulcandth bank03.asm sugggestions & build fix

b884744

This should fix the build error as well as make the suggested corrections from Vulcandth so that it should be compatible. I hope. Lol.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bank03.asm Function Descriptions & Translations #110

bank03.asm Function Descriptions & Translations #110

tdadvocate commented Oct 21, 2023

vulcandth commented Oct 21, 2023

mid-kid left a comment

vulcandth commented Nov 4, 2023

tdadvocate commented Nov 7, 2023

mid-kid commented Nov 14, 2023

vulcandth commented Nov 14, 2023 •

edited

Loading

vulcandth left a comment

vulcandth Nov 15, 2023

tdadvocate commented Nov 24, 2023

vulcandth commented Nov 24, 2023

vulcandth Nov 24, 2023

vulcandth left a comment

vulcandth Nov 24, 2023

vulcandth Nov 24, 2023

vulcandth Nov 24, 2023

vulcandth Nov 24, 2023

vulcandth Nov 24, 2023

vulcandth Nov 24, 2023

vulcandth Nov 24, 2023

vulcandth Nov 24, 2023

	Texte4bf: ; unfinished feature to show how many mon are in your box
	MonInMyCareText:

bank03.asm Function Descriptions & Translations #110

Are you sure you want to change the base?

bank03.asm Function Descriptions & Translations #110

Conversation

tdadvocate commented Oct 21, 2023

vulcandth commented Oct 21, 2023

mid-kid left a comment

Choose a reason for hiding this comment

vulcandth commented Nov 4, 2023

tdadvocate commented Nov 7, 2023

mid-kid commented Nov 14, 2023

vulcandth commented Nov 14, 2023 • edited Loading

vulcandth left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tdadvocate commented Nov 24, 2023

vulcandth commented Nov 24, 2023

Choose a reason for hiding this comment

vulcandth left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vulcandth commented Nov 14, 2023 •

edited

Loading