Commit Graph

80 Commits

Author SHA1 Message Date
25c44cd2bb Merge branch 'OWMain' into overworld_kara 2023-09-04 15:03:18 -05:00
codemann8
81a3fcf773 Fixed 99 bonk limit in stats counters 2023-05-12 20:14:36 -05:00
codemann8
20f8ef457e Converting item GFX drawing to use pottery draw method 2023-05-05 20:54:36 -05:00
4817fa2013 Fix up labels
still WIP

still do not use
2022-09-18 18:11:21 -07:00
6f138825d9 Merge remote-tracking branch 'codemann/OWMain' into overworld_kara
WIP, Broken, Do Not Use
2022-09-18 17:36:49 -07:00
cassidoxa
9c41ffb55b Merge branch 'sram_rework' into dr_sram 2022-04-20 00:30:35 -04:00
cassidoxa
905e897b52 Handle 16-bit GoalCounter and TotalItemCounter
Fix vanilla sword + shield item
Fix how progressive items handled
Clean up compasses.asm
2022-02-08 19:25:59 -05:00
cassidoxa
3c6c45ddb4 Fix some mangled labels 2022-02-03 22:01:34 -05:00
cassidoxa
3e2362b7ca Implement initial SRAM table
Data in initialsramtable.asm gets copied to SRAM on save file init
Frontend will be responsible for setting this, requires frontend changes
Changed some label names to disambiguate WRAM and SRAM labels
Deleted open mode
2022-02-03 20:25:32 -05:00
8dfdd3ee87 Merge branch 'main' into overworld_kara 2022-01-24 14:07:50 -08:00
aerinon
3c9b04f30a Fixed up the anti-soft lock in swamp
Combined flags and fixed a couple of bugs
2022-01-21 16:07:03 -07:00
cassidoxa
b91ac58b47 Merge branch 'master' into sram 2022-01-20 11:16:31 -05:00
Catobat
78148fb4f3 Fix witch item bug 2022-01-20 01:30:21 +01:00
aerinon
50dd0c7be4 Fixing bugs with pottery lottery 2022-01-13 15:03:20 -07:00
cassidy
6c9b33ed93 Write macro for SRAM assertions
Change some label names to be clearer
Fix some of the progress flags and dungeon bitfields
2021-12-16 17:19:55 -05:00
cassidy
9e2382cbb2 Add absorbed keys
Adjust service request stuff
Change chest keys to "collected" keys
2021-12-16 17:19:55 -05:00
cassidy
fa76b61df0 Change addresses to labels and remove SRAM trace calls 2021-12-16 17:19:54 -05:00
cassidy
e4d917c47c First pass-through adding labels
Added items, equipment, and tracking/indicators
Added playername changes
Removed some defines
2021-12-16 17:19:54 -05:00
aerinon
27654b9ac9 Merge remote-tracking branch 'baserom/master' into DRMain
# Conflicts:
#	hooks.asm
#	newhud.asm
#	utilities.asm
2021-10-21 14:15:54 -06:00
f14fea3699 Merge branch 'main' into overworld_kara 2021-08-02 19:00:13 -07:00
spannerisms
df66369f17 hopefully fix that text bug 2021-07-29 09:43:08 -04:00
b663bb982f Merge branch 'OWMain' into overworld_kara 2021-07-23 15:42:41 -07:00
8e12033105 Fix counters for damage taken and magic used 2021-07-23 00:07:51 -07:00
0054be1e4b Fix some stat tracking
- move chest turn counter to not overlap locations before mirror
- correctly print from correct memory in credits for damage/magic counter
2021-07-08 19:47:37 -07:00
2c931527e9 Merge branch 'DRMain' into overworld_kara 2021-07-08 19:39:10 -07:00
aerinon
aee82fa319 Merge branch 'master' into DRMain
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	events.asm
#	hooks.asm
#	stats.asm
#	stats/creditsnew.asm
#	stats/statConfig.asm
#	swordswap.asm
#	utilities.asm
2021-07-07 11:15:11 -07:00
d960103e86 Merge branch 'main' into overworld_kara 2021-07-07 09:15:29 -07:00
KatDevsGames
264f7b26bc Merge pull request #134 from Bonta0/fakeboots
Fake boots
2021-07-06 22:25:42 -05:00
d4e1337471 Add bombs-placed counter to stat screen 2021-07-05 17:56:56 -07:00
Bonta
27cb1b5459 Implement Fakeboots 2021-07-05 21:38:08 +02:00
spannerisms
270f0685ff add byrna/cape magic tracking 2021-07-04 05:21:48 -04:00
spannerisms
00c59c791f damage/magic stats 2021-07-03 09:25:33 -04:00
01abf889d7 Merge branch 'main' into overworld_kara 2021-07-01 23:02:23 -07:00
01537a7f2f Temporary fix for broken missing defines 2021-06-28 15:01:01 -07:00
KatDevsGames
69ec104027 Merge pull request #131 from Bonta0/chestturns
Credits: Add chest turns counter
2021-06-28 11:47:01 -05:00
KatDevsGames
ae0a712bdd Merge pull request #129 from spannerisms/master
OneMind
2021-06-28 11:08:44 -05:00
KatDevsGames
38fdf5442a Merge pull request #128 from Bonta0/bonkcounter
Stats: Fix bonk counter
2021-06-28 11:06:27 -05:00
spannerisms
be0389ffbb stats 2021-06-24 08:36:04 -04:00
Bonta
cc12372627 Stats: Track chest turns 2021-06-22 02:31:52 +02:00
Bonta
76878def98 Stats: amend incorrect comment in CountChestKey 2021-06-20 16:41:35 +02:00
Bonta
b16f7b4994 Stats: Fix bonk counter 2021-06-20 15:15:55 +02:00
aerinon
5f1ea34646 Final fix for counting hera key 2021-02-17 11:52:10 -07:00
aerinon
4ae59ad1e6 Double count hera basement cage in keydropshuffle 2021-02-17 11:50:51 -07:00
CaitSith2
a83608366c document full usage of 7EF420-7EF4FF in stats.asm 2021-02-12 07:48:09 -08:00
CaitSith2
d3af10649c Dungeon completion flags, that indicate for which dungeons the prize was collected from. 2021-02-12 07:45:32 -08:00
CaitSith2
244b622074 Move stats that were not compass related out of the former compass counters. 2021-02-12 07:27:21 -08:00
CaitSith2
7266706315 Make inventory count stats 16 bit. 2021-01-18 12:02:44 -08:00
aerinon
a9bddea1b4 Change how hera basement key is counted to not count Byrna 2020-12-09 14:28:12 -07:00
aerinon
443070fe2c Merge branch 'ChestKeyCounter' into DRMain
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	build.sh
#	darkworldspawn.asm
#	events.asm
#	itemdowngrade.asm
#	shopkeeper.asm
#	stats.asm
2020-11-30 09:34:18 -07:00
aerinon
be3960bedb Hera basement key fix
Combine HC/Sewer chest key count into one variable
2020-11-30 09:27:47 -07:00