1c98ac27eb
Actor struct cleanup ( #208 )
...
* cleanup a few things
* fix mistake
* yawTowardsLink
* run format
* pr suggestion
2020-06-14 00:09:51 -04:00
06fc61c83d
Fix various non matching issues and introduce #ifdef NON_EQUIVALENT instead of #if 0 ( #207 )
2020-06-13 23:29:59 -04:00
031d946db7
z_select decompiled, 1 non matching left ( #202 )
...
* First pass z_select
* lots of progress. 2 non matchings and data stuff needed
* match Select_LoadGame
* z_select almost ok, 1 func left
* remove comments
* remove comments and add description
* remove unused flg_set asm
* set_next_gamestate macro
* pr suggestions 1
* pr suggestions 2
* map -> scene
* pr suggestions 3
Co-authored-by: Kelebek1 <eeeedddccc@hotmail.co.uk >
2020-06-13 22:59:58 -04:00
df3bfbc168
Fix sym_info.py and first_diff.py scripts to properly handle .bss ( #205 )
2020-06-12 21:56:17 -04:00
4e70a24274
Decompile z_bg_haka_trap.c ( #201 )
...
* Decompile z_bg_haka_trap.c
* Update spec
delete old .reloc.s file
Co-authored-by: Random <28494085+Random06457@users.noreply.github.com >
* Deleted reloc.s and made style changes to function pointers and local vars
* Renamed timer field, added more useful temp names
* Implemented Roman's suggestions, including moving enum to header file, moving some static variables inside functions, removing unnecessary casts, removing unnecessary temps, and fixing a few style issues
* Commented dual purpose of unk_16A and formatted file again
Co-authored-by: Random <28494085+Random06457@users.noreply.github.com >
2020-06-11 17:39:47 -04:00
a76356090b
Decompile flg_set.c ( #200 )
...
* Decompile flg_set.c
* Use a for loop and rename func_8002AAB0
* move the flag set array inside the function
2020-06-09 18:14:18 -04:00
a0ef48e987
Migrated rodata ( #199 )
2020-06-09 12:06:23 -04:00
8afab54c23
Decompile mempak.c ( #191 )
2020-06-07 19:38:33 -04:00
8705d40e54
Split ovl_file_choose and ovl_kaleido_scope ( #167 )
...
* Split ovl_file_choose and ovl_kaleido_scope
* Split ovl_kaleido_scope's rodata/data/bss
* fix
* fix spec
* spec fix
* hopefully last spec fix
* hopefully last spec fix 2
* fix
* Add comments on file boundaries
* fix
2020-06-07 13:52:43 -04:00
09d8cc529a
Decompile KaleidoScope_Draw ( #189 )
...
* Decompile KaleidoScope_Draw
* Naming
* Simplify (casts)
* Cleanup (comments)
* Delete the .s file
2020-06-07 13:02:27 -04:00
93e8dbcc9e
Decompile the last function in z_en_heishi2.c ( #195 )
2020-06-07 12:37:44 -04:00
b2df45ae06
Decompile ovl_Bg_Spot16_Doughnut ( #187 )
...
* Decompile ovl_Bg_Spot16_Doughnut
* Ran formatter
* Shorten float values
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
* Fix last float values
* Rename Update2 and Draw2
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
2020-06-07 10:54:44 -04:00
d7c9d8d86f
Add sym_info.py and first_diff.py scripts for convenience ( #192 )
2020-06-07 10:37:48 -04:00
e413325637
Add support for 'after' and 'number' in mkldscript and use 'after' to properly shift the code segment ( #194 )
...
* Add support for 'after' and 'number' in mkldscript
* Use 'after' in spec to ensure code ends up after dmadata in RAM
2020-06-07 10:31:11 -04:00
c10bcdc3c4
Fix and match func_800BFCB8 ( #196 )
2020-06-07 10:08:06 -04:00
80ca848cfb
Actor* player.unk_684 ( #193 )
...
* Actor* player.unk_684
* delete 8008EEAC.s
* Update include/z64actor.h
Co-authored-by: Random <28494085+Random06457@users.noreply.github.com >
Co-authored-by: Random <28494085+Random06457@users.noreply.github.com >
2020-06-07 09:47:11 -04:00
68f5d212a7
Fix remaining rom/ram pointers ( #190 )
2020-06-05 17:09:43 -04:00
94d810193a
ucode_disas.c progress ( #188 )
...
* ucode_disas.c progress
* fix
* minor fixes
* minor comment changes
2020-06-05 13:18:39 -04:00
e67c51b155
Give names to KaleidoScope_Update & KaleidoScope_Draw ( #185 )
2020-06-04 17:54:50 -04:00
c78d93ad78
Remove hard-coded pointers in several files ( #186 )
...
* fix hard-coded pointers in code_800DACC0.data.s
* fix hard coded pointer in code_800E11F0.data.s
* fix hard coded pointers in code_800EC960.data.s
* remove fixed pointers in code_800F7260.data.s
* fix hard coded pointers in code_800F9280.data.s
* remove accidental comment
* fix hard coded jump table in Camera_Unique9.s
2020-06-04 17:51:14 -04:00
d6fc300ed2
rename code_8007BF90.c to z_olib.c, rename functions in z_olib.c ( #181 )
...
* rename code_8007BF90.c to z_olib.c, rename functions in z_olib.c
* pr updates
2020-06-04 01:59:17 -04:00
69e30364b9
Convert z_map_data to C ( #183 )
...
* Convert z_map_data to C
* Style
Co-authored-by: Random <28494085+Random06457@users.noreply.github.com >
* Cleanup
Co-authored-by: Random <28494085+Random06457@users.noreply.github.com >
* Convert the whole file
* Cleanup
* Cleanup
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
* floorNames → floorID
* Style
* Format & fix switch array padding
* Remove trailing zeroes
* Cleanup
Co-authored-by: Random <28494085+Random06457@users.noreply.github.com >
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
2020-06-03 16:52:10 -04:00
78049aa5c5
Fix some missed and fake pointers in code ( #180 )
2020-06-01 18:55:34 -04:00
77137f5a04
Decompile z_camera data, and some camera WIP ( #173 )
...
* cleanup
* name camera action functions
* decompile a few small functions, name a few Camera struct members
* decompile camera data, decompile a few camera functions
* Split ASM for code_800BB0A0
* removing code_800BB0A0.s
* PR Requests, Camera WIP
* remove #define NON_MATCHING from db_camera
2020-06-01 17:54:47 -04:00
08aaba0d2c
Fix hard coded pointers in db_camera ( #179 )
2020-06-01 14:37:53 -04:00
78d0883f04
Actor Cleanups ( #177 )
...
* rename init chains, colchkinfo, colider inits, damage tables
* actor cleanups
* fix collider init script names
* small fixes
* ichain arg name
* change dynapoly types and names
* revert enru1 data name
* and the type
* pr suggestions
2020-05-31 05:55:48 -04:00
13a94482e5
Decompiled ovl_En_Zl1 ( #169 )
...
* Some progress
* progs
* More
* 1 more
* Init
* Slightly better score on one function
* 1 down!
* some progress
* Prep for PR
* PR suggestions
* OK!
* Formatting
* formatting again
* PR comments
* updating ZAP2
2020-05-30 09:33:29 -04:00
6d4558542a
All 110 scenes decompiled. ( #175 )
...
* Auto stash before rebase of "upstream/master"
* A large number of scenes have been decompiled.
* Fixed makefile
* Decompiled around 40 scenes.
* Removed old file
* Updated to newer version of ZAP2
* Finished matching remaining scenes.
* Added back ZAP2
* Removed old commented out spec lines
Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com >
2020-05-29 17:59:10 -04:00
ac97807762
En_Kz OK ( #176 )
...
* start kz
* remove irrelevant file
* kz progress
* en_kz progress
* match kz switch
* progress
* kz OK
* kz OK
* sync
* kz done
* delete asm files
* pr suggestions 1
2020-05-29 17:20:00 -04:00
038ab888f6
Decompiled ovl_Bg_Treemouth ( #168 )
...
* Almost done
* header
* Decompiled ovl_Bg_Treemouth
* fixing undefined sims
* PR suggestions
* PR suggestions
2020-05-29 17:08:40 -04:00
5937aea1d5
Migrate rodata for z_message_PAL and code_80110450 ( #174 )
...
* Migrate rodata for z_message_PAL and code_80110450
* Delete code_80110450.rodata.s
2020-05-28 03:49:58 -04:00
db987db9f8
Decompile flg_set data ( #172 )
...
* Decompile data for flg_set
* Ran formatter
* Remove data/ files
2020-05-27 12:46:59 -04:00
248c0587d6
ovl_End_Title OK ( #161 )
...
* One non matching left in ovl_End_Title
* ovl_End_Title OK
* formatting
* removed unused asm files
* changed 0xFF to 255
* updated dlist
* made suggested changes
2020-05-27 11:51:11 -04:00
c350eaeda5
Scene Header Command 0x0B is now OK ( #147 )
...
* Scene Header Command 0x0B is now OK
* Delete func_8009899C.s
* Updates assert check on func_8009899C
Per Roman's suggestion of placing the __assert outside of the if (1)
* Updates func_8009899C to have array access rather than pointer math
* Removes deprecated comment in func_8009899C
2020-05-27 10:10:03 -04:00
235b0b8e0b
Fix more raw pointers (rsp and part of .data) ( #170 )
...
Known files left with pointers in .data after this (possibly the only ones since I checked roughly everything):
- flg_set.c
- z_camera.c
- db_camera.c
- code_800D7CD0.c (ucode_disas.c)
- audio (not sure which ones, see the structure sheet)
2020-05-27 09:06:37 -04:00
77a9f9c9f8
Fix makefile to work with import scripts again (+ minor cleanups) ( #171 )
2020-05-27 07:49:51 -04:00
02fc5287cc
code_80106550 / llcvt.c and code_80104450 / ortho.c OK ( #163 )
...
* llcvt.c OK, added script from mm decomp to set mips3
* ortho.c OK
* added entries to functions.h
* named guNormalize.s
2020-05-27 03:48:07 -04:00
c68d752813
EnHata OK ( #155 )
...
* EnHata OK
* made/attempted suggested changes. still havent been able to fix the THIS in Update
2020-05-26 20:05:09 -04:00
53ceea717d
Properly align asm & data (+ minor fixes) ( #165 )
...
* Add .align 4 directives to all data/ files (+ minor alignment fixes)
* Use .balign for everything and fix typo
2020-05-26 18:09:00 -04:00
ba0e57eecd
Progress reporting through Jenkins (2) ( #166 )
...
* Progress reporting through Jenkins
* Update progress.py
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
* Jenkins reporting attempt 2
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
2020-05-26 17:00:22 -04:00
e3dc47efe7
Progress reporting through Jenkins ( #164 )
...
* Progress reporting through Jenkins
* Update progress.py
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
2020-05-26 16:36:30 -04:00
88946f303b
Decompiled 101 of the 110 scenes. ( #153 )
...
* Auto stash before rebase of "upstream/master"
* A large number of scenes have been decompiled.
* Fixed makefile
* Decompiled around 40 scenes.
* Removed old file
Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com >
2020-05-26 12:53:53 -04:00
442b15c79f
en_sb OK ( #159 )
...
* en_sb OK
* en_sb done
* remove asm
* remove diff.txt
* pr changes
* pr changes 2
* merge master and add description
2020-05-26 11:57:54 -04:00
d48792870c
Decompiles sched.c ( #145 )
...
* decompile sched.c
* rename Game_AllocEnd to Game_Alloc in z_effect_soft_sprite.c
* pr updates
2020-05-26 11:39:27 -04:00
3175f5c988
En_Skjneedle OK ( #162 )
...
* En_Skjneedle OK
* fix
* file deletions
* file deletions 2
* fix extern
* fix
* cleanup
2020-05-26 10:53:27 -04:00
1bb3e006cd
Move last 3 functions in z_message_PAL.c to a separate file ( #158 )
...
There is padding in 1.0 here, and rodata is also 16 bytes aligned at this point.
2020-05-26 10:32:18 -04:00
2c5ad24c3f
Migrate z_common_data.c's .bss to C ( #157 )
2020-05-26 08:50:51 -04:00
3d050f2861
Decompile a bunch of small files ( #160 )
...
* Decompile a bunch of small files
* Rename dacrate to dacRate
* Run format.sh
* Minor fixes in PR #160
2020-05-25 23:18:14 +02:00
13b1dc03bb
EnHintnuts OK ( #154 )
...
* merged from upstream
* matching
* named functions
* made suggested changes
2020-05-24 04:30:24 -04:00
e6b00f03bf
Decompile en_guest ( #151 )
...
* Start work on ovl_En_Guest
* Match func_80A5046C and func_80A50518
* Everything but func_80A509D4 matches
* Match last function, cleanup, rename stuff
* Run formatter
* Temp didn't need to be used
* I should have ran the formatter again
* Use tcrf translation for debug string
* Apply suggestions from code review
Co-authored-by: krimtonz <33664508+krimtonz@users.noreply.github.com >
* Rename references to function and fix semicolon
* Apply suggestions from code review
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
Co-authored-by: fig02 <fig02srl@gmail.com >
* PR Suggestions
* More comments
Co-authored-by: krimtonz <33664508+krimtonz@users.noreply.github.com >
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
Co-authored-by: fig02 <fig02srl@gmail.com >
2020-05-23 04:21:36 +02:00
fig02