Commit Graph

39 Commits

Author SHA1 Message Date
Leonid Kapitonov 8e54519977 ac_house_goki OK (#229)
* prepare unknown size

* move `.data` to the C side

* remove redundant headers

* aHG_actor_ct OK

* func_80A83770_jp OK (rename to `aHG_actor_dt`)

* aHG_actor_move OK

- fix `mCoBG_CheckResult` description and comments
- extend `MyRoomClip` and fix offsets in comments

* func_80A83780_jp OK

* func_80A83930_jp OK

* func_80A83994_jp OK

* func_80A83A00_jp OK

* func_80A8401C_jp OK

* func_80A8409C_jp OK (rename to `aHG_setup_action`)

* aHG_actor_draw OK

* func_80A83D4C_jp OK

* func_80A83A24_jp OK

* name HG models

* put static HG data into the functions

* func_80A837C4_jp OK

* add notes and clean up a bit

* apply a suggestion by @hensldm

* remove ASM pragmas

* extract assets
2024-12-07 12:27:42 -07:00
Leonid Kapitonov 0bab7e592c ac_radio OK (#226)
* prepare unknown size

* move `.data` to the C side

* aRAD_actor_ct OK

* func_80A76B2C_jp OK

* func_80A769E4_jp OK

* aRAD_actor_init OK

* func_80A76958_jp OK (rename to `aRAD_actor_dt`)

* func_80A76A30_jp OK

* func_80A76B4C_jp OK

* aRAD_actor_draw OK

* remove asm pragmas

* document `ac_radio` actions

* rename `func_80A769E4_jp` in accord with aKAG's

* rename `func_80A76B4C_jp` -> `aRAD_actor_move`

* use `StructureActor` as others do

* apply review suggestions

* seems to match too
2024-11-22 07:30:14 -07:00
emilybrooks 5fb92a5079 properly handle swapped textures (#215)
* set up extension

* extension works

* make file stuff

* everything works!

* renamed script
2024-09-25 11:50:06 -07:00
Derek Hensley fbc4e813e5 Move copied libultra archive to the libultra build folder (#199)
* Combine makefile defines to avoid duplication

* Move libultra archive in build to the libultra folder
2024-07-19 11:40:29 -07:00
emilybrooks 167abace84 update progress tracking (#194)
* ignore hasm files

* add assets to progress.py

* add assets to frogress script
2024-06-11 19:48:56 -07:00
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 2b650b1c6a Warnings_count fix (#186)
* warnings_count fix

* Split rom and compress in check_new_warnings.sh

* Jenkinsfile

* Fix full check

* A couple more small fixes
2024-05-16 22:42:31 -07:00
Anghelo Carvajal 47ad05c852 Update bss script (#181)
* check_reordering.py script

* bump some versions

* review
2024-04-24 12:42:34 -07:00
inspectredc 48c8a77bbf ac_tama OK (#179)
* ac_tama OK

* or else
2024-04-23 17:42:13 -07:00
inspectredc 99081d5a7e ac_kago OK and documented (#177)
* ac_kago OK and documented

* palette types

* suggestions + object stuff
2024-04-22 13:21:18 -07:00
emilybrooks 87c30f66d2 1/2 of structure objects extracted (#156)
* house2

* split yamishop

* split douzou

* split kago

* split dump

* split uranai

* split house

* fixed names

* obj_s_house3

* forgot

* obj_s_house4

* house5

* started winter houses

* w house3

* w_house4

* w_house5

* myhome2

* s myhome done

* w_myhome1

* freedom

* kouban

* small fixes
2024-03-16 08:09:26 -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 a60184c64b imported data for ac_train_window (#144)
* initial commit

* add space

* made till_data static
2024-02-14 11:26:50 -07:00
Prakxo eee794d4b6 Update m2ctx (#138)
* update m2ctx

* size fixes?

* size fix
2024-01-29 14:23:10 -07:00
emilybrooks 1d9c5c49c5 Second half of tool objects (#136)
* tol_keitai_1

* kenjyu

* evw_anime data extraction works

* forgot to remove this

* added comments for objects

* fixes

* scroll colprim colenv now extract as arrays

* forgot commas
2024-01-26 16:19:49 -07:00
Anghelo Carvajal 7606ac4586 Setup venv on Jenkinsfile (#135)
* Add venv to Jenkinsfile

* Add readme instructions to venv

* z64compress warning

* fix warnings
2024-01-18 16:06:10 -07:00
Anghelo Carvajal d6556e7e4d Update pigment64 to fix non-linux downloads (#133) 2024-01-14 10:01:33 -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
Derek Hensley 898b6fb3a4 Prepare for recomp update (#95) 2023-09-11 19:41:29 -07:00
Anghelo Carvajal c65a8dbc39 Game renaming (#63)
* rename GameState to Game

* Rename the structs

* fix table

* whoops

* rename play parameter

* format

* undo what i messed in z64compress
2023-08-17 09:19:13 -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
Anghelo Carvajal c7a746e71e Object table (#53)
* find object_table and make tool to extract it

* migrate object table

* update the assets yaml a bit

* comment

* name gameplay_keep

* change gameplay_keep to segment 4

* rename exclusive_ram_id to fit the segment used

* review
2023-08-16 10:21:44 -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
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 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 065751554f Bring over bss headers and bss script from MM (#38)
* prevent_bss_reordering header

* global_bss_check.py

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* rewrite bss script to use mapfile_parser

* Change collections for dataclasses

* update requirements.txt

* simplify some stuff

---------

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2023-08-06 13:49:16 -04:00
Derek Hensley 5d8e1f69bf Update first_diff.py (#36) 2023-08-06 12:19:13 -04:00
Anghelo Carvajal 94b300b0d0 m_actor_dlftbls.c (#32)
* start

* match the file

* actor_dlftbls_num

* script to extract the actor table

* bootstrap actor table

* ActorId enum

* migrate actor table

* reorganize overlays in subfolders

* Fix Player

* migrate bss

* cleanup and format

* ActorProfile

* Move player_actor to actors folder

* RomOffset

* ACTOR_ID_MAX
2023-08-05 10:58:09 -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 6d0c9276e8 Clang 14 (#24)
* Update format.py

* INCLUDES and DEFINES
2023-07-29 14:17:53 -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 ce93cd0262 Update subrepos (#19)
* git subrepo pull --force tools/asm-processor

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

* git subrepo pull lib/ultralib --force

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

* git subrepo pull tools/asm-differ --force

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

* git subrepo pull tools/splat --force

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

* Revert "git subrepo pull lib/ultralib --force"

This reverts commit da9fca47be.

* git subrepo pull tools/splat

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

* Disable asm size directive
2023-07-14 14:44:11 -04:00
Anghelo Carvajal 817a05c1ab Frogress script (#10)
* initial progress script

* uploadfrogress script

* Add Frogress step to Jenkinsfile

* rename to animalforest

* badge

* ZeldaRET
2023-04-03 12:22:52 -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