ID more actor fields and give enums, document more of Marina's behavior, more labels by blackgamma7 · Pull Request #63 · Drahsid/mischief-makers

blackgamma7 · 2026-08-06T18:58:59Z

rename some actor fields dealing with collision
- create enums for the types and flags
- confirm and ID "FLAG3" bits, add enum for common mask.
add more graphic indexes.
Document and label more of Marina's behavior
- rename some state functions
- rename struct responsible for automatic animations, and give enums
- rename scripts responsible for Marina's behaviors
various labels and documenting
- add and apply macro for target stage times.
- AAAAAAAA

…functions

not kanji.

…nd possible automated animations

add marina state enum

…->gMarinaAnim

…ting hit, and Rocketeer Clancer

is this Calina's script? for another PR

queueRAM

What another lovely PR. Approving, just had a few nitpicks reading through it.

missed a typo

…ects.

…trophe

Drahsid · 2026-08-16T02:01:08Z

Can you list out the files you renamed and a summary of the reason for the chosen name?

blackgamma7 · 2026-08-16T05:41:18Z

Can you list out the files you renamed and a summary of the reason for the chosen name?

48A30 -> marina_anim: code for automated animations, like dashing in, Teleporting in, victory dance, etc.
4FEB0 -> marina_grab: Code deals with behavior grabbing/throwing/shake-shaking actors.
57F20 -> marina_hit: code deals with Marina reacting to attacks.
59EA0 -> marina_effect: graphical effects for Marina, like flames when burnt, i-frame sparkles, electrocution, etc.

Drahsid

Fix build nonmatching. The rest is small nits and observational questions.

Drahsid

Mostly just notes on behavior. Also, update the progress report as it seems to be stale.

Drahsid · 2026-08-21T14:51:38Z

File is stale, rerun progress script.

Drahsid · 2026-08-21T15:05:13Z

+extern u8 gEnvColorsBlue[4];
+extern u8 gEnvColorsAlpha[4];
+extern u8 gBlackPrimColor[4]; // set prim color to black if true, white if false
+extern u8 D_801376BC[4]; // use env/prim color vars if false, skip if true


This also selects a different dlist, edge offsets, and texture step, so there's some context we haven't analyzed yet.

blackgamma7 · 2026-08-31T14:49:18Z

Most the suggest changes applied, should be ready when you are.

spacing on Tarus

blackgamma7 and others added 22 commits July 29, 2026 22:26

id more actor fields, add and apply actor hit flags, label 3 actor's …

8368088

…functions

Update save_file.c

f33d97b

not kanji.

couple "flag3 bits confirmed, enums for marina move velocity getter a…

e7e24cf

…nd possible automated animations

Update marina.h

6a5bb83

add marina state enum

Merge remote-tracking branch 'upstream/master' into ActorHit

37c6b10

Update 5D120.c

bcb0657

update marina enums with renames and comments, apply enums D_800BE5F4…

564d596

…->gMarinaAnim

start doc'ing text texture funcs, stage target time to (min,sec) macro

ea184a7

add and apply grab type enum, document some overlay code

804228a

AAAAAAAA

b915fa8

build fix "warping" flag3

65ad697

add a flag3 mask that gets often AND'd.

819b7ac

3 more flag3 bits confirmed, few notes on static object bool.

17312aa

rename some Marina Anim enums.

90c7517

label more marina functions, better describe marina enums.

49fa851

more marina and hittype-related labels

010ea67

label functions related to Marina states, grabbing, throwing, and get…

beff0c8

…ting hit, and Rocketeer Clancer

comment move speed table, rename marina grab and hit scripts

ddfc54e

Update 8F080.c

9181a72

is this Calina's script? for another PR

Merge remote-tracking branch 'upstream/master' into ActorHit

890f370

a few more labels

1db7e7f

a couple typos in comments

880384a

queueRAM approved these changes Aug 7, 2026

View reviewed changes

Comment thread include/actor.h Outdated

Comment thread include/actorTypes.h Outdated

Comment thread src/28EF0.c Outdated

Comment thread src/marina_hit.c

blackgamma7 marked this pull request as draft August 9, 2026 02:46

blackgamma7 added 6 commits August 8, 2026 23:22

Suggested changes, add .data for Marina scripts, more labels, doc'ing

9264b63

Update 80D90.c

27dd874

Update actorTypes.h

e13c1e8

missed a typo

rename PlayerData fields, add and apply enums for Marina's visual eff…

c88942b

…ects.

more doc and labels on Marina's Effects' behavior, and part of Cat-as…

8b86a27

…trophe

Update 7BC850.c

5d09f3c

Merge remote-tracking branch 'upstream/master' into ActorHit

b226264

queueRAM mentioned this pull request Aug 15, 2026

migrate main segment data, rename some files, and various cleanup #70

Open

blackgamma7 and others added 3 commits August 15, 2026 16:23

Merge remote-tracking branch 'upstream/master' into ActorHit

e98ff0f

Delete 48A30.c

2553625

build fix

3c04d50

blackgamma7 marked this pull request as ready for review August 15, 2026 22:17

a few more docs and labels, add gMarinaScale macro

a615025

Drahsid requested changes Aug 18, 2026

View reviewed changes

blackgamma7 and others added 6 commits August 18, 2026 13:49

suggested changes, more labels, reorganize enums

2ae416d

rename some of Marina's states

c753a7f

stage.c labels, Sound_StartFade: change some args to base 10

d0c4df7

Update decomp.yaml

b87016b

label env color arrays, some Migen script doc'ing

ce91977

build fix

910a110

Drahsid approved these changes Aug 21, 2026

View reviewed changes

blackgamma7 and others added 2 commits August 24, 2026 10:34

more requested changes.

9cc4861

add scene_* indexes to camera func tables, rename inaccurate func

c462211

Update Scene.h

0758fa7

spacing on Tarus

Conversation

blackgamma7 commented Aug 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

queueRAM left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Drahsid commented Aug 16, 2026

Uh oh!

blackgamma7 commented Aug 16, 2026

Uh oh!

Drahsid left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Drahsid left a comment

Choose a reason for hiding this comment

Uh oh!

Drahsid Aug 21, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Drahsid Aug 21, 2026

Choose a reason for hiding this comment

Uh oh!

blackgamma7 commented Aug 31, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

blackgamma7 commented Aug 6, 2026 •

edited

Loading