-
Notifications
You must be signed in to change notification settings - Fork 806
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Address issue #1078 (Inaccurate function names) #1105
Address issue #1078 (Inaccurate function names) #1105
Conversation
Thanks a lot for the pull request! And sorry, I just noticed it now, it's been a busy few weeks for me. Don't be afraid to ping us on the discord if we take too long. First comment off the bat: I'd rather not modify hardware_constants.asm in such a repo-wide manner unless it's to realign with https://github.com/gbdev/hardware.inc/blob/master/hardware.inc (which would be great to switch to in the future). If a constant is used for two separate purposes, I'd rather have two constants than one (hardware.inc does this, too). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
First commit comments
engine/overworld/events.asm
Outdated
@@ -1175,7 +1173,7 @@ WildBattleScript: | |||
reloadmapafterbattle | |||
end | |||
|
|||
CanUseSweetScent:: | |||
CanEncounterWildMonInThisTile:: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's not just a tile check, so CanEncounterWildMon
is good enough.
_LoadMapPart:: | ||
_LoadOverworldTilemap:: | ||
; From the metatile-based 24x20 map in wSurroundingTiles, | ||
; load the corresponding 20x18 tiles to wTilemap. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
; This function is only used for the initial loading of the map,
; incremental loads while moving happen through <I don't remember the name of the func rn>
I'd like to clarify here.
@@ -1,4 +1,5 @@ | |||
_SwapTextboxPalettes:: | |||
_LoadOverworldAttrmapPals:: | |||
; Load wAttrmap palette numbers based on the tileset palettes of current map. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same comment as _LoadOverworldTilemap
Didn't even think of hardware.inc actually. Now I'm surprised that I'm only finding OAM attr constants and not BG Map attr constants there, but most likely there is a sensible reason for it that I'm not aware of. I can get rid of the commit addressing this for now, I just found it weird that |
No, it's a good commit, but I will request you consider splitting it into a new PR if you feel like it. That way, we can discuss the situation regarding the lack of BG map attribute constants with the hardware.inc upstream. I figure it's mostly an oversight - most homebrew relies on tools to generate BG maps, instead of specifying attributes in the source like we do. |
0266f64
to
17d3a1a
Compare
Sounds good. Moved that commit elsewhere and applied all other suggestions in 17d3a1a. Thanks! |
Port some changes from pret/pokecrystal#1105 (Rangi42#947)
The most generic label renaming changes are in the first two commits (first commit related to my first issue comment, second commit related to my more recent issue comment), but some more specific changes are each in their own separate commit for visibility.
I'll point out just the changes that can't be derived from the comments in issue #1078: