Commit Graph

2600 Commits

Author SHA1 Message Date
notyourav f26c22b0bf
Merge pull request #114 from notyourav/shift
more textbox
2021-01-31 20:34:07 -08:00
theo3 d58f3fbd63 more textbox 2021-01-31 20:33:33 -08:00
notyourav 44a7255d63
Merge pull request #113 from notyourav/main
Main
2021-01-31 11:26:32 -08:00
theo3 82e6c864bd Merge branch 'upstream/master' into main 2021-01-31 11:24:17 -08:00
theo3 ced13c2c8d finish main.c 2021-01-31 11:23:42 -08:00
Ibot02 4120161dec
Merge pull request #112 from Ibot02/manager26
Manager26.c: ok
2021-01-22 00:51:17 +01:00
Ibot02 468746bf6d manager26.c: moved struct for rom data to header 2021-01-22 00:38:22 +01:00
Ibot02 44915bff1f manager26 and manager27: split out rodata 2021-01-21 20:24:49 +01:00
Ibot02 ba81e992a1 manager26.c: ok 2021-01-21 20:06:16 +01:00
Ibot02 02632295f2
Merge pull request #111 from Ibot02/manager28
Manager28.c: ok
2021-01-21 20:04:35 +01:00
Ibot02 dee308d56d manager28.c: more renaming 2021-01-18 16:58:25 +01:00
Ibot02 bbfd834855 manager28.c: split out rodata and rename functions 2021-01-18 16:39:53 +01:00
Ibot02 0dab5bbc99 manager28.c: ok 2021-01-18 16:05:52 +01:00
notyourav 9dc15ba380
Merge pull request #110 from notyourav/player
begin player.c and new nonmatching macro
2021-01-16 16:58:57 -08:00
theo3 b9e07c1202 begin player.c and new nonmatching macro
merge

fix
2021-01-16 16:57:51 -08:00
notyourav 303a89da03
Merge pull request #109 from Ibot02/code_0807DF74
executeScriptCommandSet.c: ok
2021-01-16 16:51:10 -08:00
Ibot02 a14614a1a3 executeScriptCommandSet: Split stuff into headers. 2021-01-15 22:46:43 +01:00
Ibot02 63038b4c6b code_0807DF74.c: ok
ExecuteScriptCommandSet and functions in gUnk_0811E524.
2021-01-15 17:59:29 +01:00
notyourav 97d9168e3a
Merge pull request #108 from HookedBehemoth:includes_for_guydra
fix includes
2020-12-28 21:31:34 -08:00
Luis Scheurenbrand 1fedd92141 include guard for createEnemy 2020-12-26 02:27:11 +01:00
Luis Scheurenbrand 8b7d88cac2 fix includes 2020-12-26 02:22:25 +01:00
theo3 86cfc34431 fix linker 2020-12-15 21:05:34 -08:00
notyourav 5fccbbeb11
Merge pull request #107 from Ibot02:manager39
manager39.c: ok
2020-12-15 21:02:49 -08:00
notyourav 196c8505be
Merge pull request #106 from Ibot02:manager1E
Manager1E.c: ok
2020-12-15 21:02:22 -08:00
notyourav bf60d34665
Merge pull request #105 from Ibot02:managerC
managerC.c: ok
2020-12-15 21:01:50 -08:00
Ibot02 15ccb18527 manager39.c: ok 2020-12-12 12:57:41 +01:00
Ibot02 a4aa5428ca manager1E.c: ok
Also split out rodata

Based on #105 rather than master as they touch the same rodata file
2020-12-12 01:46:22 +01:00
Ibot02 e7a185298c managerC.c: split out rodata 2020-12-04 16:36:03 +01:00
Ibot02 0f562885f9 managerC.c: ok
one minor non_matching
2020-12-04 16:36:03 +01:00
notyourav b876bbc28e
Merge pull request #104 from notyourav/jenkins
Jenkins
2020-11-23 23:46:40 -08:00
theo3 46a40cac80 Merge remote-tracking branch 'upstream/master' into jenkins 2020-11-23 23:45:55 -08:00
theo3 a5d611f768 jenkins support 2020-11-23 23:45:41 -08:00
notyourav ca6f431978
Merge pull request #103 from notyourav:documentation
code_0805F9A0
2020-11-23 22:28:44 -08:00
notyourav fb0cc8763e
Merge branch 'master' into documentation 2020-11-23 22:24:25 -08:00
notyourav 25f4ca19bf
Merge pull request #102 from Ibot02:gyorgMale
gyorgMale.c: ok
2020-11-23 22:22:11 -08:00
theo3 edbf03101a done 2020-11-23 22:18:34 -08:00
theo3 0b52f80e4d code_0805F9A0 2020-11-23 22:18:05 -08:00
Ibot02 7c1391f5c0 gyorgMale.c: split out rodata 2020-11-23 18:19:40 +01:00
Ibot02 275041cd5a Update Progress Bar 2020-11-23 17:19:26 +01:00
Ibot02 140a473622 gyorgMale.c: ok 2020-11-23 17:17:20 +01:00
theo3 d2d35118bc clang-format 2020-11-17 17:29:05 -08:00
notyourav a933aa889e
Merge pull request #101 from Ibot02:objectA2
objectA2.c: ok
2020-11-17 17:27:42 -08:00
Ibot02 a7e958e262 objectA2.c: split out rodata 2020-11-17 18:10:51 +01:00
Ibot02 22a04e5f0e objectA2.c: ok 2020-11-17 18:09:42 +01:00
notyourav 98c0495304
Merge pull request #100 from notyourav/formatting
clang-format and newlines
2020-11-13 23:28:35 -08:00
theo3 3079c016b4 clang-format and newlines 2020-11-13 23:27:50 -08:00
notyourav 8fd7481395
Merge pull request #99 from Ibot02:manager9
manager9.c: ok
2020-11-12 19:37:14 -08:00
Ibot02 c95682f93d manager9 and managerA rodata 2020-11-11 13:17:35 +01:00
Ibot02 3c280ff75c manager9.c: ok 2020-11-11 12:45:13 +01:00
notyourav 370fe95963
Merge pull request #98 from 21aslade:master
lakitu.c documentation, start chuchuBoss.c
2020-11-10 17:55:32 -08:00