Commit Graph

1145 Commits

Author SHA1 Message Date
inspectredc e88084fe65 Fix LensMode Enum Names (#1954) 2024-06-09 14:43:15 -04:00
Dragorn421 05c87518e7 Document pause page switching (#1550)
* Document pause page switching

* document initial scroll left setup, when opening the pause menu

* `PAUSE_MAIN_STATE_1` -> `PAUSE_MAIN_STATE_SWITCHING_PAGE`

* try a diagram of the pages layout in world space as a comment

* expand `nextPageMode` comment

* touch up pause camera header comments

* expand comment on irrelevant init `mainState = PAUSE_MAIN_STATE_SWITCHING_PAGE`

* expand doc on `sKaleidoSetup*` data

* expand docs on `gPageSwitchNextButtonStatus`

* add some doc on `sPageSwitch*` arrays

* SwitchPage -> PageSwitch

* add `PAGE_SWITCH_NSTEPS`

* `SWITCH_PAGE_*_PT` -> `PAGE_SWITCH_PT_*`

* peepoArtist

---------

Co-authored-by: fig02 <fig02srl@gmail.com>
2024-05-23 16:56:10 -04:00
cadmic b86e1774cf Rename yDistToWater -> depthInWater (#1950)
* Rename yDistToWater -> yDistUnderWater

* yDistUnderWater -> depthInWater
2024-04-28 17:29:06 -04:00
fig02 7e8b9144c2 Player Docs: Control stick buffers (#1945)
* name vars and add enum

* name some spin attack stuff

* fix right and left

* forward/backward

* format

* fix retail bss

* sControlStickWorldYaw
2024-04-22 17:35:22 -04:00
fig02 62b97badc9 Player Docs: Name some high level update calls (#1593)
* name some low hanging fruit

* revert burn and shock, doing in seperate pr

* add some function comments

* yaw func

* adjust comment

* some review

* unname UpdateZTarget

* Player_DetectRumbleSecrets

* fix dive do action name
2024-04-20 16:42:18 -04:00
fig02 7ea68e9506 Player Docs: Action Interrupt (#1947)
* document action interrupt

* format

* new function comment

* format

* add a note about items

* format
2024-04-19 11:01:04 -04:00
cadmic 9cbd57d329 Fix miscategorized scenes (#1946)
* Fix miscategorized scenes

* Sort includes
2024-04-18 22:21:34 -04:00
fig02 30eb05321d Player Docs: "sUpperBodyIsBusy" (#1944)
* document upperbodybusy

* change wording for comment and rename upperanimblendweight

* format

* review
2024-04-17 16:24:52 -04:00
cadmic d59ca6cea2 Set up gc-eu and match all code (#1938)
* Set up gc-eu and match all code

* Format

* Mark gc-eu-mq as WIP until it builds OK

* Move original/MQ map mark data to separate files

* Add #includes to .inc.c files to help out VS Code

* Use #if in spec instead of .inc.c files
2024-04-15 13:36:29 -04:00
fig02 295a8669b8 Player: Document "WaitForPutAway" (#1936)
* document put away delay

* functions.txt

* add a note on delaying indefinitely

* format

* typo

* delay -> wait for put away

* revert unintended formatting change

* add comment to struct member

* format

* fix functions.txt
2024-04-15 13:02:43 -04:00
cadmic f643499462 Match retail BSS ordering (#1927)
* Match retail BSS ordering

* Revert moving some global variables to headers

* Adjust block numbers after header changes

* Fix debug build

* Overlay bss ordering

* Fix BSS ordering after header changes

* gc-eu-mq OK

* Implement preprocessor for #pragma increment_block_number

* Transfer usage comment from reencode.sh

* Use temporary directory instead of temporary file

* Move ColChkMassType back
2024-04-14 23:51:32 +02:00
cadmic a94661054e Revert "Replace ‾ with - in z_bg_gnd_iceblock.c for encoding into EUC-JP (#1937)" (#1940)
This reverts commit a9ec5e1245.
2024-04-10 15:21:17 -04:00
cadmic a9ec5e1245 Replace ‾ with - in z_bg_gnd_iceblock.c for encoding into EUC-JP (#1937) 2024-04-01 11:27:49 -04:00
fig02 86bd6e9232 Document en_ba damage bug (#1934)
* comment on en_ba collision bug

* format
2024-03-29 11:27:34 -04:00
fig02 7445169e42 targetActor -> talkActor (#1933) 2024-03-24 12:27:45 -04:00
cadmic 8456e4be8a Match retail ovl_kaleido_scope (#1931)
* WIP

* cleanup

* small progress

* small cleanup

* Finish retail ovl_kaleido_scope

* GREG + markPoint -> markPoint + GREG

---------

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
2024-03-23 12:58:02 -04:00
cadmic 39de6ce293 Extract unused scene headers (#1930)
* Extract unused scene headers

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "1300a4f36"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "1300a4f36"
git-subrepo:
  version:  "0.4.6"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "110b9eb"

* Add more unused arguments to CS_LIGHT_SETTING
2024-03-23 12:38:05 -04:00
cadmic 872940d664 More data fixes (#1929) 2024-03-23 12:30:09 -04:00
fig02 bd0941405d Document Player's Face and z_actor FaceChange functions (#1928)
* create some enums

* gonna try struct instead of array

* struct works. add docs too

* inline function comments

* fix function comment

* name faces, move enums

* rename textures

* outnames

* remove comments

* change comment slightly

* fixup face comments

* review

* offset comments

* add and use PLAYER_FACE_MAX

* typo

* more comment on blinkDuration

* another change to the comment
2024-03-23 12:21:45 -04:00
Dragorn421 68a86d2d00 Colliders: change "touch, bump" to AT and AC (elems) (#1637)
* toucherFlags, bumperFlags -> atElemFlags, acElemFlags

* TOUCH_ -> ATELEM_

* BUMP_ -> ACELEM_

* ColliderElementTouch,Bump -> ColliderElementDamageInfoAT,AC

* toucher,bumper -> atDmgInfo,acDmgInfo

* Update docs and zcolchk funcs names

* run formatter

* remove the last mentions of "bump" for colliders

* Update renamed functions in disasm
2024-03-04 19:33:08 -05:00
cadmic 39d4217ecf Match retail BossFd2_UpdateMane (#1908) 2024-03-04 12:35:48 -05:00
cadmic 63a95da5db Match retail BossMo_DrawCore (#1907) 2024-03-04 18:22:23 +01:00
cadmic 9c09dcd4cd Match retail z_fishing.c (#1905) 2024-03-04 17:57:16 +01:00
cadmic e7b1868d84 Match retail BossFd_DrawBody (#1915) 2024-03-03 17:07:51 -05:00
Dragorn421 feb64e6ad8 Match retail text for some actors ❤️ (#1912)
* Match retail text for some of my dear actors

* Fix fake `EnDoor_SetupType` match, ty cadmic
2024-03-02 15:36:38 -05:00
Dragorn421 ff81e2a891 Build fixups: build gc-eu-mq with extracted/dbg, remove asmproc pragmas (#1911)
* Remove asmproc recurse (somehow these two survived)

* Use `extracted/gc-eu-mq-dbg` anyway for gc-eu-mq
2024-03-02 12:47:10 -05:00
cadmic 6b9a2433ab Match retail EnNiw_Update (#1906) 2024-03-01 22:20:05 -05:00
Dragorn421 bdee3d33b4 No longer use asm-processor (#1824)
* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "b3bfa14cf"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "b3bfa14cf"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"

* use CS_FLOAT

* update csdis

* update committed csdata

* finish updating csdis.py

* add script to reextract committed csdata

* dont use asm-processor, use iconv for reencoding utf8 to eucjp

* remove asm-processor csdata usage remnants

* --cs-float hex

* delete tempfile at end of reencode.sh (may want to rm even if compilation fails though?)

* comment reencode.sh

* comment CMD_F

* do not break permuter guessing compile command, by not reencode.sh-wrapping compilation under PERMUTER (thanks anghelo)

* fix the permuter fix

* pad -> sBssDummyNeg1

* reencode.sh: rm tempfile on script exit (including on error)

* renumber sBssDummy vars in zcolchk from 0

* Revert "--cs-float hex"

This reverts commit 85267dc348.

* Revert BSS changes

* Add linemarker to reencoded files for better error message

* fix audio/general.c bss

* make reencode.sh work on macOS

* touch up csdis, csdis_re

---------

Co-authored-by: cadmic <cadmic24@gmail.com>
2024-03-01 16:12:22 -05:00
cadmic c9e97a3055 Mostly match retail bosses, part 1 (#1898)
* Retail bosses part 1

* Use GameState* local variable in BossGanon/BossGanon2 draw helper functions
2024-03-01 12:43:02 -05:00
cadmic a32221c36e Match retail z_en_ds.c, z_en_horse.c, z_en_fhg_fire.c (#1897)
* Actually match z_en_ds.c

* Match z_en_horse.c

* Match z_en_fhg_fire.c
2024-02-27 02:30:42 -05:00
cadmic 57ae8ae1dd Mostly match retail bosses, part 2 (#1894)
* Bosses part 2

* Remove newline
2024-02-26 22:16:38 -05:00
cadmic 1da87b1e7f Match En actors D-G (#1889)
* Match entity actors D-G

* Remove SET_EN_GOROIWA_SPEED

* Actually match z_en_elf.c

* GET_EN_GOROIWA_SPEED -> EN_GOROIWA_SPEED
2024-02-26 21:55:30 -05:00
cadmic c86bf5011b Match entity actors O-T (#1826) 2024-02-26 21:39:44 -05:00
cadmic cdd24f2ac6 Match retail En actors V-Z (#1825)
* Entity actors starting with Z

* Use CS_STATE_IDLE

* z -> playerPosZ

* Remove comment
2024-02-26 21:29:40 -05:00
cadmic 769986874c Finish player (#1895) 2024-02-26 14:24:14 -05:00
cadmic 10bae68937 Match En actors A-C, and a few more (#1890) 2024-02-24 13:00:37 -05:00
cadmic 7d128adf83 Match more of player for retail (#1893) 2024-02-24 12:47:17 -05:00
cadmic 93295a842b Match some entity actors H-N (#1827) 2024-02-22 09:08:40 -05:00
cadmic 33d8044e45 Match retail demo actors (#1745)
* Match GetCue functions

* Match retail demo actors

* Add redundant parentheses around kREG(X) == Y in z_demo_gt.c

* Remove goto in DemoEffect_DrawLightEffect

* Rename "dl"

* Comment on possible array

* Use the word "fake"

* Remove redundant return
2024-02-20 15:15:52 -05:00
cadmic 5c31e686f6 More bg actors (#1743) 2024-02-20 07:00:55 -05:00
cadmic b32d0a91ed Match even more retail actors (#1720)
* Match even more actors

* Add macro for DebugDisplay_AddObject

* Prefer OOT_DEBUG &&

* Better EnReeba_Stunned match

* Revert "Add macro for DebugDisplay_AddObject"

This reverts commit 8197823abb.

* Prefer OOT_DEBUG && some more

* Reformatting

* Add fake match comment
2024-02-13 09:10:28 -05:00
fig02 f492c04186 match function (#1737) 2024-02-08 17:23:22 -05:00
cadmic 53b0114464 Match InitDynaPoly actors (#1733)
* Match InitDynaPoly actors

* Change BgJyaBombiwa_SetupDynaPoly pads to s32

* kzIceScale -> sKingZoraRedIceScale
2024-02-07 18:58:46 -05:00
engineer124 563f717bc6 Misc 1: Retail Overlay Actors OK (#1703) 2024-02-07 19:46:51 +01:00
fig02 13143f4743 Retail Player matches part 2 (#1725)
* match a couple

* match some more

* revert accidental newline removal
2024-02-05 23:30:50 -05:00
fig02 c240184229 Retail Player_Update/Noclip mode + some docs (#1718)
* matched but its kinda ugly

* goto

* semi-colon to stop formatter

* some more docs

* noclip function doc

* remove noclip function from retail

* newline

* format

* reword noclip function comment a bit and fix typo

* format

* changes to doc comments

* reorganize button check
2024-02-05 18:13:15 -05:00
Derek Hensley f3df4d13b8 Overlay Effects Retail OK (#1717)
* Effect_Ss_Bomb Retail OK

* Effect_Ss_Bomb2 Retail OK

* Effect_Ss_Stone1 Retail OK
2024-02-05 02:12:28 -05:00
fig02 a46941a195 Retail Player Matches part 1 (#1712)
* player matches part 1

* remove noclip if for now

* remove direvtive
2024-02-04 23:38:28 -05:00
cadmic 454b1caa52 Match more retail actors (#1711)
* More actors

* Format
2024-02-04 22:28:18 -05:00
cadmic 0cbcebfded Match some overlay effects files (#1705) 2024-02-03 17:36:35 -05:00