Skip to content

Merge 'pret/master' into master #114

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.

Sign up for GitHub

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

Jump to bottom
Open
Brianum wants to merge 49 commits into
base: master
Choose a base branch
from
Open

Merge 'pret/master' into master #114

Brianum wants to merge 49 commits into from

Conversation

@Brianum
Copy link

@Brianum Brianum commented Jan 1, 2026

Merge 'pret/master' into master

  • Make all the changes required for the switch from hardware_constants.asm to hardware.inc
  • Make all the changes required for things that got deprecated in rgbds 1.0.0

Rangi42 and others added 30 commits May 31, 2025 15:08
@Rangi42
Add a CANNOT_MOVE constant (pret#508)
b4bae4a
@dannye
Fix typos
fd043a6
@Rangi42
Add .rgbds-version file for rgbenv compatibility
0520dce
@Rangi42
Simplify li macro
663b061
@Rangi42
Fishing graphics make more sense horizontally
5e5a498
@Rangi42
Distinguish single trainer pics section from Pokemon pics
fcb61ae
@Rangi42
Replace hardware_constants.asm with hardware.inc (pret#511)
56c405d
@Rangi42
Use combined hardware constants
78e44a8
@Rangi42
Use more audio constants
1e99747
@Rangi42
Define MAX_WARP_EVENTS
aa85c00
@Rangi42
Check limits for warp, bg, and object events
3f4b3ee
@Rangi42
Require RGBDS 0.9.3 for its DMG palette specs (pret#513)
d6e9f53
@kagnusdev
Use less generic labels for party finding loops (pret#514)
4eaccc4
@kagnusdev
Use hardware constants for tile attributes in VermilionDockOAMBlock (p…
e2f7c5c 
…ret#516)
@Rangi42
Update hardware.inc to 5.2.0
fd86bca
@Rangi42
Try to catch missing commas in tmhm learnsets
6f8ee8a
@Rangi42
Update hardware.inc to 5.3.0 and use its JOYP_SGB_* constants
bdbc8cb
@Rangi42
Identify JOYP_SGB_MLT_REQ constant
1eb6f61
@Rangi42
Say how many bytes the assertion macros expected vs got
263a35a
@Rangi42
List end markers (-1 aka $FF) are not part of table data
c51d1b7
@PokefanMarcel
Use <STAT>_UP1_EFFECT constants (pret#522)
31fc2e2
@Rangi42
Use dname macro to automatically pad names with "@" characters (p…
5e8b835 
…ret#525)
@Narishma-gb
Document a bug in PrintBenchGuyText (pret#523)
126c3f3
@Rangi42
Specify file extensions that make does not generate
fd5dc11
@Rangi42
Document where badge and elevator floor "items" are used
d98b5e6
@Narishma-gb
Label and constant cleanup (pret#528)
4d2594c 
* Label cleanup, add some constants instead of raw numbers

* Rename load/save game functions to be more explicit
@Vortyne
Update comment for clarity (pret#529)
8da7deb 
Actually copies from battle struct to party struct to make HP and status changes to a pokemon permanent
@PokefanMarcel
Document visual glitch with Pewter City Gym guy (pret#526)
b496791
@PokefanMarcel
Use RAMG_SRAM_ENABLE (pret#530)
108bf29
@PokefanMarcel
Clean up home/copy2.asm (pret#531)
59da8c8 
* Use `SCREEN_WIDTH`, rename loop, and remove obsolete comment in `ClearScreenArea`

* Use `SCREEN_HEIGHT` and `lb` in `CopyScreenTileBufferToVRAM`

* Use `SCREEN_AREA` in `ClearScreen`
Rangi42 and others added 19 commits September 26, 2025 16:55
@Rangi42
Revise some RAM buffer constants
628797b
@Rangi42
Consistently use ld [hli]/ld [hld], not ldi/ldd
e3af20b
@PokefanMarcel
Expand comment on _AfterTrade2Text to mention pokeyellow's changes (…
c2d81fb 
…pret#536)
@Rangi42
Use the same tools/make_patch.c as Gen 2
8105df9 
The `--ignore` flag is not needed in Gen 1
@Rangi42
Use features of RGBDS 1.0.0 (pret#537)
5943b96
@Rangi42
Add _vc patch targets to .PHONY
70b5ab9
@Narishma-gb
Use more hardware and graphics constants (pret#532)
f332678 
- Use `OBJ_SIZE` and `TILE_SIZE` from hardware.inc.
- `SPRITESTATEDATA1_LENGTH`, `NUM_SPRITESTATEDATA_STRUCTS`
  and `TILE_1BPP_SIZE` are used in some places.
- Highlight an oversight in `OakSpeech` where several
  direct MBC bank switches are requested.
- Remove redundant comments in home/overworld.asm.
- Add unreferenced `FillBgMap` function to avoid a byte
  of dead code.
- Some constants added in wram.asm.
- Correctly separate the commented code in `SaveMainData`.
@Rangi42
Use ld_hli_a_string macro to make byte-by-byte strings more obvious (…
308189b 
…pret#540)
@Rangi42
Avoid magic numbers for most CopyData calls (pret#542)
e92d1af
@Narishma-gb
Use more Pokemon data constants, create MOVE_NAME_LENGTH (pret#543)
3a4382c
@Rangi42
Define player and rival names once, to be used in two places (pret#545)
9a6bb3e
@Rangi42
Comment that farcall and callfar are interchangable
7272d9b
@Rangi42
Correct comment
917a0eb
@Narishma-gb
Update StatusScreen, add *_STATS_BOX constants (pret#546)
8bb0354
@Rangi42
Clarify how the order of map constants matters for the Town Map (pret…
e1948fe 
…#553)
@Narishma-gb
Comment more unreferenced local labels (pret#550)
e9d3324
@Rangi42
Specify a max item length for list_start (pret#552)
d79c578
@jordanmoore753
Replace magic number $7 with SLP_MASK constant (pret#555)
0555b42
@Brianum
Merge commit 'pret/master' into master
1d861f3
@Vortyne
Copy link
Owner

Vortyne commented Jan 1, 2026

Thanks for the PR! At the moment I am working on another branch on the new version so I cannot review this one yet, and won't be able to review until I am done the new version.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@Brianum @Vortyne @Rangi42 @dannye @kagnusdev @PokefanMarcel @Narishma-gb @jordanmoore753