Commit Graph

2843 Commits

Author SHA1 Message Date
Theo eaaeb3a617
Merge pull request #688 from KEKW555/KEKW555-patch-2 2024-01-21 00:19:51 -08:00
Theo a804fd336f
Merge pull request #687 from tonyjih/master 2024-01-21 00:15:09 -08:00
Tony Jih 9cd0ee4967
Merge branch 'zeldaret:master' into master 2024-01-17 15:06:40 +08:00
Theo b429a7b66f
Merge pull request #691 from octorock/fix-custom-build 2024-01-13 10:39:54 -08:00
octorock e608f4f5ac Fix custom build
Assign two null bytes to the correct compressed tile map.
2024-01-13 11:49:33 +01:00
Theo 320d4465f5
Merge pull request #690 from octorock/tilemap-docs 2024-01-12 08:05:55 -08:00
octorock 1ecc23d534 Fix format 2024-01-06 18:43:02 +01:00
octorock 560dfa45b1 Add more tilemap documentation 2024-01-06 18:12:53 +01:00
octorock 06dc158598 Rename vvv to actTile 2024-01-06 16:15:34 +01:00
octorock aced0bef69 Rename metaTiles
Now the 16x16 tiles are just called tiles and the 8x8 tiles are called subTiles.
2024-01-06 15:01:44 +01:00
octorock c3b771a209 Merge branch 'master' into tilemap-docs 2024-01-06 12:26:39 +01:00
KEKW555 12f51699d4
True match sub_080784E4 2024-01-03 21:36:51 +05:30
Tony Jih 88338832f9 Bring back shopSpawnData 2024-01-03 16:11:40 +08:00
Tony Jih 3019a26d29 True match GoronMerchantShopManager_Main 2024-01-02 22:30:26 +08:00
Theo 6fb8b41a8e
Merge pull request #686 from notyourav/followtest
document unused zelda follower and gust jar states
2024-01-01 13:10:06 -08:00
theo3 f5c6178ed4 gustjar player fields 2024-01-01 13:07:43 -08:00
theo3 5324928f44 npc5 document 2024-01-01 12:12:05 -08:00
Theo 983412cc77
Merge pull request #685 from notyourav/col
define collisions
2023-12-31 21:28:46 -08:00
theo3 dcc596ed87 define collisions 2023-12-31 21:26:12 -08:00
Theo 48fdf9d827
Merge pull request #684 from notyourav/tiles
Tiles documentation
2023-12-31 17:36:15 -08:00
theo3 37ac9cb0fb document tile asm functions 2023-12-31 17:34:02 -08:00
KEKW555 72c27b5393
True match sub_08068578 (#683) 2023-12-31 15:13:39 -08:00
Theo 65cbb00669
Merge pull request #682 from Elmyr-de-Hory/sub_0806252C
True match sub_0806252C
2023-12-31 14:49:11 -08:00
Elmyr de Hory b199773a12 True match sub_0806252C
Co-authored-by: KEKW555 <152369890+KEKW555@users.noreply.github.com>
2023-12-31 00:59:14 -08:00
theo3 5049daabc5 label contact flags 2023-12-30 21:07:06 -08:00
Theo bd1be092aa
Merge pull request #681 from notyourav/em
create enemy struct and enemy flags
2023-12-30 20:07:35 -08:00
theo3 201955ea05 create enemy struct and enemy flags 2023-12-30 20:05:32 -08:00
Theo 3771464496
Merge pull request #680 from notyourav/f
BounceUpdate and other asm functions labeled
2023-12-30 17:29:51 -08:00
theo3 2c7c9ae509 fmt 2023-12-30 17:26:46 -08:00
theo3 11bccad6bc merge upstream 2023-12-30 17:25:11 -08:00
theo3 fb9f59fbbb label BounceUpdate asm 2023-12-30 17:13:42 -08:00
octorock 109b1020dc Merge branch 'master' into tilemap-docs 2023-12-31 02:12:41 +01:00
Theo 9c87bcca8e
Merge pull request #679 from octorock/enemies
Use new entity structs for enemies and player
2023-12-30 14:35:18 -08:00
octorock 8b69eadaef Fix format 2023-12-30 22:48:48 +01:00
octorock 917ca10ba5 Merge branch 'master' into enemies 2023-12-30 22:18:38 +01:00
octorock a818f1b704 Use new entity struct for player 2023-12-30 22:09:30 +01:00
octorock 5676cb7890 Use new entity structs in a few more files 2023-12-30 18:42:30 +01:00
octorock 3b87c04162 Invert NENT_DEPRECATED define
To define ENT_DEPRECATED in files that still need the old entity structs.
2023-12-30 18:30:00 +01:00
octorock 33473d1d5b Create new entity structs for enemies 2023-12-30 18:12:05 +01:00
Theo 3c0c1ba5a0
Merge pull request #678 from notyourav/f
document RoomVars struct
2023-12-29 21:48:35 -08:00
theo3 37723f5607 document RoomVars struct 2023-12-29 21:42:55 -08:00
Theo 3359557489
Merge pull request #677 from tonyjih/match_sub_0802C334
True match sub_0802C334
2023-12-29 21:41:10 -08:00
octorock 242336c385 Merge branch 'master' into enemies 2023-12-29 23:07:22 +01:00
octorock 870c08fad6 Merge branch 'master' into enemies 2023-12-29 23:04:14 +01:00
octorock c63a86fbca Create some enemy structs 2023-12-29 22:56:38 +01:00
octorock b28f865051 Create new entity structs for Player Items 2023-12-29 22:56:38 +01:00
Tony Jih 44072497ea True match sub_0802C334 2023-12-29 18:46:46 +08:00
Theo c2f081600b
Merge pull request #676 from notyourav/v
label some asm functions
2023-12-29 01:01:37 -08:00
theo3 72509b18a0 label some asm functions 2023-12-29 00:59:43 -08:00
theo3 d07c416641 message definitions 2023-12-28 21:58:54 -08:00