Skip to content
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

Summary screen #978

Draft
wants to merge 9 commits into
base: 9bit
Choose a base branch
from
Draft

Summary screen #978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c338ca8
Initial Summary Screen
emilyploszaj Aug 9, 2024
b4d643c
Update SetPalettes call
emilyploszaj Aug 9, 2024
1bb2250
Resolve screens not updating after rebase
emilyploszaj Aug 9, 2024
74b310d
Apply suggestions from code review
emilyploszaj Oct 24, 2024
b1f667f
Merge branch '9bit' into summary-screen
emilyploszaj Oct 24, 2024
5a574fd
Grayscale images
emilyploszaj Oct 24, 2024
0b64e7e
Use named tile ids
emilyploszaj Oct 24, 2024
a2ef463
Solve vblank issues, increase speed, add various small visuals
emilyploszaj Dec 21, 2024
a16ed0f
Fix pokeball tile bank
emilyploszaj Dec 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,6 @@ gfx/slots/slots_2.2bpp: tools/gfx += --interleave --png=$<
gfx/slots/slots_3.2bpp: tools/gfx += --interleave --png=$< --remove-duplicates --keep-whitespace --remove-xflip

gfx/stats/judge.2bpp: tools/gfx += --trim-whitespace
gfx/stats/stats_balls.2bpp: gfx/stats/stats.2bpp gfx/stats/balls.2bpp ; $Qcat $^ > $@

gfx/title/crystal.2bpp: tools/gfx += --interleave --png=$<
gfx/title/logo_version.2bpp: gfx/title/logo.2bpp gfx/title/version.2bpp ; $Qcat $^ > $@
Expand Down
2 changes: 1 addition & 1 deletion constants/cgb_constants.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
const CGB_BATTLE_GRAYSCALE
const CGB_BATTLE_COLORS
const CGB_POKEGEAR_PALS
const CGB_STATS_SCREEN_HP_PALS
const CGB_SUMMARY_SCREEN_HP_PALS
const CGB_POKEDEX
const CGB_POKEDEX_PREPARE_ONLY
const CGB_SLOT_MACHINE
Expand Down
2 changes: 1 addition & 1 deletion constants/menu_constants.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
const MONMENUITEM_HEADBUTT ; 11
const MONMENUITEM_ROCKSMASH ; 12
; options
const MONMENUITEM_STATS ; 13
const MONMENUITEM_SUMMARY ; 13
const MONMENUITEM_SWITCH ; 14
const MONMENUITEM_ITEM ; 15
const MONMENUITEM_CANCEL ; 16
Expand Down
11 changes: 11 additions & 0 deletions constants/summary_constants.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
const_def
const SUMMARY_PINK_PAGE
const SUMMARY_BLUE_PAGE
const SUMMARY_GREEN_PAGE
const SUMMARY_ORANGE_PAGE
DEF NUM_SUMMARY_PAGES EQU const_value

; Routines for hblank (see home/lcd.asm)
DEF SUMMARY_LCD_HIDE_WINDOW EQU 0
DEF SUMMARY_LCD_SHOW_WINDOW EQU 1
DEF SUMMARY_LCD_SCROLL_BACKGROUND EQU 2
Loading