Skip to content

Commit

Permalink
Merge branch 'main' into Famidash-b-sides
Browse files Browse the repository at this point in the history
  • Loading branch information
kandowontu committed Feb 7, 2025
2 parents 7d523d1 + 7c29caf commit 8a048cd
Show file tree
Hide file tree
Showing 8 changed files with 138 additions and 120 deletions.
2 changes: 1 addition & 1 deletion BUILD_FLAGS.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,5 @@
//
// Save File Version
// increase by 1 if SRAM values are added, changed or deleted.
#define FLAG_SAVE_VER 0x15
#define FLAG_SAVE_VER 0x16
// ============================================================
1 change: 1 addition & 0 deletions SAUCE/famidash.c
Original file line number Diff line number Diff line change
Expand Up @@ -204,5 +204,6 @@ void setdefaultoptions() {
invisblocks = 0;
cam_seesaw = 0;
menu_music = 0;
auto_practicepoints = 1;
return;
}
3 changes: 2 additions & 1 deletion SAUCE/famidash.h
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ uint8_t exitingLevelSelect;
uint8_t drawBarFlag;
uint8_t exitPortalTimer;
uint8_t menu_music;

uint8_t auto_practicepoints;


uint8_t jimsheatballalive[MAX_FIREBALLS]; //jims heatball shit
Expand Down Expand Up @@ -340,6 +340,7 @@ uint8_t dashing[2];

uint8_t minicoins;

uint16_t auto_practicepoint_timer;

// Sprite Storage
lohi_arr16_decl(activesprites_x, max_loaded_sprites);
Expand Down
2 changes: 2 additions & 0 deletions SAUCE/functions/reset_game_vars.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ void reset_game_vars(){
practice_orbactive[tmp1] = orbactive;

long_temp_x = high_byte(player_x[0]);
auto_practicepoint_timer = 400;
}


Expand Down Expand Up @@ -147,6 +148,7 @@ void restore_practice_state() {

#undef quick_ld
currplayer_gravity = player_gravity[currplayer];
auto_practicepoint_timer = 400;
}

