27 Commits

Author SHA1 Message Date
Anghelo Carvajal fd05811213 m_trademark OK (#192)
* C file

* trademark_init

* trademark_cancel, trademark_move, trademark_main

* trademark_draw

* trademark_goto_demo_scene and func_80805360_jp

* set_npc_4_title_demo

* func_80804C40_jp

* trademark_cleanup

* func_808052B8_jp

* func_80805104_jp

* func_80804F78_jp

* func_80804EE0_jp

* fix warnings

* small cleanup

* fix build

* some fixes

* stuff

* some cleanups

* Fix rebase

* Import data

* Migrate bss

* cleanup

* Save substruct

* format

* TrademarkState and some other stuff

* remove fake match

* stuff I missed

* whoops

* Stupid `-Wtype-limits`

* Update src/overlays/gamestates/ovl_trademark/m_trademark.c

Co-authored-by: Prakxo <87568477+Prakxo@users.noreply.github.com>

* Review

* Update src/overlays/gamestates/ovl_trademark/m_trademark.c

Co-authored-by: emilybrooks <emilybrooksemilybrooks@gmail.com>

* Update src/overlays/gamestates/ovl_trademark/m_trademark.c

Co-authored-by: Prakxo <87568477+Prakxo@users.noreply.github.com>

* clang-tidy changes???

* review

---------

Co-authored-by: Prakxo <87568477+Prakxo@users.noreply.github.com>
Co-authored-by: emilybrooks <emilybrooksemilybrooks@gmail.com>
2024-05-30 14:00:57 -07:00
Derek Hensley fa63b7c79b Use gar for macs (#169) 2024-04-12 09:44:36 -07:00
Derek Hensley c632d1d20b Link libultra archive (#149)
* git subrepo pull --force lib/ultralib

subrepo:
  subdir:   "lib/ultralib"
  merged:   "34e07ce"
upstream:
  origin:   "git@github.com:decompals/ultralib.git"
  branch:   "main"
  commit:   "34e07ce"
git-subrepo:
  version:  "0.4.6"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "110b9eb"

* Link in libultra archive

* git subrepo pull (merge) lib/ultralib

subrepo:
  subdir:   "lib/ultralib"
  merged:   "ce7b219"
upstream:
  origin:   "git@github.com:decompals/ultralib.git"
  branch:   "main"
  commit:   "caf88de"
git-subrepo:
  version:  "0.4.6"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "110b9eb"

* Update paths in lib warnings

* git subrepo pull (merge) lib/ultralib

subrepo:
  subdir:   "lib/ultralib"
  merged:   "4f49c1e"
upstream:
  origin:   "git@github.com:decompals/ultralib.git"
  branch:   "main"
  commit:   "299d7fa"
git-subrepo:
  version:  "0.4.6"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "110b9eb"

* FIXUPS
2024-02-26 08:18:26 -07:00
Derek Hensley a10bb11ed6 Build Sync (#147)
* Makefile cleanup

* venv

* baseroms folder

* Jenkinsfile

* Remove z64compress

* Small cleanup

* More small fixes

* diff_settings fix

* Fix jenkins

* make compress in readme
2024-02-23 15:35:09 -07:00
emilybrooks a187e97a8a Updated splat, implemented new palette system (#146)
* image_type_in_extension

* new palette extension

* global_id not found

* updated splat

* disaster

* changed wording

* fixed fall texture names

* delete bin_to_inc_c script

* forgot to rename
2024-02-21 07:31:13 -07:00
emilybrooks 93fa8a0e9e Implement asset extraction (#131)
* got stuff to extract properly

* je and bs extensions done

* got symbols named correctly

* extensions done, symbol naming done

* fixed some errors

* fixed more of them

* stuff

* started editing make file

* makefile works

* ci4 and palette extensions done

* cleaned up ckf_je extension

* fixed vertex problem

* cleaned up asset yaml

* cleaned up extensions

* added tol_cracker_1

* builds properly

* finished obj_s_yamishop and obj_w_yamishop

* updated to work with latest splat

* fixes

* makefile asset dir

* remove old codes from af_ci4.py
2024-01-08 13:00:03 -07:00
emilybrooks 093b8b7b9b Update splat to library version 0.21.0 (#130)
* build not matching for some reason

* partial fix

* builds properly now

* remove pigment64 from readme
2024-01-06 15:51:16 -07:00
Anghelo Carvajal 9e081075d0 Makefile fixes for mac (#114)
* Don't invoke cpp when building `.s` files

* abort a rule if a piped command fails

* update missing step on the readme

* macos
2023-11-05 11:56:51 -07:00
Derek Hensley 282ac6d404 Libido OK (#84)
* libido OK

* boot cleanup

* format

* renames
2023-09-02 19:42:26 -07:00
Derek Hensley 1e3511efea Fault + Fault_drawer (#77)
* Fault OK

* fault_drawer OK

* Cleanup

* Cleanup pt 2

* Forgot to save

* PR
2023-08-28 09:59:31 -07:00
Anghelo Carvajal 647f6deed4 Bootstrap actors (#56)
* rename actors to their profile names. still need to rename thir files

* name the files of almost half the actors

* name the files of the rest of the actors

* name functions used in actor profiles

* create c files

* fix building

* fix fake symbol in ac_ball

* make headers

* bootstrap most of the stuff

* rename ovl_player_actor to player_actor

* name all the actor enums

* actor and object enums

* flags

* restore comment

* avoid building asm/lib because it can be problematic for FULL_DISASM

* format
2023-08-16 16:29:49 -07:00
Derek Hensley 1ece5c6e6b Full Disasm (#55)
* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "6ec2b39"
upstream:
  origin:   "git@github.com:ethteck/splat.git"
  branch:   "master"
  commit:   "6ec2b39"
git-subrepo:
  version:  "0.4.6"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "110b9eb"

* Add FULL_DISASM toggle

* Fix bootclear
2023-08-16 10:04:55 -07:00
Prakxo a2deca64d2 aprintf OK (#51)
* m_pause OK

* yeah now it's OK lol

* refactor

* refactor 2

* m_controller OK

* format

* fix size comment in game

* refactor 3

* refactor 4

* refactor 5

* add unused macro

* aprintf OK
2023-08-15 10:21:42 -07:00
Anghelo Carvajal f19df74c6e m_actor.c with 1 NON_MATCHING (#49)
* C file

* drafts

* Actor_info_ct and Actor_info_dt

* Actor_info_make_actor draft

* new_var = &argC;

* func_80057940_jp

* Actor_free_overlay_area, actor_free_check, Actor_get_overlay_area, func_80057940_jp, Actor_data_bank_regist_check

* Shape_Info_init

* Actor struct's size confirmed, Actor_malloc_actor_class and Actor_init_actor_class

* func_80056380_jp, Actor_info_part_new, restore_fgdata, Actor_info_delete

* Actor_info_draw_actor

* Actor_data_bank_dma_end_check, Actor_draw_actor_no_culling_check, Actor_draw_actor_no_culling_check2, Actor_cull_check, Actor_delete_check, Actor_info_make_child_actor, restore_fgdata_all, Actor_info_save_actor

* gSegments

* Actor_world_to_eye, Actor_position_speed_set, Actor_position_moveF and func_80057B70_jp

* Actor_player_look_direction_check

* Actor_position_move

* find m_kankyo file split

* Actor_ct

* fgName

* projection_pos_set, Actor_display_position_set

* Actor_info_call_actor

* func_80057A8C_jp

* import data and bss

* cleanups

* more cleanup

* format

* and even more cleanup

* hilite funcs

* Part_Break_init

* and more cleanup

* Actor_draw

* fake stuff

* Part_Break stuff from OoT

* a

* fix

* fix fake symbol

* fix

* fix
2023-08-14 15:35:04 -07:00
Anghelo Carvajal 380681908d Add warnings checker to Jenkins (#40)
* Bring over MM's warnings_count system

* Generate base warnings

* Hook warnings to Jenkins

* Fix setup warnings

* splat flag

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "20922ca"
upstream:
  origin:   "git@github.com:ethteck/splat.git"
  branch:   "master"
  commit:   "20922ca"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* update fixed stuff

* fix warnings

* Fix "F3DEX_GBI_2 redefined" warning

* git subrepo pull --force lib/ultralib

subrepo:
  subdir:   "lib/ultralib"
  merged:   "d163fa4"
upstream:
  origin:   "git@github.com:decompals/ultralib.git"
  branch:   "main"
  commit:   "d163fa4"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* update warning count for lib

* restore custom gbi.h
2023-08-10 12:36:28 -04:00
Anghelo Carvajal 0d54e2ae4c libc64.a identification (#45)
* __osMalloc

* aprintf.c

* math64.c

* qrand.c

* sleep.c

* sprintf.c

* malloc.c

* fixes

* fp and math64 cleanup

* RAD_TO_BINANG
2023-08-10 11:41:19 -04:00
Anghelo Carvajal fd54debbf2 libu64.a identification (#43)
* identify debug

* identify gfxprint.c and gfxprint_data.c

* pad.c

* fix

* stackcheck

* loadfragment and logseverity

* mtxconv

* comment

* Revert "loadfragment and logseverity"

This reverts commit 34d8214aa3.

* review

* fix

* another fix

* fix
2023-08-09 21:21:12 -04:00
Anghelo Carvajal c7729c05c0 game.c OK (#37)
* C file

* game_dt

* game_ct

* fix offsets and building

* game_init_hyral and SetGameFrame

* more funcs

* game_main

* game_get_controller and func_800D2E00_jp

* Input

* game_draw_last

* a few attempts

* game_draw_first

* improve func_800D2E58_jp a bit

* format

* migrate data and bss

* what

* whoops

* name bss

* minor cleanup

* match game.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* fix malloc function wrongly named

* Update src/code/game.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* review

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-08-09 20:51:25 -04:00
Anghelo Carvajal cfa703f013 malloc.c (#42)
* malloc

* match

* bss

* Fix naming

* move __osMalloc to libc64 folder

* move headers to libc64 folder
2023-08-09 20:45:25 -04:00
Derek Hensley 5b54707958 Viconfig OK (#29) 2023-08-04 12:02:33 -04:00
Derek Hensley 33ec543467 Libultra OK (#20)
* Identify last 2 libultra files

* BSS left

* Update not built files

* libultra OK

* Makefile formating

* Identify last couple data files

* libultra section headers

* Paddings

* Fix one padding

* move non_shared to CLFAGS and ASFLAGS

* git subrepo pull --force lib/ultralib

subrepo:
  subdir:   "lib/ultralib"
  merged:   "b376559"
upstream:
  origin:   "git@github.com:decompals/ultralib.git"
  branch:   "main"
  commit:   "b376559"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"

* Remove duplicate -non_shared

* .hasm

* Jenkins

* GBIDEFINE
2023-07-31 20:42:21 -04:00
Derek Hensley ea9f4c68bb LoadFragment 2 OK (#2)
* load_fragment2

* dma.h

* og DoRelocation

* comment format

* A few more docs

* symbol

* remove _ from loadfragment2

* ptrdiff_t

* z_std_dma.h

* Format

* load.h -> loadfragment.h

* laodframgnet2 file optflags

* Small notes

* Per directory O2
2023-07-29 13:23:35 -04:00
Anghelo Carvajal 632ff4b2ab Build a compressed ROM (#16)
* git subrepo clone (merge) --branch=5da3132606e4fd427a8d72b8428e4f921cd6e56f git@github.com:z64tools/z64compress.git tools/z64compress

subrepo:
  subdir:   "tools/z64compress"
  merged:   "5da3132"
upstream:
  origin:   "git@github.com:z64tools/z64compress.git"
  branch:   "5da3132606e4fd427a8d72b8428e4f921cd6e56f"
  commit:   "5da3132"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* z64compress_wrapper.py

* fixes

* dmadata.c

* readme

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "01ac556"
upstream:
  origin:   "git@github.com:ethteck/splat.git"
  branch:   "master"
  commit:   "01ac556"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* segment_end_before_align: True

* Add compressed step to jenkinsfile

* TODO

* format

* remove from boot_variables.h

* simplify

* Change makefile to match MM
2023-07-29 12:52:32 -04:00
Anghelo Carvajal 39a2e453bb Do not use undefined_syms_auto files when linking (#15)
* remove some symbols

* Adding more symbols to undefined_syms.ld

* Avoid using the undefined_auto completely

* relocs for entry.s
2023-05-08 12:33:08 -04:00
Anghelo Carvajal 35cb5d1cfc Integrate sheet knowledge into the repo (#9)
* boot splits

* code file splits

* functions from sheets

* symbols from the sheet

* bootstrap headers

* common_data

* most segments

* headers for boot files

* add overlays as placeholders

* unname _os files

* named a few files

* code headers

* typo

* Disassemble every overlay

* bootstrap symbol_addrs_overlays.txt

* split yamls

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-04-03 11:54:50 -04:00
Anghelo Carvajal 78b87b21fb Jenkins CI (#8)
* Jenkinsfile

* Fix format path

* I have the stupid

* Change CC_CHECK to gcc

* Update Makefile

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-04-01 20:32:16 -03:00
Anghelo Carvajal d66a21685f Initial repo setup (#1)
* git subrepo clone git@github.com:ethteck/splat.git tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "4fec014"
upstream:
  origin:   "git@github.com:ethteck/splat.git"
  branch:   "master"
  commit:   "4fec014"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* gitignore

* decompress_baserom.py

* Initial yaml

* run flib

* more yaml stuff

* Builds an uncompressed ROM

* setup ido download

* git subrepo clone git@github.com:simonlindholm/asm-differ.git tools/asm-differ

subrepo:
  subdir:   "tools/asm-differ"
  merged:   "ae40866"
upstream:
  origin:   "git@github.com:simonlindholm/asm-differ.git"
  branch:   "main"
  commit:   "ae40866"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo clone git@github.com:simonlindholm/asm-processor.git tools/asm-processor

subrepo:
  subdir:   "tools/asm-processor"
  merged:   "bbd86ea"
upstream:
  origin:   "git@github.com:simonlindholm/asm-processor.git"
  branch:   "main"
  commit:   "bbd86ea"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo clone (merge) git@github.com:EllipticEllipsis/fado.git tools/fado

subrepo:
  subdir:   "tools/fado"
  merged:   "8d896ee"
upstream:
  origin:   "git@github.com:EllipticEllipsis/fado.git"
  branch:   "master"
  commit:   "8d896ee"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* setup ido in makefile

* data and rodata

* add automatic file splits

* bootstrap most symbol_addrs

* git subrepo clone --branch=irix git@github.com:hensldm/ultralib.git lib/ultralib

subrepo:
  subdir:   "lib/ultralib"
  merged:   "0d1e095"
upstream:
  origin:   "git@github.com:hensldm/ultralib.git"
  branch:   "irix"
  commit:   "0d1e095"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* setup ido building

* various tooling

* git subrepo pull tools/asm-differ

subrepo:
  subdir:   "tools/asm-differ"
  merged:   "857b398"
upstream:
  origin:   "git@github.com:simonlindholm/asm-differ.git"
  branch:   "main"
  commit:   "857b398"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* Change defines to match IDO

* review

* newlin

* update gitignore

* Windows error

* D_01000000

* yeet settings.json

* yeet

* git subrepo clone git@github.com:decompals/ultralib.git lib/ultralib

subrepo:
  subdir:   "lib/ultralib"
  merged:   "d03b2a3"
upstream:
  origin:   "git@github.com:decompals/ultralib.git"
  branch:   "main"
  commit:   "d03b2a3"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* clangformat and clangtidy

* Setup a bunch of headers

* bootstrap boot and code functions and variables headers

* global.h

* update format.py includes

* -D_MIPS_SZLONG=32

* format.py: --verbose

* Update tools/decompress_baserom.py

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Add libc to global.h

* review

* yeet saved_regs

* yeet headers

* yeet _MSC_VER

* more header cleanup

* add readme licensing note

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-03-29 03:42:56 +01:00