Commit Graph

599 Commits

Author SHA1 Message Date
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
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
theo3 dcc596ed87 define collisions 2023-12-31 21:26:12 -08:00
theo3 37ac9cb0fb document tile asm functions 2023-12-31 17:34:02 -08:00
theo3 5049daabc5 label contact flags 2023-12-30 21:07:06 -08:00
theo3 201955ea05 create enemy struct and enemy flags 2023-12-30 20:05:32 -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
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 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 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
Tony Jih 44072497ea True match sub_0802C334 2023-12-29 18:46:46 +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
theo3 a030120a0c clean up linkAnimation.c 2023-12-28 19:05:06 -08:00
theo3 7c1c612c9b fix fakematch in LinkHoldingItem_Action3 2023-12-28 17:54:39 -08:00
octorock 768efa50b3 Merge branch 'master' into tilemap-docs 2023-12-28 14:59:23 +01:00
KEKW555 20b4cf6724 True match Enemy50_OnCollision 2023-12-24 11:52:42 +05:30
Tony Jih c8598c065d Match sub_08039B28 2023-12-23 17:20:52 +08:00
Reinmmar b163ecafc9 Applied the enum for interactions (#647)
* Interactions enum applied

* Interactions enum applied
2023-12-10 16:21:31 -08:00
Reinmmar bdfaa7dc1a found another place where animations hid 2023-09-20 16:45:23 +02:00
Reinmmar 20483c258a Had a wrong name for an animation 2023-09-19 09:56:29 +02:00
Reinmmar ed438ebd78 Formatting again 2023-09-18 19:01:17 +02:00
Reinmmar e689c1b32d Filled in the directions 2023-09-18 18:56:46 +02:00
Reinmmar 561b8da657 more formatting 2023-09-17 22:11:29 +02:00
Reinmmar ab3e4ef0f4 Labeled one Portal Type and some animations 2023-09-17 21:07:48 +02:00
Reinmmar e8639051ba Labeled PlayerState and PlayerAction stuff 2023-09-17 12:09:53 +02:00
notyourav 2ebab6f49f Merge pull request #620 from Henny022p/savefile
SaveFile cleanup
2023-08-06 18:52:38 -07:00
Henny022p ea30d2264b SaveFile cleanup part 3 2023-08-02 22:19:34 +02:00
octorock 488196754e Create new entity structs for NPCs 2023-08-01 11:36:11 +02:00
notyourav a443cb5d49 Merge pull request #617 from octorock/projectiles
Create new entity structs for Projectiles
2023-07-31 18:56:04 -07:00
octorock 591563f428 Create new entity structs for Projectiles 2023-07-23 23:52:47 +02:00
octorock b6a94d5062 Use metatile enum 2023-07-05 18:30:27 +02:00
Henny022p 70675cedc1 format 2023-07-05 00:57:06 +02:00
Henny022p 9b907d121d various small documentation changes
made during SGDQ23 while working on multiworld randomizer

Co-authored-by: Ibot02 <jtp.jtp@gmx.de>
2023-07-05 00:53:54 +02:00
octorock f89bb66911 Create enums for Vvvs and MetaTiles 2023-06-24 00:19:33 +02:00
octorock c317fe3f18 Extract KeyValuePairs 2023-06-17 00:10:00 +02:00
octorock 551cb72093 Extract some map data definitions 2023-06-10 15:12:51 +02:00
octorock bbac5ace3f Merge remote-tracking branch 'upstream/master' into tilemap-docs 2023-05-31 23:51:20 +02:00