Skip to content

Commit

Permalink
fixes, add shop icon to minimap
Browse files Browse the repository at this point in the history
  • Loading branch information
evanbowman committed Sep 18, 2020
1 parent af29033 commit 1e58f40
Show file tree
Hide file tree
Showing 19 changed files with 66 additions and 52 deletions.
Binary file modified images/overlay.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/spritesheet2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/spritesheet3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/spritesheet4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions source/data/overlay.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
// + 504 tiles not compressed
// Total size: 512 + 16128 = 16640
//
// Time-stamp: 2020-09-18, 12:17:04
// Exported by Cearn's GBA Image Transmogrifier, v0.8.16
// Time-stamp: 2020-09-18, 18:48:06
// Exported by Cearn's GBA Image Transmogrifier, v0.8.15
// ( http://www.coranac.com/projects/#grit )
//
//======================================================================
Expand Down
38 changes: 19 additions & 19 deletions source/data/overlay.s
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
@ + 504 tiles not compressed
@ Total size: 512 + 16128 = 16640
@
@ Time-stamp: 2020-09-18, 12:17:04
@ Exported by Cearn's GBA Image Transmogrifier, v0.8.16
@ Time-stamp: 2020-09-18, 18:48:06
@ Exported by Cearn's GBA Image Transmogrifier, v0.8.15
@ ( http://www.coranac.com/projects/#grit )
@
@=======================================================================
Expand Down Expand Up @@ -167,15 +167,15 @@ overlayTiles:
.word 0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000
.word 0x11111111,0x11111111,0x11111111,0x11111111,0x1111F111,0x11111111,0x11111111,0x11111111
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0xEEEEEEEE,0xEEEEEEEE,0xEEEEEEEE,0xEEEBBEEE,0xEEEBBEEE,0xEEEEEEEE,0xEEEEEEEE,0xEEEEEEEE
.word 0xEEEEEEEE,0xEEEEEEEE,0xEEEEEEEE,0xEEECCEEE,0xEEECCEEE,0xEEEEEEEE,0xEEEEEEEE,0xEEEEEEEE
.word 0x33999933,0x39999333,0x99993333,0x99933339,0x99333399,0x93333999,0x33339999,0x33399993
.word 0x66999966,0x69999666,0x99996666,0x99966669,0x99666699,0x96666999,0x66669999,0x66699996
.word 0xEEEEEEEE,0xE222222E,0xE222222E,0xE222222E,0xE555555E,0xECC55CCE,0xECCCCCCE,0xEEEEEEEE
.word 0xEEEEEEEE,0xE222222E,0xE222222E,0xE222222E,0xE555555E,0xEBB55BBE,0xEBBBBBBE,0xEEEEEEEE
.word 0xEEE11EE1,0xE9EEE9E1,0xE99999E1,0xE9A9A9E1,0xE99999E1,0xE69996E1,0x1E666E11,0x11EEE111

.word 0x11EEEE11,0x1E4444E1,0xE444444E,0xE444444E,0xE444444E,0xE344443E,0x1E3333E1,0x11EEEE11
.word 0x11EEE111,0x1E222E11,0xE22222E1,0xE22A22E1,0xE22222E1,0x1E222E11,0x11E2E111,0x111E1111
.word 0xEEEEEEEE,0xE222222E,0xE222222E,0xE222222E,0xE555555E,0xECC55CCE,0xECCCCCCE,0xE555555E
.word 0xEEEEEEEE,0xE222222E,0xE222222E,0xE222222E,0xE555555E,0xEBB55BBE,0xEBBBBBBE,0xE555555E
.word 0xEEEEEEEE,0xE9EEE9EE,0xE99999EE,0xE9A9A9EE,0xE99999EE,0xE69996EE,0xEE666EEE,0xEEEEEEEE
.word 0x33333333,0x33333333,0x33333333,0x33333333,0x66666666,0x66666666,0x66666666,0x66666666
.word 0xEEEEEEEE,0xEE4444EE,0xE444444E,0xE444444E,0xE444444E,0xE344443E,0xEE3333EE,0xEEEEEEEE
Expand Down Expand Up @@ -223,9 +223,9 @@ overlayTiles:
.word 0x11119999,0x11169999,0x11199799,0x11199999,0x11699999,0x11999779,0x11999999,0x16999999
.word 0x99999961,0x99999961,0x99999911,0x99999911,0x99999611,0x77779611,0x77779111,0x99996111
.word 0x19999999,0x69999999,0x69999999,0x99999999,0x17777779,0x17777777,0x99999977,0x11116699
.word 0x11111111,0x11111155,0x55551555,0x55556551,0x55556511,0x55566111,0x55661111,0x6655C111
.word 0x11111111,0x11111155,0x55551555,0x55556551,0x55556511,0x55566111,0x55661111,0x6655B111
.word 0x11111111,0x53111111,0x55555555,0x55555555,0x56555555,0x55555555,0x55555555,0x55551116
.word 0x555CC111,0x1CCCCC11,0x11CCCCC5,0x111CCCC5,0x1111CC53,0x11111551,0x11111111,0x11111111
.word 0x555BB111,0x1BBBBB11,0x11BBBBB5,0x111BBBB5,0x1111BB53,0x11111551,0x11111111,0x11111111

.word 0x55531111,0x11111111,0x11111111,0x11111111,0x11111111,0x11111111,0x11111111,0x11111111
.word 0x33333336,0x11633323,0x11111333,0x11155633,0x11115133,0x11111113,0x41111113,0x44111113
Expand All @@ -249,7 +249,7 @@ overlayTiles:
.word 0x55557781,0xE5EE7778,0x555577E7,0x55557777,0x55557777,0x55557777,0x55557778,0x55557781
.word 0x11515555,0x11E35555,0x11535555,0x11535555,0x11535555,0x11535555,0x11535255,0x11515555
.word 0x11111111,0x11111111,0x38881111,0x58788111,0x38888111,0x38888111,0x38888111,0x38881111
.word 0x11111111,0x11111111,0x13133333,0x13F33335,0x13F33333,0x13F33333,0x13F3C333,0x13133333
.word 0x11111111,0x11111111,0x13133333,0x13F33335,0x13F33333,0x13F33333,0x13F3B333,0x13133333
.word 0x77781111,0x77777777,0x77777777,0x77777777,0x77777777,0xE7777777,0x2EEEEEEE,0x22EEEEEE
.word 0x11777777,0x11777777,0x11777777,0x11777777,0x11777777,0x11EEEEEE,0x15EEEEEE,0x15EEEEEE
.word 0x22EEEEE5,0xEE222EE5,0xEE22EEE1,0x22EEEEE1,0x22EEEEE1,0xEEEEEEE1,0xEEEEEEE1,0xEEEEEEE1
Expand All @@ -268,20 +268,20 @@ overlayTiles:
.word 0x11111111,0x17111111,0x17771111,0x17977111,0x17777778,0x17797778,0x17779978,0x17777778
.word 0x88797777,0x88779777,0x68777797,0x88777777,0x88117777,0x81111177,0x81111111,0x11111111
.word 0x17777778,0x17997778,0x17999778,0x17999978,0x17799978,0x11777978,0x11117778,0x11111778
.word 0x11111111,0x111DDDD1,0x11DDDDD1,0xBDDDDD11,0xDDDDD111,0xDBBBB211,0xBBB7BB11,0xBB7EBB21
.word 0x11111111,0x11111D11,0x11111D11,0x11111DDB,0x11222DDB,0x12BB22DB,0x1BBBBBBB,0xBBBBBBBB
.word 0x7BBBBBB1,0xBB7BBBB1,0xBBBBBB21,0xBBBBBB21,0xBBBBBB11,0xBBBB2211,0x22222111,0x22211111
.word 0x11111111,0x111DDDD1,0x11DDDDD1,0xCDDDDD11,0xDDDDD111,0xDCCCC211,0xCCC7CC11,0xCC7ECC21
.word 0x11111111,0x11111D11,0x11111D11,0x11111DDC,0x11222DDC,0x12CC22DC,0x1CCCCCCC,0xCCCCCCCC
.word 0x7CCCCCC1,0xCC7CCCC1,0xCCCCCC21,0xCCCCCC21,0xCCCCCC11,0xCCCC2211,0x22222111,0x22211111

.word 0xBBBBBBBB,0x2BBBBBBB,0x22BBBBBB,0x22BBBBBB,0x1222BBBB,0x122222BB,0x11222222,0x11112222
.word 0xCCCCCCCC,0x2CCCCCCC,0x22CCCCCC,0x22CCCCCC,0x1222CCCC,0x122222CC,0x11222222,0x11112222
.word 0x11111111,0x11111111,0x11111111,0x11111111,0x11111111,0x11117711,0x11117781,0x11111771
.word 0x11111111,0x11111771,0x11111877,0x11111177,0x11111111,0x11111111,0x11111111,0x11111111
.word 0x11111111,0x11111111,0x11111111,0x11111111,0x11111111,0x11111111,0x11111111,0x11111111
.word 0x11111111,0x11177111,0x11177711,0x11118711,0x11111111,0x11111111,0x11111111,0x11111111
.word 0xCCCCC111,0x1111CC11,0x331111C1,0x333311C1,0x333331C1,0x553333C1,0x553333F1,0x333111F1
.word 0x11111CCC,0x11933331,0x13333333,0x93355533,0x33355555,0x33333555,0x33533335,0x33333333
.word 0x331111F1,0x33144191,0x33194191,0x33111911,0x3331F911,0x33331111,0x11111111,0x11111111
.word 0xBBB11111,0x1FFFF111,0xFFFFFFF1,0xFF444FF1,0x44444FFF,0x444FFFFF,0x4FFFF4FF,0xFFFFFFFF
.word 0x111111BB,0x11111B11,0x11111BFF,0x1111FFFF,0x111FFFFF,0x11FFFF44,0x1BFFFF44,0xBB11FFFF
.word 0xF4FFFFF1,0xFFFFFF11,0xFFFF1111,0xFF11FFF1,0x11FFFFF1,0x1FFFFF11,0x1FFF1111,0x11111111

.word 0x33333F33,0x1333333F,0x16633333,0x33366333,0x33333663,0x13333361,0x11133311,0x11111111
.word 0xB1111FFF,0xB1111FF4,0xB1111FFF,0x1B111FFF,0x1BB1FFFF,0x111FFFF1,0x11111111,0x11111111
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
Expand Down Expand Up @@ -461,8 +461,8 @@ overlayTiles:
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000

.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0xEEEEEEEE,0xEEBBBEEE,0xEBBBBBEE,0xEBB66BBE,0xEBB664BE,0xEB6466BE,0xEB6666BE,0xEEEEEEEE
.word 0x1EEEEE11,0xEEBBBEE1,0xEBBBBBEE,0xEBB66BBE,0xEBB664BE,0xEB6466BE,0xEB6666BE,0xEEEEEEEE
.word 0xAAAAAAAA,0xAAAAAAAA,0xAAAAAAAA,0xAAAAAAAA,0xAAAAAAAA,0xAAAAAAAA,0xAAAAAAAA,0xAAAAAAAA
.word 0xEEEEEEEE,0xEEEEEEEE,0xEEEEEEEE,0xEEEEEEEE,0xEEEEEEEE,0xEEEEEEEE,0xEEEEEEEE,0xEEEEEEEE
.word 0x55555555,0x55555555,0x55555555,0x55555555,0x55555555,0x55555555,0x55555555,0x55555555
Expand Down Expand Up @@ -593,7 +593,7 @@ overlayTiles:
.hidden overlayPal
overlayPal:
.hword 0x7C1F,0x0800,0x2C7D,0x55CE,0x7F80,0x7719,0x30C2,0x42D9
.hword 0x25D2,0x4147,0x7FFF,0x057F,0x20AC,0x25A3,0x737B,0x3D4B
.hword 0x25D2,0x4147,0x7FFF,0x20AC,0x057F,0x25A3,0x737B,0x3D4B
.hword 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000
.hword 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000
.hword 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000
Expand Down
2 changes: 1 addition & 1 deletion source/data/spritesheet2.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// + 1008 tiles Metatiled by 2x4 not compressed
// Total size: 512 + 32256 = 32768
//
// Time-stamp: 2020-09-18, 17:09:25
// Time-stamp: 2020-09-18, 18:26:35
// Exported by Cearn's GBA Image Transmogrifier, v0.8.15
// ( http://www.coranac.com/projects/#grit )
//
Expand Down
12 changes: 6 additions & 6 deletions source/data/spritesheet2.s
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@ + 1008 tiles Metatiled by 2x4 not compressed
@ Total size: 512 + 32256 = 32768
@
@ Time-stamp: 2020-09-18, 17:09:25
@ Time-stamp: 2020-09-18, 18:26:35
@ Exported by Cearn's GBA Image Transmogrifier, v0.8.15
@ ( http://www.coranac.com/projects/#grit )
@
Expand Down Expand Up @@ -1034,17 +1034,17 @@ spritesheet2Tiles:
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00E00000,0x00EEEE00,0x00EE0000,0x00000000,0xE0000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x0E0000EE,0xEEEEEEEE,0xEEEEEEEE,0xEEEEEEEE,0xEEEEEEEE,0xEEEEEE00

.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000E00,0x00000000
.word 0x00000000,0xEE000000,0xEE00E000,0xE000EEEE,0x0000EEEE,0x00EEEEEE,0x0000EEEE,0x000000EE
.word 0x0000000E,0x00000EEE,0x000000EE,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000

.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0xBBBB0000,0xBBBBB000,0xBBBBBB00,0xBBBBBB00,0xBBBBBBB0,0xCCCCCBBB,0xCCCCCBBB
Expand Down
2 changes: 1 addition & 1 deletion source/data/spritesheet3.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// + 1008 tiles Metatiled by 2x4 not compressed
// Total size: 512 + 32256 = 32768
//
// Time-stamp: 2020-09-18, 17:09:25
// Time-stamp: 2020-09-18, 18:26:35
// Exported by Cearn's GBA Image Transmogrifier, v0.8.15
// ( http://www.coranac.com/projects/#grit )
//
Expand Down
12 changes: 6 additions & 6 deletions source/data/spritesheet3.s
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@ + 1008 tiles Metatiled by 2x4 not compressed
@ Total size: 512 + 32256 = 32768
@
@ Time-stamp: 2020-09-18, 17:09:25
@ Time-stamp: 2020-09-18, 18:26:35
@ Exported by Cearn's GBA Image Transmogrifier, v0.8.15
@ ( http://www.coranac.com/projects/#grit )
@
Expand Down Expand Up @@ -1034,17 +1034,17 @@ spritesheet3Tiles:
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00900000,0x00999900,0x00990000,0x00000000,0x90000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x09000099,0x99999999,0x99999999,0x99999999,0x99999999,0x99999900

.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000900,0x00000000
.word 0x00000000,0x99000000,0x99009000,0x90009999,0x00009999,0x00999999,0x00009999,0x00000099
.word 0x00000009,0x00000999,0x00000099,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000

.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0xCCCC0000,0xCCCCC000,0xCCCCCC00,0xCCCCCC00,0xCCCCCCC0,0xBBBBBCCC,0xBBBBBCCC
Expand Down
2 changes: 1 addition & 1 deletion source/data/spritesheet4.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// + 1008 tiles Metatiled by 2x4 not compressed
// Total size: 512 + 32256 = 32768
//
// Time-stamp: 2020-09-18, 17:09:25
// Time-stamp: 2020-09-18, 18:26:35
// Exported by Cearn's GBA Image Transmogrifier, v0.8.15
// ( http://www.coranac.com/projects/#grit )
//
Expand Down
12 changes: 6 additions & 6 deletions source/data/spritesheet4.s
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@ + 1008 tiles Metatiled by 2x4 not compressed
@ Total size: 512 + 32256 = 32768
@
@ Time-stamp: 2020-09-18, 17:09:25
@ Time-stamp: 2020-09-18, 18:26:35
@ Exported by Cearn's GBA Image Transmogrifier, v0.8.15
@ ( http://www.coranac.com/projects/#grit )
@
Expand Down Expand Up @@ -1034,17 +1034,17 @@ spritesheet4Tiles:
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00C00000,0x00CCCC00,0x00CC0000,0x00000000,0xC0000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x0C0000CC,0xCCCCCCCC,0xCCCCCCCC,0xCCCCCCCC,0xCCCCCCCC,0xCCCCCC00

.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000C00,0x00000000
.word 0x00000000,0xCC000000,0xCC00C000,0xC000CCCC,0x0000CCCC,0x00CCCCCC,0x0000CCCC,0x000000CC
.word 0x0000000C,0x00000CCC,0x000000CC,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000

.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0xBBBB0000,0xBBBBB000,0xBBBBBB00,0xBBBBBB00,0xBBBBBBB0,0x77777BBB,0x77777BBB
Expand Down
2 changes: 1 addition & 1 deletion source/entity/bosses/boss.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ void boss_explosion(Platform& pf, Game& game, const Vec2<Float>& position)
{
hide_boss_health(game);

static const auto score = 1000;
static const auto score = 900;

switch (game.difficulty()) {
case Settings::Difficulty::hard:
Expand Down
6 changes: 6 additions & 0 deletions source/entity/details/scavenger.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "scavenger.hpp"
#include "number/random.hpp"


Scavenger::Scavenger(const Vec2<Float>& pos)
Expand All @@ -17,4 +18,9 @@ Scavenger::Scavenger(const Vec2<Float>& pos)
shadow_.set_origin({16, 14});
shadow_.set_texture_index(56);
shadow_.set_alpha(Sprite::Alpha::translucent);

if (rng::choice<2>(rng::utility_state)) {
sprite_.set_flip({true, false});
shadow_.set_flip({true, false});
}
}
1 change: 1 addition & 0 deletions source/localization.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,7 @@ const char* locale_string(LocaleString ls)
case LocaleString::map_legend_2: return "enemy";
case LocaleString::map_legend_3: return "exit";
case LocaleString::map_legend_4: return "item";
case LocaleString::map_legend_5: return "shop";
case LocaleString::waypoint_text: return "waypoint ";
case LocaleString::part_1_text: return "part I:";
case LocaleString::part_1_title: return "the arrival ";
Expand Down
1 change: 1 addition & 0 deletions source/localization.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ enum class LocaleString {
map_legend_2,
map_legend_3,
map_legend_4,
map_legend_5,
waypoint_text,
part_1_text,
part_1_title,
Expand Down
15 changes: 8 additions & 7 deletions source/state/mapSystemState.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -76,19 +76,20 @@ StatePtr MapSystemState::update(Platform& pfrm, Game& game, Microseconds delta)
timer_ = 0;
anim_state_ = AnimState::path_wait;

set_tile(TileMap::width + 2, 11, 137, false); // you
set_tile(TileMap::width + 2, 13, 135, false); // enemy
set_tile(TileMap::width + 2, 15, 136, false); // transporter
set_tile(TileMap::width + 2, 17, 134, false); // item
set_tile(TileMap::width + 2, 9, 137, false); // you
set_tile(TileMap::width + 2, 11, 135, false); // enemy
set_tile(TileMap::width + 2, 13, 136, false); // transporter
set_tile(TileMap::width + 2, 15, 134, false); // item
set_tile(TileMap::width + 2, 17, 393, false); // shop

legend_border_.emplace(pfrm,
OverlayCoord{11, 9},
OverlayCoord{TileMap::width + 2, 10},
OverlayCoord{11, 11},
OverlayCoord{TileMap::width + 2, 8},
false,
8);

for (size_t i = 0; i < legend_strings.size(); ++i) {
const u8 y = 11 + (i * 2);
const u8 y = 9 + (i * 2);
legend_text_[i].emplace(pfrm,
locale_string(legend_strings[i]),
OverlayCoord{TileMap::width + 5, y});
Expand Down
4 changes: 4 additions & 0 deletions source/state/state_impl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,10 @@ bool draw_minimap(Platform& pfrm,
}
}

if (game.scavenger()) {
render_map_icon(*game.scavenger(), 392);
}

const auto player_tile = get_constrained_player_tile_coord(game);

set_tile(player_tile.x, player_tile.y, 142);
Expand Down
5 changes: 3 additions & 2 deletions source/state/state_impl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -470,11 +470,12 @@ class MapSystemState : public MenuState {
StatePtr update(Platform& pfrm, Game& game, Microseconds delta) override;

private:
static constexpr const std::array<LocaleString, 4> legend_strings = {
static constexpr const std::array<LocaleString, 5> legend_strings = {
LocaleString::map_legend_1,
LocaleString::map_legend_2,
LocaleString::map_legend_3,
LocaleString::map_legend_4};
LocaleString::map_legend_4,
LocaleString::map_legend_5};

Microseconds timer_ = 0;
enum class AnimState {
Expand Down

0 comments on commit 1e58f40

Please sign in to comment.