Adding bank14, good chunk of text transcribed and labelled in bank0d, renaming farcall to callab, and much more #112
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sporadic constantifying and function naming
vulcandth
requested changes
Jan 16, 2025
ram/wram.asm
Outdated
| wccc0:: ds 1 | ||
| wccc1:: ds 1 | ||
| wFXAnimID:: dw | ||
| ;wccc1:: ds 1 |
There was a problem hiding this comment.
Don't leave labels commented out; just remove them.
constants/menu_constants.asm
Outdated
Comment on lines
59
to
61
| const MONMENUITEM_FLASH ; 5 | ||
| const MONMENUITEM_WHIRLPOOL ; 6 | ||
| const MONMENUITEM_BOUNCE ; 7 |
There was a problem hiding this comment.
Double check that the comments line up.
constants/flypoint_constants.asm
Outdated
Comment on lines
4
to
23
| const FLY_POINT_SILENT_HILL ; 0 | ||
| const FLY_POINT_OLD ; 1 | ||
| const FLY_POINT_WEST ; 2 | ||
| const FLY_POINT_HAITEKU ; 3 | ||
| const FLY_POINT_FONTO ; 4 | ||
| const FLY_POINT_BAADON ; 5 | ||
| const FLY_POINT_NEWTYPE ; 6 | ||
| const FLY_POINT_SUGAR ; 7 | ||
| const FLY_POINT_BULL_FOREST ; 8 | ||
| const FLY_POINT_STAND ; 9 | ||
| const FLY_POINT_KANTO ; 10 | ||
| const FLY_POINT_PRINCE ; 11 | ||
| const FLY_POINT_MT_FUJI ; 12 | ||
| const FLY_POINT_SOUTH ; 13 | ||
| const FLY_POINT_NORTH ; 14 | ||
|
|
||
| ; Unused? | ||
|
|
||
| const FLY_POINT_ROUTE_15 ; 15 | ||
| const FLY_POINT_ROUTE_18 ; 16 |
There was a problem hiding this comment.
index comments should be aligned one space after the longest const name.
constants/pokemon_data_constants.asm
Outdated
Comment on lines
106
to
108
| ; English version: | ||
| ;DEF MONS_PER_BOX EQU 20 | ||
| ;DEF NUM_BOXES EQU 14 |
There was a problem hiding this comment.
We can probably just get rid of these lines.
|
also; unrelated. Some of these can be broken up into their own "files" to match some of the other pret repos.. but i'll do that after merge. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Forgive me if this is a messy commit, I'm not used to the process of GitHub development.
I've spent the past two weeks or so slaving away at several parts of the SpaceWorld 97 disassembly, with the major changes in no particular order being:
Bank $14: has had all of its functions in shim.sym (mostly relating to the stats screen and party menu) properly decompiled, and many more that happened to be found in between. Text and a few functions are labelled, but most are not. There is still about $dc8 bytes left near the end bank, which I have labelled as "Unknown53274".
Fly Destinations, Landmarks, Spawn Points: Moved into separate data files, and have been constantified where not previously. Spawn Point and Fly Point constants can be merged if they are redundant, since
Fly Point IDis alwaysSpawn Point ID - 1.object_struct changes: Removed the
Paletteholdover from final GSC, which caused values fromWalkingtoStepTypeto all be offset by one, and added placeholder value. Additionally splitRadiusinto two bytes,RadiusXandRadiusY, to match treatment in code.Band $0d: Labelled several functions and text, transcribed good chunk of text from raw bytes to actual text, and constantified and labelled move grammar.
FarCall name changes: Per issue 69, farcall and its ilk are renamed to match pokered, which is its closest parallel (Port refactorings and formatting from pokered/pokegold/pokecrystal #69)
There might be other minor changes or added labels that I haven't brought up. If there are glaring problems with any of my changes (i.e. naming inconsistencies. I think my "PartyMenuInBattle" functions might be a culprit, oops!), please let me know.