projects
/
gbajam22
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added rudimentary menu screen
[gbajam22]
/
src
/
gamescr.c
diff --git
a/src/gamescr.c
b/src/gamescr.c
index
383ea9d
..
cc089f2
100644
(file)
--- a/
src/gamescr.c
+++ b/
src/gamescr.c
@@
-68,6
+68,7
@@
static int32_t xform_sa, xform_ca; /* for viewport bank/zoom */
static int xform_s;
static short vblcount;
static int xform_s;
static short vblcount;
+static void *prev_iwram_top;
static inline void xform_pixel(int *xp, int *yp);
static inline void xform_pixel(int *xp, int *yp);
@@
-84,6
+85,8
@@
static int gamescr_start(void)
uint8_t *cptr;
struct enemy *enemy;
uint8_t *cptr;
struct enemy *enemy;
+ prev_iwram_top = iwram_sbrk(0);
+
gba_setmode(4, DISPCNT_BG2 | DISPCNT_OBJ | DISPCNT_FB1);
vblperf_setcolor(0);
gba_setmode(4, DISPCNT_BG2 | DISPCNT_OBJ | DISPCNT_FB1);
vblperf_setcolor(0);
@@
-169,6
+172,7
@@
endspawn:
static void gamescr_stop(void)
{
static void gamescr_stop(void)
{
+ iwram_brk(prev_iwram_top);
}
static void gamescr_frame(void)
}
static void gamescr_frame(void)
@@
-219,8
+223,9
@@
static void update(void)
update_keyb();
update_keyb();
- if(KEYPRESS(BN_SELECT)) {
- vox_quality ^= 1;
+ if(KEYPRESS(BN_START)) {
+ /* TODO pause menu */
+ change_screen(find_screen("menu"));
}
if(keystate) {
}
if(keystate) {
@@
-386,8
+391,6
@@
static void gamescr_vblank(void)
REG_BG2PC = -sa;
REG_BG2PD = ca;
REG_BG2PC = -sa;
REG_BG2PD = ca;
- keystate = ~REG_KEYINPUT;
-
if((keystate & (BN_LEFT | BN_RIGHT)) == 0) {
if(bank) {
bank -= bankdir << 4;
if((keystate & (BN_LEFT | BN_RIGHT)) == 0) {
if(bank) {
bank -= bankdir << 4;