Code

Merge zeldaret/oot changes#162

Code

Merged

Yanis002 merged 81 commits intoHackerN64:mainHackerN64/HackerOoT:mainfrom Yanis002:decomp_mergeYanis002/HackerOoT:decomp_mergeCopy head branch name to clipboardJan 7, 2025

+29,544-9,577

Commits

Commits on Dec 2, 2024

• More descriptive names for CS_BEGIN_CUTSCENE and CS_END (#2311)

  Show description for bdc7740
  

  3 peopleauthored
  bdc7740

  Copy full SHA for bdc7740

Commits on Dec 3, 2024

• named missing actor cue lists command types (#2317)

  Yanis002

  authored
  54c4ce8

  Copy full SHA for 54c4ce8

Commits on Dec 4, 2024

• Rename and document Adult Ruto functions (#2288)

  Show description for 3a07abb
  

  JordanLongstaff

  and

  fig02

  authored
  3a07abb

  Copy full SHA for 3a07abb

Commits on Dec 5, 2024

• Name asset extraction tools more consistently (#2316)

  cadmic

  authored
  b2d3c05

  Copy full SHA for b2d3c05

Commits on Dec 6, 2024

• ru2 fixes (#2323)

  fig02

  authored
  a96ada0

  Copy full SHA for a96ada0

Commits on Dec 7, 2024

• Name some scene cutscenes (Hyrule Field and Kakariko Village) (#2321)

  Show description for da7958d
  Yanis002

  authored
  da7958d

  Copy full SHA for da7958d

• Renamed EVENTCHKINF_3A (#2325)

  Show description for 4d902dc
  JordanLongstaff

  authored
  4d902dc

  Copy full SHA for 4d902dc

• Rename EVENTCHKINF_02 (#2322)

  Show description for 6735eb2
  JordanLongstaff

  authored
  6735eb2

  Copy full SHA for 6735eb2

• Replaced EVENTCHKINF_4E (#2327)

  Show description for df2450a
  

  JordanLongstaff

  and

  mzxrules

  authored
  df2450a

  Copy full SHA for df2450a

Commits on Dec 8, 2024

• Renamed EVENTCHKINF_4B (#2328)

  JordanLongstaff

  authored
  4d28d34

  Copy full SHA for 4d28d34

• Name Sleeping Waterfall state machine function (#2320)

  Show description for 7a0a90b
  JordanLongstaff

  authored
  7a0a90b

  Copy full SHA for 7a0a90b

• Document Player Params (#2307)

  Show description for bda5e94
  fig02

  authored
  bda5e94

  Copy full SHA for bda5e94

• Use MM names for some unnamed code files (#2312)

  cadmic

  authored
  06ceb8e

  Copy full SHA for 06ceb8e

• Rename code_800BB0A0.c -> z_cutscene_spline.c (#2313)

  Show description for 64de4a0
  cadmic

  authored
  64de4a0

  Copy full SHA for 64de4a0

• Rename code_80069420.c -> z_memory_utils.c (#2314)

  Show description for 40930ac
  cadmic

  authored
  40930ac

  Copy full SHA for 40930ac

Commits on Dec 9, 2024

• Split code_800D31A0.c into sys_freeze.c and sys_debug_controller.c (#2315)

  cadmic

  authored
  d886e76

  Copy full SHA for d886e76

• Add names for Medallion cutscene data (#2319)

  Show description for e9b165b
  JordanLongstaff

  authored
  e9b165b

  Copy full SHA for e9b165b

• Document Mido functions, fields, and animations (#2289)

  Show description for 9305a71
  Feacur

  authored
  9305a71

  Copy full SHA for 9305a71

Commits on Dec 10, 2024

• Rename EVENTCHKINF_4D (#2329)

  Show description for b76fe9d
  JordanLongstaff

  authored
  b76fe9d

  Copy full SHA for b76fe9d

• Renamed EVENTCHKINF_33 (#2326)

  Show description for c21c3fe
  JordanLongstaff

  authored
  c21c3fe

  Copy full SHA for c21c3fe

• Rename symbols related to Kakariko Well being drained (#2332)

  JordanLongstaff

  authored
  07751d3

  Copy full SHA for 07751d3

• Rename "temp" variables in Adult Ruto functions (#2335)

  Show description for c04ed0e
  JordanLongstaff

  authored
  c04ed0e

  Copy full SHA for c04ed0e

• Renamed EVENTCHKINF_3C (#2324)

  Show description for b01b206
  JordanLongstaff

  authored
  b01b206

  Copy full SHA for b01b206

Commits on Dec 11, 2024

• Rename EVENTCHKINF_69 (#2330)

  Show description for c780c4e
  JordanLongstaff

  authored
  c780c4e

  Copy full SHA for c780c4e

Commits on Dec 12, 2024

• Rename item get flags for Forest Stage upgrades (#2333)

  Show description for c57dff4
  JordanLongstaff

  authored
  c57dff4

  Copy full SHA for c57dff4

Commits on Dec 13, 2024

• Name Kokiri Forest cutscenes (and related ones) (#2338)

  Show description for 0fc3697
  Yanis002

  authored
  0fc3697

  Copy full SHA for 0fc3697

• Rename EVENTCHKINF flags for payments to Happy Mask salesman (#2331)

  Show description for a897017
  JordanLongstaff

  authored
  a897017

  Copy full SHA for a897017

• Document Culling (#2318)

  Show description for 016aef4
  fig02

  authored
  016aef4

  Copy full SHA for 016aef4

• Naming some cutscenes 4 (Gerudo Fortress, Death Mountain Crater and Goron City) (#2356)

  Show description for 2f40fed
  Yanis002

  authored
  2f40fed

  Copy full SHA for 2f40fed

• Name some cutscenes 3 (Zora's Domain, Zora's Fountain, Lost Woods and Desert Colossus) (#2355)

  Show description for d12750b
  Yanis002

  authored
  d12750b

  Copy full SHA for d12750b

• Naming cutscenes from Lon-Lon Ranch (#2359)

  Show description for 4b20d82
  Yanis002

  authored
  4b20d82

  Copy full SHA for 4b20d82

Commits on Dec 14, 2024

• [Audio 10/10] Loose ends (#2337)

  Show description for df5d4cb
  Thar0

  authored
  df5d4cb

  Copy full SHA for df5d4cb

• Move build.c definitions to the makefile, introduce and use libultra version defines in libultra instead of PLATFORM defines (#2353)

  Show description for 9170902
  Thar0

  authored
  9170902

  Copy full SHA for 9170902

• Name cutscenes from dungeons (Spirit Boss Room, Jabu-Jabu's Belly and Ganon) (#2361)

  Show description for a59a60e
  Yanis002

  authored
  a59a60e

  Copy full SHA for a59a60e

• name cs from chamber of sages, link's house, courtyard and shooting gallery (#2362)

  Yanis002

  authored
  7935162

  Copy full SHA for 7935162

• document func_8002F368 (#2358)

  Feacur

  authored
  0f27d2f

  Copy full SHA for 0f27d2f

Commits on Dec 15, 2024

• Name some scene cutscenes 2 (Graveyard, Meadow and Lake Hylia) (#2339)

  Show description for db8d351
  Yanis002

  authored
  db8d351

  Copy full SHA for db8d351

• removing due to deprecation (#2369)

  Show description for 9801a62
  

  ptweezy

  and

  BuildTools

  authored
  9801a62

  Copy full SHA for 9801a62

• Name cutscenes from Death Mountain Trail (#2357)

  Show description for 2eb0b91
  Yanis002

  authored
  2eb0b91

  Copy full SHA for 2eb0b91

• Add macros for line number differences (#2365)

  Show description for ff78b12
  fig02

  authored
  ff78b12

  Copy full SHA for ff78b12

• Fix macOS build (#2370)

  cadmic

  authored
  c9940fa

  Copy full SHA for c9940fa

• Remove ‾ character from source files (#2371)

  cadmic

  authored
  8056312

  Copy full SHA for 8056312

• Name cutscenes from Temple of Time (#2363)

  Show description for b270d58
  Yanis002

  authored
  b270d58

  Copy full SHA for b270d58

• Name cutscenes of remaining actors (#2366)

  Show description for 76c1b62
  Yanis002

  authored
  76c1b62

  Copy full SHA for 76c1b62

• use CS_TEXT_NORMAL when needed (#2367)

  Yanis002

  authored
  582f040

  Copy full SHA for 582f040

• Dockerfile Update (#2372)

  Show description for 4873788
  

  3 peopleauthored
  4873788

  Copy full SHA for 4873788

• Use iconv from Homebrew on macOS (#2374)

  Show description for bdb3656
  cadmic

  authored
  bdb3656

  Copy full SHA for bdb3656

• Add libiconv to text too (#2375)

  cadmic

  authored
  81f89b5

  Copy full SHA for 81f89b5

Commits on Dec 16, 2024

• Docker Build Change Proposal (#2373)

  Show description for 15ed658
  

  3 peopleauthored
  15ed658

  Copy full SHA for 15ed658

• Name cutscenes from the Master Sword and Deku Tree Mouth actors (#2364)

  Show description for 34c1b41
  Yanis002

  authored
  34c1b41

  Copy full SHA for 34c1b41

• fix tiny mistake (#2368)

  Yanis002

  authored
  f88e62b

  Copy full SHA for f88e62b

• Rename event check flags for boss battles (#2376)

  JordanLongstaff

  authored
  fdcfe49

  Copy full SHA for fdcfe49

Commits on Dec 17, 2024

• Reformat item00 drop tables (#2377)

  cadmic

  authored
  524597d

  Copy full SHA for 524597d

• Document z_horse.c and related actors (#2278)

  Show description for 1adf696
  mzxrules

  authored
  1adf696

  Copy full SHA for 1adf696

Commits on Dec 21, 2024

• Move const-qualified data from session_config.c to session_init.c, no longer qualify them as const and incrementally link instead (#2381)

  Thar0

  authored
  81df2d4

  Copy full SHA for 81df2d4

• Set up build system for ique-cn (#2382)

  Show description for 471fe51
  cadmic

  authored
  471fe51

  Copy full SHA for 471fe51

• Restructure event flags in z64save.h (1/?) (#2380)

  Show description for ee4b347
  mzxrules

  authored
  ee4b347

  Copy full SHA for ee4b347

• Fix editing PATH in macOS build instructions (#2379)

  Show description for 970639b
  cadmic

  authored
  970639b

  Copy full SHA for 970639b

Commits on Dec 24, 2024

• Move D_80134488 from system_heap.c to fp.s (#2387)

  Show description for 8a48c17
  cadmic

  authored
  8a48c17

  Copy full SHA for 8a48c17

Commits on Dec 25, 2024

• iQue text extraction (#2383)

  Show description for fbeb477
  Thar0

  authored
  fbeb477

  Copy full SHA for fbeb477

Commits on Dec 26, 2024

• Set up iQue disassembly (#2384)

  Show description for e10ecb2
  cadmic

  authored
  e10ecb2

  Copy full SHA for e10ecb2

• Download ido-recomp compiler binaries instead of committing them (#2388)

  Show description for aaf3183
  cadmic

  authored
  aaf3183

  Copy full SHA for aaf3183

• Fix iQue audio and line numbers (#2386)

  cadmic

  authored
  1662ac7

  Copy full SHA for 1662ac7

Commits on Dec 27, 2024

• Match iQue compression (#2389)

  Show description for ccfb359
  cadmic

  authored
  ccfb359

  Copy full SHA for ccfb359

• Restructure event flags in z64save.h (2/?): Carpenters (#2385)

  Show description for ba6a835
  mzxrules

  authored
  ba6a835

  Copy full SHA for ba6a835

Commits on Dec 28, 2024

• Use IDO for assembling handwritten asm files in src (#2390)

  Show description for 7e082f0
  

  Thar0

  and

  cadmic

  authored
  7e082f0

  Copy full SHA for 7e082f0

• Add missing vimode splits in iQue disassembly (#2393)

  cadmic

  authored
  a590995

  Copy full SHA for a590995

Commits on Dec 29, 2024

• Restructure event flags in z64save.h (3/?): Cursed Family Rewards (#2392)

  Show description for 95d5f5b
  mzxrules

  authored
  95d5f5b

  Copy full SHA for 95d5f5b

Commits on Dec 30, 2024

• Download EGCS binutils and gcc for iQue (#2391)

  Show description for ffc9f2d
  cadmic

  authored
  ffc9f2d

  Copy full SHA for ffc9f2d

Commits on Jan 2, 2025

• [iQue] Build some C files with EGCS (#2396)

  cadmic

  authored
  9dafc2f

  Copy full SHA for 9dafc2f

Commits on Jan 3, 2025

• [iQue] Match makerom (#2397)

  Thar0

  authored
  4c88cfd

  Copy full SHA for 4c88cfd

Commits on Jan 4, 2025

• [iQue] Match skapi.s, create bbskapi.h documenting the syscalls (#2400)

  Thar0

  authored
  bd606ba

  Copy full SHA for bd606ba

Commits on Jan 6, 2025

• Merge remote-tracking branch 'decomp/main' into decomp_merge

  Yanis002

  committed
  ced7d36

  Copy full SHA for ced7d36

• fix build issues (not the profiler because idk)

  Yanis002

  committed
  ad3e555

  Copy full SHA for ad3e555

• format

  Yanis002

  committed
  afce450

  Copy full SHA for afce450

• fix issues with the profiler (thanks to tharo)

  Yanis002

  committed
  62057cf

  Copy full SHA for 62057cf

• Match remaining IDO files for iQue (#2394)

  cadmic

  authored
  3aafbf3

  Copy full SHA for 3aafbf3

• [iQue] Match exceptasm.s and parameters.s (#2401)

  Thar0

  authored
  9a60c94

  Copy full SHA for 9a60c94

• [iQue] Match src/libc (#2405)

  cadmic

  authored
  c6cceea

  Copy full SHA for c6cceea

• Merge remote-tracking branch 'decomp/main' into decomp_merge

  Yanis002

  committed
  aa3503b

  Copy full SHA for aa3503b

• Merge remote-tracking branch 'upstream/main' into decomp_merge

  Yanis002

  committed
  7bf2f88

  Copy full SHA for 7bf2f88