Commit Graph

830 Commits

Author SHA1 Message Date
octorock 60e33b636d Rename managers 2022-05-18 13:07:06 +02:00
Tal Hayon 4543cd8297 Merge remote-tracking branch 'upstream/master' into enumasm 2022-05-14 20:55:51 +03:00
Tal Hayon 968e200c78 Use enums across more scripts and files 2022-05-14 20:51:30 +03:00
Tal Hayon 2062499f0c Initial version of enum extractor script 2022-05-13 21:46:39 +03:00
Tal Hayon 99d14c6a29 Match GenerateAreaHint 2022-05-09 23:29:23 +03:00
Tal Hayon f6efbab252 Match sub_080186C0 2022-05-09 18:10:05 +03:00
Tal Hayon 9730543780 Match sub_08018738 2022-05-09 17:39:00 +03:00
Tal Hayon dba74f4c92 Match sub_0801876C 2022-05-09 16:48:11 +03:00
Tal Hayon ffdec50c76 Match sub_08018BB4 and adjust types 2022-05-08 23:49:52 +03:00
Tal Hayon c5c1343c7c Decompile code_0808C964
Consolidate objects 75 and 76 into macroMushroomStalk since they use the same action functions
2022-05-07 09:37:39 +03:00
Tal Hayon 4de453b4de Add TextCategory enum 2022-04-28 09:19:46 +03:00
Tal Hayon 5347c5ddaf Add DialogType and DialogFlagType enums 2022-04-23 03:06:56 +03:00
notyourav a957ee9580
Merge pull request #501 from hatal175/data8 2022-04-22 00:45:46 -07:00
octorock addde5a3d3 Decompile some playerUtils 2022-04-21 20:34:07 +02:00
Tal Hayon 26b9110180 Match sub_080ACF2C and put const data in playerItemHeldObject 2022-04-20 22:09:14 +03:00
Tal Hayon 62135a7584 Put const data in manager4 2022-04-18 14:34:24 +03:00
Tal Hayon 268ac11430 Put const data in jailBars 2022-04-18 13:30:57 +03:00
Tal Hayon e2c87fb9ca Put const data in cloud 2022-04-18 13:13:06 +03:00
Tal Hayon bb43265c50 Put const data in npc58 2022-04-16 20:37:58 +03:00
Tal Hayon 02f5e4cc5f Match Syrup_Head and put const data in syrup 2022-04-16 00:50:17 +03:00
Tal Hayon 4820349daf Put const data in beedle 2022-04-14 20:19:43 +03:00
notyourav 20b9d87d00
Merge pull request #492 from hatal175/subtask6 2022-04-14 09:33:39 -07:00
notyourav 57886f751b
Merge pull request #493 from hatal175/data3 2022-04-13 13:36:29 -07:00
Tal Hayon 57cb7af7c4 Put const data into stamp 2022-04-13 22:57:15 +03:00
Tal Hayon e809532548 Move some const data into code files 2022-04-13 00:04:14 +03:00
Tal Hayon 70229c561d Match sub_080A5D1C 2022-04-12 09:41:22 +03:00
octorock 4fd8048c3c Decompile some functions 2022-04-11 18:55:07 +02:00
notyourav 02cec8ca8d
Merge pull request #490 from hatal175/subtask5
Decompile Subtask_FadeIn/Out
2022-04-10 23:52:32 -07:00
notyourav ef41e97c78
Merge pull request #489 from hatal175/dmaset
Use DmaSet macro in several places
2022-04-10 14:53:30 -07:00
Tal Hayon c06564fd55 Decompile Subtask_FadeIn/Out 2022-04-10 20:27:22 +03:00
Tal Hayon 011419c413 Use DmaSet macro in several places 2022-04-10 09:27:01 +03:00
Tal Hayon ca8869391e Match sub_080A5594 2022-04-08 14:05:20 +03:00
Tal Hayon 7b23b61ace Match sub_080A68D4 2022-04-07 13:12:06 +03:00
notyourav c4d18cf682
Merge pull request #487 from hatal175/fade
Add fade flags enum
2022-04-06 21:38:14 -07:00
Tal Hayon 01067740c1 Extract ui.h 2022-04-06 11:03:32 +03:00
Tal Hayon d3c5ce50f0 Add fade flags enum 2022-04-05 22:56:37 +03:00
Tal Hayon 53dd89e3b6 Decompile some subtask2 functions 2022-04-02 20:42:30 +03:00
notyourav 9233701a5d
Merge pull request #483 from octorock/beanstalkSubtask
Decompile some of beanstalkSubtask
2022-03-31 14:11:59 -07:00
octorock 03e15c611c Decompile some of beanstalkSubtask 2022-03-31 22:38:53 +02:00
theo3 7d133d932c macros in collision.c 2022-03-30 23:44:03 -07:00
theo3 a633efd88c sort out most of functions.h 2022-03-30 00:52:53 -07:00
theo3 65b80571b2 naming 2022-03-28 21:01:02 -07:00
theo3 92240d4314 name remaining entity fields 2022-03-28 20:10:22 -07:00
theo3 755571834d rename coord.h to physics.h 2022-03-28 17:28:17 -07:00
theo3 6cf555f074 figurine cleanup 2022-03-28 17:26:07 -07:00
theo3 7c16e8d50a identify all player items 2022-03-28 15:23:06 -07:00
theo3 bfa69f594c format 2022-03-28 12:15:25 -07:00
theo3 c0eae31c2c merge 2022-03-28 12:15:15 -07:00
theo3 a9784e96ba identify some functions 2022-03-28 12:06:05 -07:00
octorock eb1158855b Decompile some functions 2022-03-28 17:30:56 +02:00
theo3 ffb4653b0d move function decls from player.c 2022-03-27 23:20:26 -07:00
theo3 ca139bf558 merge 2022-03-27 00:19:10 -07:00
theo3 5208bfd1aa player asm wip 2022-03-27 00:15:37 -07:00
Elliptic Ellipsis 29ef1953f0 Clean up a couple of bools 2022-03-25 14:24:18 +00:00
Elliptic Ellipsis b3a2644b4d Format 2022-03-25 02:36:10 +00:00
Elliptic Ellipsis 6eea9aace2 Add collision.h and start using its enum 2022-03-24 22:18:39 +00:00
Elliptic Ellipsis 13e7c6a5ee FireballChain OK, start documenting 2022-03-24 12:49:45 +00:00
Henny022p 92cdc57ecd Merge branch 'master' into transitions 2022-03-23 22:43:39 +01:00
Henny022p eb5d9a6726 warp and transition type 2022-03-23 22:38:09 +01:00
Henny022p 417702e83e done with room names 2022-03-23 21:02:19 +01:00
Henny022p d7fe306a49 more room names 2022-03-23 19:14:17 +01:00
Tal Hayon 60eb3e1d92 Decompile some scroll functions 2022-03-23 16:12:22 +02:00
notyourav dba139f920
Merge pull request #460 from hatal175/text
Decompile the rest of text.c
2022-03-23 00:37:03 -07:00
Tal Hayon dc5acb446e Decompile the rest of text.c 2022-03-22 01:36:08 +02:00
Henny022p 333709cefe added WarpType enum
and some cleanup
2022-03-21 08:27:57 +01:00
Henny022p 02f68affe5 added RoomID enum 2022-03-21 06:08:01 +01:00
Elliptic Ellipsis a0f7b73e66 Misc prototype cleanup 2022-03-20 16:57:09 +00:00
Elliptic Ellipsis 1a6d14cd36 New RoomMemory struct 2022-03-20 16:57:09 +00:00
Henny022p 35eef68d96 clean usage of transitions in existing code 2022-03-20 02:56:38 +01:00
Tal Hayon d7a794a9d2 Decompile the rest of minecart 2022-03-20 02:50:21 +02:00
notyourav 7dafc9fb58
Merge pull request #452 from octorock/staffroll
Decompile staffroll
2022-03-18 22:15:33 -07:00
octorock 7c9f5d2f23 Decompile staffroll 2022-03-19 01:09:40 +01:00
Elliptic Ellipsis 7780c76eac Correct type of sub_0806F520 and use it as a bool 2022-03-18 23:16:15 +00:00
Tal Hayon 105be8ac6e Decompile objectB9 (cuccoMinigame) 2022-03-18 13:40:47 +02:00
theo3 ef470547e0 cleanup 2022-03-17 19:16:43 -07:00
octorock 41ea9ab943 Decompile some UI 2022-03-17 00:58:47 +01:00
Tal Hayon cc8ef3a260 Decompile object10 2022-03-13 01:15:41 +02:00
octorock cffa1024ca Decompile Object74 2022-03-10 19:40:44 +01:00
octorock 241c0312d9 Decompile Object21 2022-03-10 19:17:41 +01:00
octorock 6b6f946caf Decompile ObjectB 2022-03-10 19:17:41 +01:00
octorock e41e97950b Decompile Object3A 2022-03-10 19:17:41 +01:00
octorock a462cd8daa Decompile Object11 2022-03-10 19:17:41 +01:00
notyourav a0548a8921
Merge pull request #438 from octorock/octorokBoss
Use new entity struct for octorok boss
2022-03-08 17:36:36 -08:00
notyourav 00524c0385
Merge pull request #437 from hatal175/fan
Decompile fan and stoneTablet
2022-03-08 17:30:43 -08:00
Tal Hayon 02d50d312b Decompile stoneTablet 2022-03-07 23:24:22 +02:00
octorock 38b21f63fe Decompile most of FrozenOctorok 2022-03-07 21:42:07 +01:00
octorock 61315f2b04 Use new entity struct for octorok boss 2022-03-07 20:59:38 +01:00
Tal Hayon 8535b62aae Decompile fan 2022-03-07 21:30:36 +02:00
octorock 8f678d15ed Use same names for arm functions and their trampolines
To easier jump to the corresponding source code.
2022-03-07 12:29:01 +01:00
notyourav 12e8722606
Merge pull request #434 from hatal175/field_0xac
rename and retype RoomVars field_0xac
2022-03-06 23:45:25 -08:00
notyourav 4e94e1fbc3
Merge pull request #433 from octorock/objectUtils
Decompile rest of objectUtils
2022-03-06 22:36:16 -08:00
notyourav 80f9adac20
Merge pull request #432 from hatal175/housedoorinterior 2022-03-06 21:58:20 -08:00
octorock 1a191f1d2e Decompile enterPortalSubtask 2022-03-06 23:25:36 +01:00
notyourav 884b757544
Merge pull request #430 from octorock/layer-struct
Improve LayerStruct
2022-03-06 13:53:40 -08:00
Tal Hayon a7ad4afebd rename and retype RoomVars field_0xac 2022-03-06 17:50:45 +02:00
octorock abb0272963 Decompile rest of objectUtils 2022-03-06 00:31:54 +01:00
Tal Hayon 51aeb674cc Decompile houseDoorInterior 2022-03-05 21:23:26 +02:00
octorock d6bbbf2db6 Improve LayerStruct 2022-03-05 19:09:49 +01:00
octorock 7215695e13 Decompile some vram 2022-03-05 17:46:57 +01:00
notyourav d18fed1fb9
Merge pull request #422 from hatal175/itemgustjar 2022-03-02 16:53:45 -08:00
octorock 5efe982847 Merge and split scroll 2022-03-02 22:33:13 +01:00
octorock 4d66b468f8 Merge playerUtils
Merge all player utils files, split asm into functions
and decompile a bunch of functions.
2022-03-02 22:33:12 +01:00
Tal Hayon 1cdfd41e01 Decompile playerItemGustJar asm funcs 2022-03-02 22:30:49 +02:00
Tal Hayon 640810a005 Decompile a few functions in objectutils 2022-02-28 16:55:08 +02:00
notyourav b906dcf24b
Merge pull request #412 from octorock/objects
Decompile some objects
2022-02-27 14:23:32 -08:00
notyourav c735b300a5
Merge pull request #411 from octorock/beanstalk 2022-02-27 13:07:04 -08:00
octorock aa63ac6e13 Decompile Object68 2022-02-27 22:05:13 +01:00
octorock 754b3eb760 Decompile Object35 2022-02-27 21:27:41 +01:00
octorock 54767a1595 Decompile ItemForSale 2022-02-27 14:27:32 +01:00
octorock bc4d9b6076 Decompile FourElements 2022-02-27 13:44:06 +01:00
octorock d37be75c49 Use hitbox header 2022-02-27 13:44:06 +01:00
octorock 6d1424aad0 Decompile WindTribeTeleporter 2022-02-27 13:44:06 +01:00
octorock 1e33e5a55d Decompile Object61 2022-02-27 13:44:06 +01:00
octorock 28301855fd Decompile ObjectC1 2022-02-27 13:44:06 +01:00
octorock 7a596ed3a2 Decompile EnemyItem 2022-02-27 13:44:06 +01:00
octorock f252083539 Decompile MinecartDoor 2022-02-27 13:44:06 +01:00
octorock ab853d9f44 Decompile Object43 2022-02-27 13:44:06 +01:00
octorock eda6ecfb9a Decompile FigurineDevice 2022-02-27 00:11:15 +01:00
octorock dcb6360b4e Decompile Beanstalk 2022-02-26 14:40:57 +01:00
notyourav abe6053a4f
Merge pull request #405 from octorock/crenelBeanSprout 2022-02-23 18:44:27 -08:00
notyourav b712657613
Merge pull request #404 from octorock/cloudPiranha 2022-02-23 18:37:55 -08:00
octorock 4df984bcf7 Decompile CrenelBeanSprout 2022-02-22 23:15:13 +01:00
octorock 25db5f1b77 Decompile CloudPiranha 2022-02-22 18:39:07 +01:00
octorock df21aa7eb5 Decompile remainder of Enemy4D 2022-02-22 17:56:48 +01:00
notyourav 75a8fd3925
Merge pull request #393 from octorock/objects 2022-02-18 13:47:12 -08:00
notyourav 8f8830fc08
Merge pull request #398 from hatal175/itemsword 2022-02-18 12:31:42 -08:00
octorock b900556352 Decompile ObjectA8 2022-02-18 20:49:00 +01:00
octorock b35a3216dc Decompile DoubleBookshelf 2022-02-18 20:49:00 +01:00
octorock 4a1d2fb406 Decompile ObjectOnSpinyBeetle 2022-02-18 20:49:00 +01:00
octorock 8d86343827 Decompile Fairy 2022-02-18 20:49:00 +01:00
octorock 0aebbae239 Decompile BossDoor 2022-02-18 20:48:58 +01:00
octorock a448d22298 Decompile LavaPlatform 2022-02-18 20:48:24 +01:00
octorock 3a27a147ad Decompile ChestSpawner 2022-02-18 20:48:24 +01:00
octorock 8d33a5857c Decompile ObjectOnPillar 2022-02-18 20:48:24 +01:00
octorock 9036135c6f Decompile Object3E 2022-02-18 20:48:24 +01:00
notyourav 57a44c2ff2
Merge pull request #395 from hatal175/color
Decompile some color ASM_FUNC
2022-02-18 11:48:13 -08:00
notyourav c12e01a5e1
Merge pull request #394 from Henny022p/doc-WCR 2022-02-18 11:37:45 -08:00
Tal Hayon 6dbf77ead8 Add newline in playeritem.h 2022-02-18 18:20:12 +02:00
Tal Hayon 0e224cf232 Add playeritem enum and use ids and kinds in all Findentity calls 2022-02-18 18:18:40 +02:00
notyourav 155a440bdd
Merge pull request #386 from hatal175/stockwell
Decompile stockwell asm_funcs
2022-02-17 19:56:49 -08:00
Tal Hayon 59d6b9ca6a Decompile some color ASM_FUNC 2022-02-18 02:13:46 +02:00
Henny022p b4c33d59dc document gyorg code more
also fixes EU custom build
2022-02-17 15:45:24 +01:00
notyourav 697076659b
Merge pull request #383 from hatal175/playeritemswordspin
Decompile the rest of playerItemBottle (renamed from sword spin)
2022-02-16 17:44:17 -08:00
notyourav 68777390c4
Merge pull request #382 from octorock/giantTwig 2022-02-16 00:23:09 -08:00
octorock ae19c4df96 Decompile Object8E 2022-02-16 08:06:39 +01:00
notyourav 712ca6fc91
Merge pull request #380 from octorock/ezloCap 2022-02-15 10:06:53 -08:00
Tal Hayon 03c6c4a8a8 Decompile stockwell asm_funcs 2022-02-14 06:25:19 +02:00
notyourav caa11c47ef
Merge pull request #379 from octorock/movement
Begin decompiling movement
2022-02-13 20:22:23 -08:00
notyourav c079439552
Merge pull request #378 from octorock/frozenWaterElement 2022-02-13 19:29:00 -08:00
Tal Hayon 65ab0fb1cb Decompile the rest of playerItemBottle (renamed from sword spin) 2022-02-13 07:05:15 +02:00
octorock cea5d6cc1c Decompile FrozenWaterElement 2022-02-13 02:30:06 +01:00
octorock c7b32e7a09 Decompile GiantTwig 2022-02-13 01:10:36 +01:00
octorock 891d99bab4 Decompile EzloCap 2022-02-12 22:50:59 +01:00
octorock b69a6d223c Rename movement functions 2022-02-12 20:03:27 +01:00
octorock d6c79aa263 Rename enemy functions 2022-02-12 20:03:27 +01:00
octorock 75c57e3124 Decompile movement 2022-02-12 20:03:27 +01:00
Tal Hayon dc88664f58 Decompile the rest of mountainMinish 2022-02-12 18:18:04 +02:00
notyourav faaf9c768d
Merge pull request #369 from hatal175/boolcast 2022-02-11 16:44:33 -08:00
notyourav 8c964eedd0
Merge pull request #367 from hatal175/roominit 2022-02-11 16:40:43 -08:00
Tal Hayon 60b452d630 Remove struct from gArea.unk_0c 2022-02-11 14:59:14 +02:00
Tal Hayon ad2b1bc0c3 Remove boolcast uses from code 2022-02-11 14:55:35 +02:00
notyourav 16d8e14488
Merge pull request #368 from Henny022p/item-metadata 2022-02-10 22:55:14 -08:00
notyourav 37b8803cdc
Merge pull request #366 from octorock/eyegore 2022-02-10 22:38:09 -08:00
notyourav 2e6ccdea74
Merge pull request #365 from Henny022p/droptables
DeathFx, EnemyUtil
2022-02-10 20:00:24 -08:00
Henny022p 4860ed1fe0 extract item metadata table 2022-02-10 02:21:52 +01:00
Tal Hayon 44295c9e06 Decompile roomInit.c asm_funcs 2022-02-10 02:52:50 +02:00
Henny022p d64fea8164 moved gCurrentAreaDroptable into gRoomVars properly
also rename globals
2022-02-10 01:29:15 +01:00
octorock 24e168dd2d Decompile Eyegore 2022-02-10 00:49:44 +01:00
notyourav 8f76bdda64
Merge pull request #363 from hatal175/manager22 2022-02-09 15:46:53 -08:00
octorock 3649a3e016 Decompile Armos 2022-02-09 09:11:27 +01:00
Henny022p 3297dc905c some more documentation 2022-02-09 03:58:04 +01:00
Tal Hayon e04be6b618 Decompile Manager22 2022-02-09 04:24:43 +02:00
Henny022p 61e780fb2a decomp deathFx.c 2022-02-09 00:15:58 +01:00
Henny022p 9360acdcc6 decomp enemyUtils.c 2022-02-08 22:19:23 +01:00
notyourav 358f8c87cc
Merge pull request #359 from octorock/enemy50 2022-02-08 13:05:39 -08:00
notyourav 40308acbe9
Merge pull request #356 from octorock/stalfos 2022-02-07 18:14:28 -08:00
notyourav e9ce049ed7
Merge pull request #355 from octorock/mulldozer 2022-02-07 18:09:14 -08:00
octorock 22a28648e6 Decompile Stalfos 2022-02-06 11:15:41 +01:00
notyourav f4d86a61f8
Merge pull request #350 from octorock/enemy64 2022-02-06 02:05:29 -08:00
octorock 7e7e1525b9 Decompile Enemy50 2022-02-06 10:56:57 +01:00
notyourav 318f112e2b
Merge pull request #348 from octorock/ghini 2022-02-06 01:53:17 -08:00
octorock 1f185160ac Decompile Mulldozer 2022-02-05 22:10:23 +01:00
octorock 192419c7ad Decompile Enemy62 2022-02-05 13:07:26 +01:00
octorock e59664435e Decompile Enemy64 2022-02-05 13:07:06 +01:00
octorock 584e232bed Decompile Ghini 2022-02-05 13:04:14 +01:00
Henny022p b769e0e192 added some documentation about droptables 2022-02-03 06:18:17 +01:00
Henny022p bbc3a88415 CreateRandomDrop and droptables 2022-02-03 05:52:50 +01:00
notyourav db8dfd44b2
Merge pull request #345 from octorock/object97 2022-02-02 12:34:37 -08:00
notyourav 408fec1619
Merge pull request #343 from octorock/wizzrobes
Decompile Wizzrobes
2022-02-01 22:09:53 -08:00
octorock 99076969de Decompile Object97 2022-02-02 07:07:01 +01:00
notyourav dcc3ac2192
Merge pull request #341 from Henny022p/subtask 2022-02-01 20:28:25 -08:00
notyourav fccda2459d
Merge pull request #337 from octorock/push-and-pull 2022-02-01 18:47:18 -08:00
octorock 5ab9443679 Decompile Wizzrobes 2022-01-31 21:25:43 +01:00
Henny022p 5824dc8467 clang format 2022-01-31 17:33:26 +01:00
Henny022p 2a53ee4bf2 merge master 2022-01-31 17:30:51 +01:00
Henny022p 9b60d9c5e2 sorted pause menu 2022-01-31 17:21:01 +01:00
octorock ff7147e9da Decompile PushableRock 2022-01-29 23:55:23 +01:00
Tal Hayon b4f8429a2c Use PlayerFlags where possible 2022-01-30 00:32:10 +02:00
Henny022p 82fa5159fd sorted kinstone and figurine menu 2022-01-25 00:44:48 +01:00
octorock d550d58ff3 Decompile BigPushableLever 2022-01-24 22:24:07 +01:00