Skip to content

Commit

Permalink
Fixed a read overrun in death_necklace()
Browse files Browse the repository at this point in the history
This was causing ROM differences (not affecting gameplay) and therefore checksum
mismatches
  • Loading branch information
mcgrew committed Oct 10, 2017
1 parent bf7d6d6 commit 475c5dd
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
2 changes: 1 addition & 1 deletion common/build.h
@@ -1,2 +1,2 @@
/* This file is generated by git */
#define BUILD "328"
#define BUILD "329"
4 changes: 2 additions & 2 deletions common/dwr.c
Expand Up @@ -897,7 +897,7 @@ static void open_charlock(dw_rom *rom)
if (!OPEN_CHARLOCK(rom))
return;

rom->token->map = NO_MAP; /* remove token from the map */
rom->token->map = NO_MAP; /* remove token */

printf("Opening Charlock and removing quest items...\n");
/* remove the quest items since we won't need them */
Expand Down Expand Up @@ -1152,7 +1152,7 @@ static void dwr_death_necklace(dw_rom *rom)

printf("Adding functionality to the death necklace...\n");

vpatch(rom, 0xff64, 32,
vpatch(rom, 0xff64, 31,
/* ff54: */
0x24, 0xcf, /* AND #$80 ; check bit 8 (death necklace) */
0x10, 0x18, /* BPL $FF71 */
Expand Down
10 changes: 9 additions & 1 deletion common/dwr.h
Expand Up @@ -7,7 +7,15 @@
#include "build.h"
#include "sprites.h"

#define VERSION "2.1 beta " BUILD
#define DWR_VERSION "2.0.1"

#ifdef DWR_RELEASE
#define VERSION DWR_VERSION
#elif DWR_ALPHA
#define VERSION DWR_VERSION " alpha " BUILD
#else
#define VERSION DWR_VERSION " beta " BUILD
#endif

#define DEFAULT_FLAGS "CDFGMPRWZ"
#define CHEST_COUNT 31
Expand Down

0 comments on commit 475c5dd

Please sign in to comment.