CODE_BANK_POP()
115 changes: 62 additions & 53 deletions SAUCE/gamestates/state_demo.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,38 +39,39 @@ const unsigned char instructions[448]={



const unsigned char settingscreen[486]={
0x01,0x02,0x01,0x04,0xae,0x02,0x01,0x13,0xae,0x02,0x01,0x09,0xaf,0x02,0x01,0x13,
0xaf,0x02,0x01,0x06,0x06,0x07,0x04,0x01,0x17,0x06,0x07,0x02,0x01,0x03,0x08,0x09,
0x05,0x01,0x17,0x08,0x09,0x02,0x01,0x03,0x0c,0xff,0x01,0x19,0x0d,0x02,0x01,0x03,
0x0c,0xff,0x01,0x08,0xf3,0xe5,0xf4,0xf4,0xe9,0xee,0xe7,0xf3,0xff,0x01,0x08,0x0d,
0x02,0x01,0x03,0x0c,0xff,0x01,0x19,0x0d,0x02,0x01,0x03,0x0c,0xff,0x01,0x02,0x7c,
0xb2,0x02,0xca,0xc6,0xbb,0xde,0xbf,0xcc,0x02,0x01,0x0a,0x0f,0x7d,0xff,0x0d,0x02,
0x01,0x03,0x0c,0xff,0x01,0x19,0x0d,0x02,0x01,0x03,0x0c,0xff,0x01,0x02,0x7c,0xca,
0xb1,0x02,0xbd,0xc9,0xc8,0xce,0xcc,0xc9,0xc6,0xcd,0x02,0xca,0xb2,0x02,0x01,0x04,
const unsigned char settingscreen[506]={
0x01,0x02,0x02,0x06,0x07,0x04,0x01,0x17,0x06,0x07,0x02,0x01,0x03,0x08,0x09,0x05,
0x01,0x17,0x08,0x09,0x02,0x01,0x03,0x0c,0xff,0x01,0x19,0x0d,0x02,0x01,0x03,0x0c,
0xff,0x01,0x08,0xf3,0xe5,0xf4,0xf4,0xe9,0xee,0xe7,0xf3,0xff,0x01,0x08,0x0d,0x02,
0x01,0x03,0x0c,0xff,0x01,0x19,0x0d,0x02,0x01,0x03,0x0c,0xff,0x01,0x02,0x7c,0xb2,
0x02,0xca,0xc6,0xbb,0xde,0xbf,0xcc,0x02,0x01,0x0a,0x0f,0x7d,0xff,0x0d,0x02,0x01,
0x03,0x0c,0xff,0x01,0x19,0x0d,0x02,0x01,0x03,0x0c,0xff,0x01,0x02,0x7c,0xca,0xb1,
0x02,0xbd,0xc9,0xc8,0xce,0xcc,0xc9,0xc6,0xcd,0x02,0xca,0xb2,0x02,0x01,0x04,0x0f,
0x7d,0xff,0x0d,0x02,0x01,0x03,0x0c,0xff,0x01,0x19,0x0d,0x02,0x01,0x03,0x0c,0xff,
0x01,0x02,0x7c,0xcd,0xc9,0xcf,0xc8,0xbe,0x02,0xbf,0xc0,0xc0,0xbf,0xbd,0xce,0xcd,
0x02,0x01,0x05,0x0f,0x7d,0xff,0x0d,0x02,0x01,0x03,0x0c,0xff,0x01,0x19,0x0d,0x02,
0x01,0x03,0x0c,0xff,0x01,0x02,0x7c,0xc7,0xcf,0xcd,0xc3,0xbd,0x02,0x01,0x0d,0x0f,
0x7d,0xff,0x0d,0x02,0x01,0x03,0x0c,0xff,0x01,0x19,0x0d,0x02,0x01,0x03,0x0c,0xff,
0x01,0x02,0x7c,0xbd,0xc6,0xc3,0xbd,0xc5,0x02,0xcd,0xc9,0xcf,0xc8,0xbe,0x02,0x01,
0x07,0x0f,0x7d,0xff,0x0d,0x02,0x01,0x03,0x0c,0xff,0x01,0x19,0x0d,0x02,0x01,0x03,
0x0c,0xff,0x01,0x02,0x7c,0xdb,0xc3,0xcd,0xcf,0xbb,0xc6,0x02,0xbf,0xc0,0xc0,0xbf,
0xbd,0xce,0xcd,0x02,0x01,0x04,0x0f,0x7d,0xff,0x0d,0x02,0x01,0x03,0x0c,0xff,0x01,
0x19,0x0d,0x02,0x01,0x03,0x0c,0xff,0x01,0x02,0x7c,0xbf,0xdd,0xce,0xcc,0xbb,0x02,
0xce,0xcc,0xbb,0xc3,0xc6,0xcd,0x02,0x01,0x06,0x0f,0x7d,0xff,0x0d,0x02,0x01,0x03,
0x0c,0xff,0x01,0x19,0x0d,0x02,0x01,0x03,0x0c,0xff,0x01,0x02,0x7c,0xbb,0xcf,0xce,
0xc9,0x02,0xbd,0xc2,0xbf,0xbd,0xc5,0xca,0xc9,0xc3,0xc8,0xce,0xcd,0x02,0x01,0x02,
0x0f,0x7d,0xff,0x0d,0x02,0x01,0x03,0x0c,0xff,0x01,0x19,0x0d,0x02,0x01,0x03,0x0c,
0xff,0x01,0x02,0x7c,0xcd,0xc9,0xcf,0xc8,0xbe,0x02,0xbf,0xc0,0xc0,0xbf,0xbd,0xce,
0xcd,0x02,0x01,0x05,0x0f,0x7d,0xff,0x0d,0x02,0x01,0x03,0x0c,0xff,0x01,0x19,0x0d,
0x02,0x01,0x03,0x0c,0xff,0x01,0x02,0x7c,0xc7,0xcf,0xcd,0xc3,0xbd,0x02,0x01,0x0d,
0x0f,0x7d,0xff,0x0d,0x02,0x01,0x03,0x0c,0xff,0x01,0x19,0x0d,0x02,0x01,0x03,0x0c,
0xff,0x01,0x02,0x7c,0xbd,0xc6,0xc3,0xbd,0xc5,0x02,0xcd,0xc9,0xcf,0xc8,0xbe,0x02,
0x01,0x07,0x0f,0x7d,0xff,0x0d,0x02,0x01,0x03,0x0c,0xff,0x01,0x19,0x0d,0x02,0x01,
0x03,0x0c,0xff,0x01,0x02,0x7c,0xdb,0xc3,0xcd,0xcf,0xbb,0xc6,0x02,0xbf,0xc0,0xc0,
0xbf,0xbd,0xce,0xcd,0x02,0x01,0x04,0x0f,0x7d,0xff,0x0d,0x02,0x01,0x03,0x0c,0xff,
0x01,0x19,0x0d,0x02,0x01,0x03,0x0c,0xff,0x01,0x02,0x7c,0xbf,0xdd,0xce,0xcc,0xbb,
0x02,0xce,0xcc,0xbb,0xc3,0xc6,0xcd,0x02,0x01,0x06,0x0f,0x7d,0xff,0x0d,0x02,0x01,
0x03,0x0c,0xff,0x01,0x19,0x0d,0x02,0x01,0x03,0x0c,0xff,0x01,0x02,0x7c,0xdc,0xc3,
0xca,0xbf,0x02,0xcd,0xbb,0xdb,0xbf,0x02,0x01,0x0a,0x7d,0xff,0x0d,0x02,0x01,0x03,
0x0c,0xff,0x01,0x0d,0xe1,0xff,0x18,0xff,0xf3,0xf4,0xe1,0xf2,0xf4,0xff,0x01,0x02,
0x0d,0x02,0x01,0x03,0x0c,0xff,0x01,0x19,0x0d,0x02,0x01,0x03,0x0c,0xff,0xf0,0xf2,
0xe5,0xf3,0xf3,0xff,0xe2,0xff,0xf4,0xef,0xff,0xf3,0xe1,0xf6,0xe5,0xff,0xe0,0xff,
0xf2,0xe5,0xf4,0xf5,0xf2,0xee,0xff,0x0d,0x02,0x01,0x03,0x0c,0xff,0x01,0x19,0x0d,
0x02,0x01,0x03,0x0a,0x0b,0x04,0x01,0x09,0x06,0x0e,0x0e,0x07,0x04,0x01,0x09,0x0a,
0x0b,0x02,0x01,0x05,0x05,0x01,0x09,0x08,0x05,0x05,0x09,0x05,0x01,0x09,0x02,0x01,
0x43,0xff,0x5c,0x5f,0x01,0x03,0x53,0xff,0x77,0x00,0x01,0x04,0x40,0xdd,0x77,0x00,
0x01,0x04,0x44,0xdd,0x77,0x00,0x01,0x04,0x44,0xdd,0x77,0x00,0x01,0x04,0x44,0xdd,
0x77,0x08,0x0a,0x0a,0x00,0x00,0x40,0xdd,0xf7,0x50,0x50,0xd0,0x70,0x50,0x50,0xfd,
0x0f,0x01,0x06,0x0f,0x01,0x00
0xff,0x01,0x02,0x7c,0xdc,0xc3,0xca,0xbf,0x02,0xcd,0xbb,0xdb,0xbf,0x02,0x01,0x0a,
0x7d,0xff,0x0d,0x02,0x01,0x03,0x0c,0xff,0x01,0x0d,0xe1,0xff,0x18,0xff,0xf3,0xf4,
0xe1,0xf2,0xf4,0xff,0x01,0x02,0x0d,0x02,0x01,0x03,0x0c,0xff,0x01,0x19,0x0d,0x02,
0x01,0x03,0x0c,0xff,0xf0,0xf2,0xe5,0xf3,0xf3,0xff,0xe2,0xff,0xf4,0xef,0xff,0xf3,
0xe1,0xf6,0xe5,0xff,0xe0,0xff,0xf2,0xe5,0xf4,0xf5,0xf2,0xee,0xff,0x0d,0x02,0x01,
0x03,0x0c,0xff,0x01,0x19,0x0d,0x02,0x01,0x03,0x0a,0x0b,0x04,0x01,0x09,0x06,0x0e,
0x0e,0x07,0x04,0x01,0x09,0x0a,0x0b,0x02,0x01,0x05,0x05,0x01,0x09,0x08,0x05,0x05,
0x09,0x05,0x01,0x09,0x02,0x01,0x43,0x7f,0x05,0x01,0x05,0xdf,0x77,0x00,0x01,0x04,
0x44,0xdd,0x77,0x00,0x01,0x04,0x44,0xdd,0x77,0x00,0x01,0x04,0x44,0xdd,0x77,0x00,
0x01,0x04,0x44,0xdd,0x77,0x08,0x0a,0x0a,0x00,0x00,0x40,0xdd,0xf7,0x50,0x50,0xd0,
0x70,0x50,0x50,0xfd,0x0f,0x01,0x06,0x0f,0x01,0x00
};

const unsigned char Credits[340]={
Expand Down Expand Up @@ -338,7 +339,7 @@ void settings() {
mmc3_set_2kb_chr_bank_0(0xFF);
mmc3_set_2kb_chr_bank_1(MOUSEBANK);
ppu_on_all();
one_vram_buffer('c', NTADR_A(4, 7)); // settingvalue is set to 0 beforehand
one_vram_buffer('c', NTADR_A(4, 5)); // settingvalue is set to 0 beforehand
pal_fade_to_withmusic(0,4);
while (1) {
ppu_wait_nmi();
Expand All @@ -347,53 +348,59 @@ void settings() {
mouse_and_cursor();
// read the first controller

if (twoplayer) one_vram_buffer('g', NTADR_A(26, 7));
if (twoplayer) one_vram_buffer('g', NTADR_A(26, 5));
else one_vram_buffer('f', NTADR_A(26, 5));

if (options & oneptwoplayer) one_vram_buffer('g', NTADR_A(26, 7));
else one_vram_buffer('f', NTADR_A(26, 7));

if (options & oneptwoplayer) one_vram_buffer('g', NTADR_A(26, 9));
else one_vram_buffer('f', NTADR_A(26, 9));
if (options & sfxoff) one_vram_buffer('f', NTADR_A(26, 9));
else one_vram_buffer('g', NTADR_A(26, 9));

if (options & sfxoff) one_vram_buffer('f', NTADR_A(26, 11));
if (options & musicoff) one_vram_buffer('f', NTADR_A(26, 11));
else one_vram_buffer('g', NTADR_A(26, 11));

if (options & musicoff) one_vram_buffer('f', NTADR_A(26, 13));
else one_vram_buffer('g', NTADR_A(26, 13));
if (options & jumpsound) one_vram_buffer('g', NTADR_A(26, 13));
else one_vram_buffer('f', NTADR_A(26, 13));

if (options & jumpsound) one_vram_buffer('g', NTADR_A(26, 15));
if (viseffects) one_vram_buffer('g', NTADR_A(26, 15));
else one_vram_buffer('f', NTADR_A(26, 15));

if (viseffects) one_vram_buffer('g', NTADR_A(26, 17));
if (trails == 1) one_vram_buffer('g', NTADR_A(26, 17));
else if (trails == 2) one_vram_buffer('*', NTADR_A(26, 17));
else one_vram_buffer('f', NTADR_A(26, 17));

if (trails == 1) one_vram_buffer('g', NTADR_A(26, 19));
else if (trails == 2) one_vram_buffer('*', NTADR_A(26, 19));
if (auto_practicepoints) one_vram_buffer('g', NTADR_A(26, 19));
else one_vram_buffer('f', NTADR_A(26, 19));

tmp1 = settingvalue;

if (mouse.left_press) {
if (mouse.x >= 0x2D && mouse.x <= 0xDD) {
if (mouse.y >= 0x34 && mouse.y <= 0x3C) {
if (mouse.y >= 0x24 && mouse.y <= 0x2C) {
settingvalue = 0; set_settings();
}
else if (mouse.y >= 0x44 && mouse.y <= 0x4C) {
else if (mouse.y >= 0x34 && mouse.y <= 0x4C) {
settingvalue = 1; set_settings();
}
else if (mouse.y >= 0x54 && mouse.y <= 0x5C) {
else if (mouse.y >= 0x44 && mouse.y <= 0x4C) {
settingvalue = 2; set_settings();
}
else if (mouse.y >= 0x64 && mouse.y <= 0x6C) {
else if (mouse.y >= 0x54 && mouse.y <= 0x5C) {
settingvalue = 3; set_settings();
}
else if (mouse.y >= 0x74 && mouse.y <= 0x7C) {
else if (mouse.y >= 0x64 && mouse.y <= 0x6C) {
settingvalue = 4; set_settings();
}
else if (mouse.y >= 0x84 && mouse.y <= 0x8C) {
else if (mouse.y >= 0x74 && mouse.y <= 0x7C) {
settingvalue = 5; set_settings();
}
else if (mouse.y >= 0x94 && mouse.y <= 0x9C) {
else if (mouse.y >= 0x84 && mouse.y <= 0x8C) {
settingvalue = 6; set_settings();
}
else if (mouse.y >= 0x94 && mouse.y <= 0x9C) {
settingvalue = 7; set_settings();
}

}
if ((mouse.x >= 0x1D && mouse.x <= 0xDD) && (mouse.y >= 0xBC && mouse.y <= 0xC4)) {
Expand All @@ -403,20 +410,20 @@ void settings() {
}

if (joypad1.press & (PAD_RIGHT | PAD_DOWN)) {
if (settingvalue == 7) { settingvalue = 0; }
if (settingvalue == 8) { settingvalue = 0; }
else { settingvalue++; }
}

if (joypad1.press & (PAD_LEFT | PAD_UP)) {
if (settingvalue == 0) { settingvalue = 7; }
if (settingvalue == 0) { settingvalue = 8; }
else { settingvalue--; }
}

if (tmp1 != settingvalue) {
// NTADR_A = (NAMETABLE_A|(((y)<<5)|(x)))
// (tmp1 * 2) << 5 = tmp1<<6 = (tmp1<<8)>>2
one_vram_buffer(' ', NTADR_A(4, 7)+((tmp1<<8)>>2));
one_vram_buffer('c', NTADR_A(4, 7)+((settingvalue<<8)>>2));
one_vram_buffer(' ', NTADR_A(4, 5)+((tmp1<<8)>>2));
one_vram_buffer('c', NTADR_A(4, 5)+((settingvalue<<8)>>2));
}

if (joypad1.press & (PAD_A | PAD_START)) {
Expand Down Expand Up @@ -507,6 +514,8 @@ void set_settings() {
case 6:
trails = trails == 2 ? 0 : trails + 1; break;
case 7:
auto_practicepoints ^= 1; break;
case 8:
if (joypad1.a && joypad1.press_start) {
setdefaultoptions();
__asm__("JMP ($FFFC)"); // restart the game lmao
Expand Down
4 changes: 4 additions & 0 deletions SAUCE/gamestates/state_game.h
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,10 @@ void state_game(){

if ((controllingplayer->press_b) && practice_point_count && !(twoplayer && (options & oneptwoplayer))) crossPRGBankJump0(reset_game_vars);

if (auto_practicepoint_timer) auto_practicepoint_timer--;

if (practice_point_count && !auto_practicepoint_timer) { crossPRGBankJump0(reset_game_vars); }

if (joypad1.press_right && DEBUG_MODE && !(options & platformer)) {
invert_gravity(currplayer_gravity);
}
Expand Down
68 changes: 34 additions & 34 deletions menus/Settings.nss
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ BtnMetatileEditor_Map=0
ChkSwapBanks_Properties=1
ChkSwapBanks_Labels=1
VarTileViewTagBuf=0
VarBgPalCur=3
VarBgPalCur=1
VarPalActive=0
VarTileActive=2
VarTileActive=205
VarBankActive=0
VarPPUMask=0
VarPPUMaskSet0=0
Expand All @@ -62,15 +62,15 @@ VarNameH=30
VarNameViewX=0
VarNameViewY=-1
VarNameSelectionL=-1
VarNameSelectionR=14
VarNameSelectionR=8
VarNameSelectionT=-1
VarNameSelectionB=19
VarNameCopyW=7
VarNameCopyH=1
VarCHRSelectionL=2
VarCHRSelectionR=3
VarCHRSelectionT=0
VarCHRSelectionB=1
VarNameSelectionB=5
VarNameCopyW=22
VarNameCopyH=15
VarCHRSelectionL=13
VarCHRSelectionR=14
VarCHRSelectionT=12
VarCHRSelectionB=13
VarCHRCopyW=1
VarCHRCopyH=1
VarCHRCopyRect=1
Expand All @@ -95,7 +95,7 @@ VarMetatileSets_8x8=2
VarUndo_metatileSets_8x8=2
VarCheckpoint_metatileSets_8x8=2
VarUndo_checkpoint_metatileSets_8x8=2
VarCustomScanlineWarningCyan=0
VarCustomScanlineWarningCyan=1
VarBrushPresetIndex=0
BtnStateMtProps0=0
BtnStateMtProps1=0
Expand Down Expand Up @@ -144,7 +144,7 @@ RadioAutoexport_UseSubDir_NEXXT=0
CheckAutoexport_MetatileAsBMP=0


VarCHRSelected=00[2]0100[fd]
VarCHRSelected=00[cd]0100[32]


Palette=170f1030170f2a28170f1626170f11300f1121310f1222320f1323330f1424340f1525350f1626360f1727370f1828380f1929390f1a2a3a0f1b2b3b0f1c2c3c
Expand All @@ -162,22 +162,22 @@ CHRUndo=ff[10]00[8]ff[10]00[8]ff[8]00[8]ff[8]00ff[7]00[6]ff[8]00[2]ff[8]00[2]3f[
CHRCopy=e0f8feff[2]fef8e00060787e[2]786000ffe7dba5[2]dbe7ff00183c7e[2]3c1800ff[3]8081[3]f17e[2]7f[2]7e[3]0eff[3]0181[3]f17e[2]fe[2]7e[3]0e11[2]1f00[5]0e[2]00[6]ff81bd[4]81ff007e425a[2]427e00[fa1]


NameTable=02[5]ae02[14]ae02[a]af02[14]af02[7]060704[18]060702[4]080905[18]080902[4]0cff[1a]0d02[4]0cff[9]f3e5f4[2]e9eee7f3ff[9]0d02[4]0cff[1a]0d02[4]0cff[3]7cb202cac6bbdebfcc02[b]0f7dff0d02[4]0cff[1a]0d02[4]0cff[3]7ccab102bdc9c8ceccc9c6cd02cab202[5]0f7dff0d02[4]0cff[1a]0d02[4]0cff[3]7ccdc9cfc8be02bfc0[2]bfbdcecd02[6]0f7dff0d02[4]0cff[1a]0d02[4]0cff[3]7cc7cfcdc3bd02[e]0f7dff0d02[4]0cff[1a]0d02[4]0cff[3]7cbdc6c3bdc502cdc9cfc8be02[8]0f7dff0d02[4]0cff[1a]0d02[4]0cff[3]7cdbc3cdcfbbc602bfc0[2]bfbdcecd02[5]0f7dff0d02[4]0cff[1a]0d02[4]0cff[3]7cbfddceccbb02ceccbbc3c6cd02[7]0f7dff0d02[4]0cff[1a]0d02[4]0cff[3]7cdcc3cabf02cdbbdbbf02[b]7dff0d02[4]0cff[e]e1ff18fff3f4e1f2f4ff[3]0d02[4]0cff[1a]0d02[4]0cfff0f2e5f3[2]ffe2fff4effff3e1f6e5ffe0fff2e5f4f5f2eeff0d02[4]0cff[1a]0d02[4]0a0b04[a]060e[2]0704[a]0a0b02[6]05[a]0805[2]0905[a]02[44]
NameTable=02[2]060704[18]060702[4]080905[18]080902[4]0cff[1a]0d02[4]0cff[9]f3e5f4[2]e9eee7f3ff[9]0d02[4]0cff[1a]0d02[4]0cff[3]7cb202cac6bbdebfcc02[b]0f7dff0d02[4]0cff[1a]0d02[4]0cff[3]7ccab102bdc9c8ceccc9c6cd02cab202[5]0f7dff0d02[4]0cff[1a]0d02[4]0cff[3]7ccdc9cfc8be02bfc0[2]bfbdcecd02[6]0f7dff0d02[4]0cff[1a]0d02[4]0cff[3]7cc7cfcdc3bd02[e]0f7dff0d02[4]0cff[1a]0d02[4]0cff[3]7cbdc6c3bdc502cdc9cfc8be02[8]0f7dff0d02[4]0cff[1a]0d02[4]0cff[3]7cdbc3cdcfbbc602bfc0[2]bfbdcecd02[5]0f7dff0d02[4]0cff[1a]0d02[4]0cff[3]7cbfddceccbb02ceccbbc3c6cd02[7]0f7dff0d02[4]0cff[1a]0d02[4]0cff[3]7cbbcfcec902bdc2bfbdc5cac9c3c8cecd02[3]0f7dff0d02[4]0cff[1a]0d02[4]0cff[3]7cdcc3cabf02cdbbdbbf02[b]7dff0d02[4]0cff[e]e1ff18fff3f4e1f2f4ff[3]0d02[4]0cff[1a]0d02[4]0cfff0f2e5f3[2]ffe2fff4effff3e1f6e5ffe0fff2e5f4f5f2eeff0d02[4]0cff[1a]0d02[4]0a0b04[a]060e[2]0704[a]0a0b02[6]05[a]0805[2]0905[a]02[44]


NameCopy=bfc0[2]bfbdcecdceccc9c6cd02b2ca02[5]0f7dff[16]7ccdc9cfc8be02bfc0[2]bfbdcecd02[6]0f7dff[16]7cc7cfcdc3bd02[e]0f7dff[16]7cc4cfc7ca02cdc9cfc8be02[9]0f7dff[16]7cbebfbdc9ccbbcec3c9c8cd02[8]0f7dff[16]7cceccbbc3c6cd02[d]0f7dff[16]7cdcc3cabf02cdbbdbbf02[a]0f7dff[b]e1ff18fff3f4e1f2f4ff[2]00[28c]
NameCopy=ff[6]f3e5f4[2]e9eee7f3ff[1e]7cb202cac6bbdebfcc02[b]0f7dff[16]7ccab102bdc9c8ceccc9c6cd02cab202[5]0f7dff[16]7ccdc9cfc8be02bfc0[2]bfbdcecd02[6]0f7dff[16]7cc7cfcdc3bd02[e]0f7dff[16]7cbdc6c3bdc502cdc9cfc8be02[8]0f7dff[16]7cdbc3cdcfbbc602bfc0[2]bfbdcecd02[5]0f7dff[16]7cbfddceccbb02ceccbbc3c6cd02[7]0f7d00[276]


NameUndo=02[5]ae02[14]ae02[a]af02[14]af02[7]060704[18]060702[4]080905[18]080902[4]0cff[1a]0d02[4]0cff[9]f3e5f4[2]e9eee7f3ff[9]0d02[4]0cff[1a]0d02[4]0cff[3]7cb202cac6bbdebfcc02[b]0f7dff0d02[4]0cff[1a]0d02[4]0cff[3]7ccab102bdc9c8ceccc9c6cd02cab202[5]0f7dff0d02[4]0cff[1a]0d02[4]0cff[3]7ccdc9cfc8be02bfc0[2]bfbdcecd02[6]0f7dff0d02[4]0cff[1a]0d02[4]0cff[3]7cc7cfcdc3bd02[e]0f7dff0d02[4]0cff[1a]0d02[4]0cff[3]7cbdc6c3bdc502cdc9cfc8be02[8]0f7dff0d02[4]0cff[1a]0d02[4]0cff[3]7cdbc3cdcfbbc602bfc0[2]bfbdcecd02[5]0f7dff0d02[4]0cff[1a]0d02[4]0cff[3]7cbfddceccbb02ceccbbc3c6cd[2]02[6]0f7dff0d02[4]0cff[1a]0d02[4]0cff[3]7cdcc3cabf02cdbbdbbf02[b]7dff0d02[4]0cff[e]e1ff18fff3f4e1f2f4ff[3]0d02[4]0cff[1a]0d02[4]0cfff0f2e5f3[2]ffe2fff4effff3e1f6e5ffe0fff2e5f4f5f2eeff0d02[4]0cff[1a]0d02[4]0a0b04[a]060e[2]0704[a]0a0b02[6]05[a]0805[2]0905[a]02[44]
NameUndo=02[2]060704[18]060702[4]080905[18]080902[4]0cff[1a]0d02[4]0cff[9]f3e5f4[2]e9eee7f3ff[9]0d02[4]0cff[1a]0d02[4]0cff[3]7cb202cac6bbdebfcc02[b]0f7dff0d02[4]0cff[1a]0d02[4]0cff[3]7ccab102bdc9c8ceccc9c6cd02cab202[5]0f7dff0d02[4]0cff[1a]0d02[4]0cff[3]7ccdc9cfc8be02bfc0[2]bfbdcecd02[6]0f7dff0d02[4]0cff[1a]0d02[4]0cff[3]7cc7cfcdc3bd02[e]0f7dff0d02[4]0cff[1a]0d02[4]0cff[3]7cbdc6c3bdc502cdc9cfc8be02[8]0f7dff0d02[4]0cff[1a]0d02[4]0cff[3]7cdbc3cdcfbbc602bfc0[2]bfbdcecd02[5]0f7dff0d02[4]0cff[1a]0d02[4]0cff[3]7cbfddceccbb02ceccbbc3c6cd02[7]0f7dff0d02[4]0cff[1a]0d02[4]0cff[3]7cbbcfcec902bdc2bfbdc5cac9c3c8ce02[4]0f7dff0d02[4]0cff[1a]0d02[4]0cff[3]7cdcc3cabf02cdbbdbbf02[b]7dff0d02[4]0cff[e]e1ff18fff3f4e1f2f4ff[3]0d02[4]0cff[1a]0d02[4]0cfff0f2e5f3[2]ffe2fff4effff3e1f6e5ffe0fff2e5f4f5f2eeff0d02[4]0cff[1a]0d02[4]0a0b04[a]060e[2]0704[a]0a0b02[6]05[a]0805[2]0905[a]02[44]


AttrTable=ff5c5f[4]53ff7700[5]40dd7700[5]44dd7700[5]44dd7700[5]44dd77080a[2]00[2]40ddf750[2]d07050[2]fd0f[8]
AttrTable=7f05[6]df7700[5]44dd7700[5]44dd7700[5]44dd7700[5]44dd77080a[2]00[2]40ddf750[2]d07050[2]fd0f[8]


AttrCopy=00[14]01[2]00[14]01[2]00[14]
AttrCopy=00[2a]01[2]00[14]


AttrUndo=ff5c5f[4]53ff7700[5]40dd7700[5]44dd7700[5]44dd7700[5]44dd77080a[2]00[2]40ddf750[2]d07050[2]fd0f[8]
AttrUndo=7f05[6]df7700[5]44dd7700[5]44dd7700[5]44dd7700[5]44dd77080a[2]00[2]40ddf750[2]d07050[2]fd0f[8]


MetaSprites=ff[10000]
Expand Down Expand Up @@ -315,18 +315,18 @@ MetatileSet_8x8_props=00[2000]
MetatileSet_8x8_propsUndo=00[2000]


MetatileSetLabels_2x2=Unlabeled,Unlabeled,Unlabeled,Unlabeled
MetatileSetLabels_2x2Undo=Unlabeled,Unlabeled,Unlabeled,Unlabeled
MetatileSetLabels_2x2=Unlabeled,Unlabeled,Unlabeled,Unlabeled
MetatileSetLabels_2x2Undo=Unlabeled,Unlabeled,Unlabeled,Unlabeled

MetatileSetLabels_4x4=Unlabeled,Unlabeled,Unlabeled,Unlabeled
MetatileSetLabels_4x4Undo=Unlabeled,Unlabeled,Unlabeled,Unlabeled
MetatileSetLabels_4x4=Unlabeled,Unlabeled,Unlabeled,Unlabeled
MetatileSetLabels_4x4Undo=Unlabeled,Unlabeled,Unlabeled,Unlabeled

MetatileSetLabels_8x8=Unlabeled,Unlabeled
MetatileSetLabels_8x8Undo=Unlabeled,Unlabeled
MetatileSetLabels_8x8=Unlabeled,Unlabeled
MetatileSetLabels_8x8Undo=Unlabeled,Unlabeled

CHRBankLabels=Unlabeled,Unlabeled,Unlabeled,Unlabeled
CHRBankLabels=Unlabeled,Unlabeled,Unlabeled,Unlabeled

CHRBankLabelsUndo=Unlabeled,Unlabeled,Unlabeled,Unlabeled
CHRBankLabelsUndo=Unlabeled,Unlabeled,Unlabeled,Unlabeled

Checkpoint_Palette=00[40]

Expand Down Expand Up @@ -433,15 +433,15 @@ Checkpoint_MetatileSet_8x8_props=00[2000]
Checkpoint_MetatileSet_8x8_propsUndo=00[2000]


Checkpoint_MetatileSetLabels_2x2=Unlabeled,Unlabeled,Unlabeled,Unlabeled
Checkpoint_MetatileSetLabels_2x2Undo=Unlabeled,Unlabeled,Unlabeled,Unlabeled
Checkpoint_MetatileSetLabels_2x2=Unlabeled,Unlabeled,Unlabeled,Unlabeled
Checkpoint_MetatileSetLabels_2x2Undo=Unlabeled,Unlabeled,Unlabeled,Unlabeled

Checkpoint_MetatileSetLabels_4x4=Unlabeled,Unlabeled,Unlabeled,Unlabeled
Checkpoint_MetatileSetLabels_4x4Undo=Unlabeled,Unlabeled,Unlabeled,Unlabeled
Checkpoint_MetatileSetLabels_4x4=Unlabeled,Unlabeled,Unlabeled,Unlabeled
Checkpoint_MetatileSetLabels_4x4Undo=Unlabeled,Unlabeled,Unlabeled,Unlabeled

Checkpoint_MetatileSetLabels_8x8=Unlabeled,Unlabeled
Checkpoint_MetatileSetLabels_8x8Undo=Unlabeled,Unlabeled
Checkpoint_MetatileSetLabels_8x8=Unlabeled,Unlabeled
Checkpoint_MetatileSetLabels_8x8Undo=Unlabeled,Unlabeled

Checkpoint_CHRBankLabels=Unlabeled,Unlabeled,Unlabeled,Unlabeled
Checkpoint_CHRBankLabels=Unlabeled,Unlabeled,Unlabeled,Unlabeled

Checkpoint_CHRBankLabelsUndo=Unlabeled,Unlabeled,Unlabeled,Unlabeled
Checkpoint_CHRBankLabelsUndo=Unlabeled,Unlabeled,Unlabeled,Unlabeled
Expand Down
Loading

0 comments on commit 8a048cd

Please sign in to comment.