diff options
| author | dannye <33dannye@gmail.com> | 2025-01-30 21:40:19 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-01-30 21:40:19 -0600 |
| commit | 6cb885a9f68b9f445d7fa45279731336fe0247d4 (patch) | |
| tree | 39736ab1dd8ebcc57f8e981db6103285743d5530 /ram | |
| parent | Identify unnamed functions in map_sprites.asm (#126) (diff) | |
| parent | Fix some label typos, and add some constants instead of raw numbers (#492) (diff) | |
| download | pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.gz pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.xz pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'ram')
| -rw-r--r-- | ram/hram.asm | 4 | ||||
| -rw-r--r-- | ram/wram.asm | 22 |
2 files changed, 19 insertions, 7 deletions
diff --git a/ram/hram.asm b/ram/hram.asm index 8f6e03f0..7c38d138 100644 --- a/ram/hram.asm +++ b/ram/hram.asm @@ -406,7 +406,7 @@ hPikachuSpriteVRAMOffset:: db ds 1 -; 0 if DMG, != 0 if GBC -hGBC:: db +; 0 if DMG, != 0 if CGB +hOnCGB:: db ENDSECTION diff --git a/ram/wram.asm b/ram/wram.asm index 8d983753..68a04fcb 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -160,12 +160,26 @@ SECTION "Tilemap", WRAM0 ; buffer for tiles that are visible on screen (20 columns by 18 rows) wTileMap:: ds SCREEN_WIDTH * SCREEN_HEIGHT +; This union spans 480 bytes. UNION ; buffer for temporarily saving and restoring current screen's tiles ; (e.g. if menus are drawn on top) wTileMapBackup:: ds SCREEN_WIDTH * SCREEN_HEIGHT NEXTU +; buffer for the blocks surrounding the player (6 columns by 5 rows of 4x4-tile blocks) +wSurroundingTiles:: ds SURROUNDING_WIDTH * SURROUNDING_HEIGHT + +NEXTU +; buffer for temporarily saving and restoring shadow OAM +wShadowOAMBackup:: +; wShadowOAMBackupSprite00 - wShadowOAMBackupSprite39 +FOR n, NUM_SPRITE_OAM_STRUCTS +wShadowOAMBackupSprite{02d:n}:: sprite_oam_struct wShadowOAMBackupSprite{02d:n} +ENDR +wShadowOAMBackupEnd:: + +NEXTU ; list of indexes to patch with SERIAL_NO_DATA_BYTE after transfer wSerialPartyMonsPatchList:: ds 200 @@ -250,8 +264,6 @@ wYellowIntroAnimatedObjectStructPointer:: db wSurfingMinigameDataEnd:: ENDU - ds 80 - SECTION "Overworld Map", WRAM0 @@ -2488,10 +2500,10 @@ wBoxMonNicksEnd:: wBoxDataEnd:: -SECTION "GBC Palette Data", WRAM0 +SECTION "CGB Palette Data", WRAM0 -wGBCBasePalPointers:: ds NUM_ACTIVE_PALS * 2 -wGBCPal:: ds PALETTE_SIZE +wCGBBasePalPointers:: ds NUM_ACTIVE_PALS * 2 +wCGBPal:: ds PALETTE_SIZE wLastBGP:: db wLastOBP0:: db wLastOBP1:: db |