Removing graphics from loader

This commit is contained in:
The Gears of Progress 2025-04-06 17:29:22 -04:00
parent 1a68b30c8b
commit 7338828331
7 changed files with 15 additions and 16 deletions

Binary file not shown.

View File

@ -1 +0,0 @@
../../graphics/ptgb_logo_l.grit

View File

@ -1 +0,0 @@
../../graphics/ptgb_logo_l.png

View File

@ -1 +0,0 @@
../../graphics/ptgb_logo_r.grit

View File

@ -1 +0,0 @@
../../graphics/ptgb_logo_r.png

View File

@ -2,8 +2,8 @@
#include <string.h> #include <string.h>
// This file is autogenerated from the file in the graphics folder // This file is autogenerated from the file in the graphics folder
#include "ptgb_logo_l.h" //#include "ptgb_logo_l.h"
#include "ptgb_logo_r.h" //#include "ptgb_logo_r.h"
#include "multiboot_rom_bin.h" #include "multiboot_rom_bin.h"
#define SPRITE_CHAR_BLOCK 4 #define SPRITE_CHAR_BLOCK 4
@ -28,13 +28,14 @@ enum PaletteTypes
PAL_LOGO PAL_LOGO
}; };
OBJ_ATTR obj_buffer[128]; //OBJ_ATTR obj_buffer[128];
OBJ_ATTR* logoL = &obj_buffer[SPRITE_LOGO_L]; //OBJ_ATTR* logoL = &obj_buffer[SPRITE_LOGO_L];
OBJ_ATTR* logoR = &obj_buffer[SPRITE_LOGO_R]; //OBJ_ATTR* logoR = &obj_buffer[SPRITE_LOGO_R];
/** /**
* Taken from sprite_data.cpp * Taken from sprite_data.cpp
*/ */
/*
static void loadSprite(OBJ_ATTR *sprite, const unsigned int objTiles[], int objTilesLen, static void loadSprite(OBJ_ATTR *sprite, const unsigned int objTiles[], int objTilesLen,
u32* tile_id, u32 pal_bank, int attr0, int attr1, u32 priority) u32* tile_id, u32 pal_bank, int attr0, int attr1, u32 priority)
{ {
@ -42,11 +43,12 @@ static void loadSprite(OBJ_ATTR *sprite, const unsigned int objTiles[], int objT
obj_set_attr(sprite, attr0, attr1, ATTR2_PALBANK(pal_bank) | *tile_id | ATTR2_PRIO(priority)); obj_set_attr(sprite, attr0, attr1, ATTR2_PALBANK(pal_bank) | *tile_id | ATTR2_PRIO(priority));
*tile_id += objTilesLen / 32; *tile_id += objTilesLen / 32;
obj_hide(sprite); obj_hide(sprite);
}; };*/
/** /**
* This function exists to simply load and position the Poke Transporter GB logo * This function exists to simply load and position the Poke Transporter GB logo
*/ */
/*
static void load_logo(u32* curSpriteIndex) static void load_logo(u32* curSpriteIndex)
{ {
// load palette // load palette
@ -62,7 +64,7 @@ static void load_logo(u32* curSpriteIndex)
obj_unhide_multi(logoL, 1, 2); obj_unhide_multi(logoL, 1, 2);
oam_copy(oam_mem, obj_buffer, 2); // Update first OAM object oam_copy(oam_mem, obj_buffer, 2); // Update first OAM object
} }*/
/** /**
* Loads the PokeTransporter multiboot rom into EWRAM * Loads the PokeTransporter multiboot rom into EWRAM
@ -85,18 +87,18 @@ static void execute_multiboot()
int main(void) int main(void)
{ {
u32 curSpriteIndex = 0; //u32 curSpriteIndex = 0;
irq_init(NULL); irq_init(NULL);
irq_enable(II_VBLANK); irq_enable(II_VBLANK);
tte_init_chr4c_default(0, BG_CBB(0) | BG_SBB(31)); tte_init_chr4c_default(0, BG_CBB(0) | BG_SBB(31));
tte_set_pos(92, 68); tte_set_pos(92, 68);
tte_write("Loading..."); //tte_write("Loading...");
oam_init(obj_buffer, 128); //oam_init(obj_buffer, 128);
load_logo(&curSpriteIndex); //load_logo(&curSpriteIndex);
REG_DISPCNT = DCNT_MODE0 | DCNT_BG0 | DCNT_OBJ | DCNT_OBJ_1D; REG_DISPCNT = DCNT_MODE0 | DCNT_BG0 | DCNT_OBJ | DCNT_OBJ_1D;

View File

@ -384,6 +384,7 @@ int main(void)
{ {
initalization_script(); initalization_script();
//wow
// Set colors based on current ROM // Set colors based on current ROM
set_background_pal(0, false, false); set_background_pal(0, false, false);