falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

EnInvadepoh (Aliens, UFO, Invasion Handler, etc.) OK and documented (#1614) 

* deimplementation complete

* newlines

* match

* data import

* back port cleanup changes

* stuff

* naming and such

* all funcs provisionally named

* more stuff

* merge

* Fix merge issues

* begin cleanup

* Use constants for all face animation data

* Use THIS like almost every actor does

* Change "Light Ball" to "UFO"

* Rename the alien types

* EnInvadePoh -> EnInvadepoh

* Rename the types

* Rename some Twinmold stuff

* ConfusedRomani -> SilentRomani

* Fix stack size issues with EnInvadepoh_Cremia_Init

* Move a struct out of the header to where it belongs

* Some header cleanup and struct names

* Name remaining struct vars

* Some more struct var renames

* Finish reviewing the struct var names

* Rename most of the interactInfo stuff

* Consistency

* Remove unused union

* Define EN_INVADEPOH_LIMB_MAX like EndingHero6 does

* Fix header

* Update functions.txt and variables.txt

* Create macros for accessing spawn time and kill count

* Some defines

* Some minor comments and cleanup

* Rename some functions

* Comments for those three functions

* Draw function cleanups

* Some damaged and dead cleanup

* Death scale stuff

* Good chunk of alien functions

* Invasion state naming

* Weekeventreg naming

* Happy with >20% of functions now

* A couple more functions

* More consistent names for BSS variables

* Some Init cleanup

* Happy with 30% of the functions now

* Finish the abductors

* Some random functions to get the functions I'm happy with >1/3rd

* Use `InitPath` for everything

* UFO functions done, >40% functions I'm happy with

* Do a lot of work on InvasionHandler action funcs

* Finish invasion handler code

* InitVars

* Rename the "closest alien" stuff to "closest alien threat"

* Finish most of the dog functions

* Lots of small stuff here and there

* Finish documenting the dog bug

* Document `EnInvadepoh_Dog_IsCloseToPath`

* `EnInvadepoh_Dog_MoveAlongPath` and other fixes

* Simple comment for `EnInvadepoh_Dog_Move`

* Various path functions, finish dog

* Consistently use "SetMatrixTranslation"

* Change all the angleToPlayer stuff to pitch/yaw

* Some RewardRomani functions

* Finish RewardRomani

* Finish Night1Romani and BarnRomani, >75% of functions done

* Some minor stuff

* Document bug

* Finish all of SilentRomani minus the Idle functions

* Finish EnInvadepoh_SilentRomani_Idle

* Finish Night3Cremia

* Finish Night3Romani

* Finish `EnInvadepoh_Ufo_SpawnSparkles`

* Finish some library functions

* Finish the alien pathing stuff

* Finish Romani path stuff

* Finish all non-InteractInfo stuff

* InteractInfo -> ModelInfo

* Create a `EnInvadepohFaceAnimBase` struct

* Name some of the animation data

* Switch to `Chained`/`ChainedDelay` and do some other cleanup

* Name all of the animation data

* Finish documenting and cleaning up the face animation functions

* Some comments at the top of the file

* Clean up forward declarations

* Clean some stuff up to the ModelInfo functions

* Fix build

* Move the animation data around so all the ModelInfo functions are adjacent

* Review

* Use `CLOCK_TIME_MINUTE` in `EnInvadepoh_Alien_PathComputeProgress`

* Respond to some of Anghelo's review

* Update comment on spawn time macros explaining what indices are usable

* Create a `DEATH_SCALE` define

* `WEEKEVENTREG_RECEIVED_MILK_BOTTLE` -> `WEEKEVENTREG_RECEIVED_ALIENS_BOTTLE`

* Forgot to do the bomber's notebook stuff too

* parallelogram -> rectangle

* Respond to engineer's review

* Slight spacing fix

---------

Co-authored-by: petrie911 <petrie911@users.noreply.github.com>
Co-authored-by: petrie911 <pmontag@Monday.localdomain>
Co-authored-by: angie <angheloalf95@gmail.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
This commit is contained in:
Tom Overton 2024-04-29 08:19:55 -07:00 committed by GitHub
parent 6126e72df3
commit 7c93d5e125
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
32 changed files with 6115 additions and 1009 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/tables/bombers_notebook/event_table.h
View File

@ -19,9 +19,9 @@
/* 0x19 */ DEFINE_EVENT(BOMBERS_NOTEBOOK_EVENT_RECEIVED_PENDANT_OF_MEMORIES, BOMBERS_NOTEBOOK_EVENT_ICON_EXCLAMATION_POINT, WEEKEVENTREG_RECEIVED_PENDANT_OF_MEMORIES, 0x219D, 0x2157, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_PENDANT_OF_MEMORIES)
/* 0x1A */ DEFINE_EVENT(BOMBERS_NOTEBOOK_EVENT_DELIVERED_PENDANT_OF_MEMORIES, BOMBERS_NOTEBOOK_EVENT_ICON_EXCLAMATION_POINT, WEEKEVENTREG_DELIVERED_PENDANT_OF_MEMORIES, 0x219E, 0x2158, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_DELIVERED_PENDANT_OF_MEMORIES)
/* 0x1B */ DEFINE_EVENT(BOMBERS_NOTEBOOK_EVENT_ESCAPED_SAKONS_HIDEOUT, BOMBERS_NOTEBOOK_EVENT_ICON_EXCLAMATION_POINT, WEEKEVENTREG_ESCAPED_SAKONS_HIDEOUT, 0x219F, 0x2159, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_ESCAPED_SAKONS_HIDEOUT)
/* 0x1C */ DEFINE_EVENT(BOMBERS_NOTEBOOK_EVENT_PROMISED_TO_HELP_WITH_THEM, BOMBERS_NOTEBOOK_EVENT_ICON_EXCLAMATION_POINT, WEEKEVENTREG_PROMISED_TO_HELP_WITH_THEM, 0x21A0, 0x215A, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_PROMISED_TO_HELP_WITH_THEM)
/* 0x1D */ DEFINE_EVENT(BOMBERS_NOTEBOOK_EVENT_DEFENDED_AGAINST_THEM, BOMBERS_NOTEBOOK_EVENT_ICON_EXCLAMATION_POINT, WEEKEVENTREG_DEFENDED_AGAINST_THEM, 0x21A1, 0x215B, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_DEFENDED_AGAINST_THEM)
/* 0x1E */ DEFINE_EVENT(BOMBERS_NOTEBOOK_EVENT_RECEIVED_MILK_BOTTLE, BOMBERS_NOTEBOOK_EVENT_ICON_RIBBON, BOMBERS_NOTEBOOK_EVENT_COLOR_WEEKEVENTREG_NONE, 0x21A2, 0x0000, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_MILK_BOTTLE)
/* 0x1C */ DEFINE_EVENT(BOMBERS_NOTEBOOK_EVENT_PROMISED_TO_HELP_WITH_ALIENS, BOMBERS_NOTEBOOK_EVENT_ICON_EXCLAMATION_POINT, WEEKEVENTREG_PROMISED_TO_HELP_WITH_ALIENS, 0x21A0, 0x215A, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_PROMISED_TO_HELP_WITH_ALIENS)
/* 0x1D */ DEFINE_EVENT(BOMBERS_NOTEBOOK_EVENT_DEFENDED_AGAINST_ALIENS, BOMBERS_NOTEBOOK_EVENT_ICON_EXCLAMATION_POINT, WEEKEVENTREG_DEFENDED_AGAINST_ALIENS, 0x21A1, 0x215B, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_DEFENDED_AGAINST_ALIENS)
/* 0x1E */ DEFINE_EVENT(BOMBERS_NOTEBOOK_EVENT_RECEIVED_ALIENS_BOTTLE, BOMBERS_NOTEBOOK_EVENT_ICON_RIBBON, BOMBERS_NOTEBOOK_EVENT_COLOR_WEEKEVENTREG_NONE, 0x21A2, 0x0000, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_ALIENS_BOTTLE)
/* 0x1F */ DEFINE_EVENT(BOMBERS_NOTEBOOK_EVENT_ESCORTED_CREMIA, BOMBERS_NOTEBOOK_EVENT_ICON_EXCLAMATION_POINT, WEEKEVENTREG_ESCORTED_CREMIA, 0x21A3, 0x215D, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_ESCORTED_CREMIA)
/* 0x20 */ DEFINE_EVENT(BOMBERS_NOTEBOOK_EVENT_RECEIVED_ROMANIS_MASK, BOMBERS_NOTEBOOK_EVENT_ICON_MASK, BOMBERS_NOTEBOOK_EVENT_COLOR_WEEKEVENTREG_NONE, 0x21A4, 0x0000, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_ROMANIS_MASK)
/* 0x21 */ DEFINE_EVENT(BOMBERS_NOTEBOOK_EVENT_RECEIVED_KEATON_MASK, BOMBERS_NOTEBOOK_EVENT_ICON_MASK, BOMBERS_NOTEBOOK_EVENT_COLOR_WEEKEVENTREG_NONE, 0x21A5, 0x215F, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_KEATON_MASK)

47
include/z64save.h
View File

@ -292,7 +292,7 @@ typedef struct SaveInfo {
/* 0xE58 */ u32 pictoFlags1; // Flags set by Snap_ValidatePictograph() to record errors; volatile since that function is run many times in succession
/* 0xE5C */ u32 unk_E5C;
/* 0xE60 */ u32 unk_E60;
/* 0xE64 */ u32 unk_E64[7]; // Invadepoh flags
/* 0xE64 */ u32 alienInfo[7]; // Used by EnInvadepoh to hold alien spawn times and how many aliens the player has killed
/* 0xE80 */ u32 scenesVisible[7]; // tingle maps and clouded regions on pause map. Stores scenes bitwise for up to 224 scenes even though there are not that many scenes
/* 0xE9C */ u32 skullTokenCount; // upper 16 bits store Swamp skulls, lower 16 bits store Ocean skulls
/* 0xEA0 */ u32 unk_EA0; // Gossic stone heart piece flags
@ -557,6 +557,24 @@ typedef enum {
#define HS_GET_SWAMP_SHOOTING_GALLERY_HIGH_SCORE() ((s32)((HIGH_SCORE(HS_SHOOTING_GALLERY) & 0xFFFF0000) >> 0x10))
#define HS_SET_SWAMP_SHOOTING_GALLERY_HIGH_SCORE(score) (HIGH_SCORE(HS_SHOOTING_GALLERY) = (HIGH_SCORE(HS_SHOOTING_GALLERY) & 0xFFFF) | ((u16)(score) << 0x10))
// Note that the time that each alien spawns is stored as an offset from 2:30 AM. To get the actual time that they spawn, you need to add
// `CLOCK_TIME(2, 30)` to the value retrieved using this macro. These spawn time macros are only intended to be used with an `index` value
// ranging from 0 to 7; using an `index` of 8 or 9 will overwrite data used to track the alien kill count. You can technically supply an
// `index` value between 10 and 13 and have it work, however, since these indices are unused in the final game.
#define ALIEN_GET_SPAWN_TIME_OFFSET(index) \
(((index % 2) == 0) ? ((gSaveContext.save.saveInfo.alienInfo[index >> 1] & 0xFFFF)) \
: ((gSaveContext.save.saveInfo.alienInfo[index >> 1] & ~0xFFFF) >> 0x10))
#define ALIEN_SET_SPAWN_TIME_OFFSET(index, spawnTime) \
((index % 2) == 0) ? (gSaveContext.save.saveInfo.alienInfo[index >> 1] = (gSaveContext.save.saveInfo.alienInfo[index >> 1] & ~0xFFFF) | (spawnTime & 0xFFFF)) \
: (gSaveContext.save.saveInfo.alienInfo[index >> 1] = (gSaveContext.save.saveInfo.alienInfo[index >> 1] & 0xFFFF) | ((spawnTime & 0xFFFF) << 0x10))
#define ALIEN_GET_KILL_COUNT() \
gSaveContext.save.saveInfo.alienInfo[4] & 0xFF
#define ALIEN_SET_KILL_COUNT(count) \
gSaveContext.save.saveInfo.alienInfo[4] = (gSaveContext.save.saveInfo.alienInfo[4] & ~0xFF) | (count & 0xFF)
/**
* gSaveContext.save.saveInfo.weekEventReg
*/
@ -785,15 +803,18 @@ typedef enum {
#define WEEKEVENTREG_TALKED_THAWED_GRAVEYARD_GORON PACK_WEEKEVENTREG_FLAG(21, 0x08)
#define WEEKEVENTREG_21_10 PACK_WEEKEVENTREG_FLAG(21, 0x10)
#define WEEKEVENTREG_PROMISED_TO_HELP_WITH_THEM PACK_WEEKEVENTREG_FLAG(21, 0x20)
// Player talked with Romani before the alien invasion and agreed to help her
#define WEEKEVENTREG_PROMISED_TO_HELP_WITH_ALIENS PACK_WEEKEVENTREG_FLAG(21, 0x20)
#define WEEKEVENTREG_21_40 PACK_WEEKEVENTREG_FLAG(21, 0x40)
#define WEEKEVENTREG_21_80 PACK_WEEKEVENTREG_FLAG(21, 0x80)
// Aliens defeated
// "Winning" the alien invasion
#define WEEKEVENTREG_DEFENDED_AGAINST_THEM PACK_WEEKEVENTREG_FLAG(22, 0x01)
// Player successfully defended Romani Ranch from the alien invasion on Night 1
#define WEEKEVENTREG_DEFENDED_AGAINST_ALIENS PACK_WEEKEVENTREG_FLAG(22, 0x01)
#define WEEKEVENTREG_22_02 PACK_WEEKEVENTREG_FLAG(22, 0x02)
// Player received the Bottle of Milk from Romani for defending the ranch from the aliens for the first time
#define WEEKEVENTREG_RECEIVED_ALIENS_BOTTLE PACK_WEEKEVENTREG_FLAG(22, 0x02)
// Goron Elder's son has been calmed from Goron's Lullaby.
#define WEEKEVENTREG_CALMED_GORON_ELDERS_SON PACK_WEEKEVENTREG_FLAG(22, 0x04)
@ -1052,7 +1073,7 @@ typedef enum {
#define WEEKEVENTREG_54_02 PACK_WEEKEVENTREG_FLAG(54, 0x02)
#define WEEKEVENTREG_54_04 PACK_WEEKEVENTREG_FLAG(54, 0x04)
#define WEEKEVENTREG_54_08 PACK_WEEKEVENTREG_FLAG(54, 0x08)
#define WEEKEVENTREG_54_10 PACK_WEEKEVENTREG_FLAG(54, 0x10)
#define WEEKEVENTREG_TALKED_ROMANI_ON_NIGHT_1 PACK_WEEKEVENTREG_FLAG(54, 0x10)
#define WEEKEVENTREG_54_20 PACK_WEEKEVENTREG_FLAG(54, 0x20)
#define WEEKEVENTREG_RECEIVED_SPIRIT_HOUSE_HEART_PIECE PACK_WEEKEVENTREG_FLAG(54, 0x40)
#define WEEKEVENTREG_54_80 PACK_WEEKEVENTREG_FLAG(54, 0x80)
@ -1195,9 +1216,9 @@ typedef enum {
#define WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_PENDANT_OF_MEMORIES PACK_WEEKEVENTREG_FLAG(69, 0x02)
#define WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_DELIVERED_PENDANT_OF_MEMORIES PACK_WEEKEVENTREG_FLAG(69, 0x04)
#define WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_ESCAPED_SAKONS_HIDEOUT PACK_WEEKEVENTREG_FLAG(69, 0x08)
#define WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_PROMISED_TO_HELP_WITH_THEM PACK_WEEKEVENTREG_FLAG(69, 0x10)
#define WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_DEFENDED_AGAINST_THEM PACK_WEEKEVENTREG_FLAG(69, 0x20)
#define WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_MILK_BOTTLE PACK_WEEKEVENTREG_FLAG(69, 0x40)
#define WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_PROMISED_TO_HELP_WITH_ALIENS PACK_WEEKEVENTREG_FLAG(69, 0x10)
#define WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_DEFENDED_AGAINST_ALIENS PACK_WEEKEVENTREG_FLAG(69, 0x20)
#define WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_ALIENS_BOTTLE PACK_WEEKEVENTREG_FLAG(69, 0x40)
#define WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_ESCORTED_CREMIA PACK_WEEKEVENTREG_FLAG(69, 0x80)
#define WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_ROMANIS_MASK PACK_WEEKEVENTREG_FLAG(70, 0x01)
#define WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_KEATON_MASK PACK_WEEKEVENTREG_FLAG(70, 0x02)
@ -1401,7 +1422,11 @@ typedef enum {
// Unconfirmed: "Postman has delivered priority mail"
#define WEEKEVENTREG_89_08 PACK_WEEKEVENTREG_FLAG(89, 0x08)
#define WEEKEVENTREG_89_10 PACK_WEEKEVENTREG_FLAG(89, 0x10)
// Player tried but failed to defend Romani Ranch from the alien invasion on Night 1
// This is only set if the player is actually in the ranch when the aliens reach the barn.
// If the player isn't in the ranch when this happens, then this weekeventreg will remain unset.
#define WEEKEVENTREG_FAILED_TO_DEFEND_AGAINST_ALIENS PACK_WEEKEVENTREG_FLAG(89, 0x10)
#define WEEKEVENTREG_89_20 PACK_WEEKEVENTREG_FLAG(89, 0x20)
// Unconfirmed: "Postman is about to flee"

4
spec
View File

@ -3754,9 +3754,7 @@ beginseg
name "ovl_En_Invadepoh"
compress
include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.o"
include "$(BUILD_DIR)/data/ovl_En_Invadepoh/ovl_En_Invadepoh.data.o"
include "$(BUILD_DIR)/data/ovl_En_Invadepoh/ovl_En_Invadepoh.bss.o"
include "$(BUILD_DIR)/data/ovl_En_Invadepoh/ovl_En_Invadepoh.reloc.o"
include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Invadepoh/ovl_En_Invadepoh_reloc.o"
endseg
beginseg

2
src/code/z_kankyo.c
View File

@ -3341,7 +3341,7 @@ u32 Environment_GetStormState(PlayState* play) {
u32 stormState = play->envCtx.stormState;
if ((play->sceneId == SCENE_OMOYA) && (play->roomCtx.curRoom.num == 0)) {
stormState = ((gSaveContext.save.day >= 2) && !CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM))
stormState = ((gSaveContext.save.day >= 2) && !CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS))
? STORM_STATE_ON
: STORM_STATE_OFF;
}

2
src/code/z_lights.c
View File

@ -405,7 +405,7 @@ void Lights_GlowCheck(PlayState* play) {
if ((projectedPos.z > 1) && (fabsf(projectedPos.x * invW) < 1) && (fabsf(projectedPos.y * invW) < 1)) {
s32 screenPosX = PROJECTED_TO_SCREEN_X(projectedPos, invW);
s32 screenPosY = PROJECTED_TO_SCREEN_Y(projectedPos, invW);
s32 wZ = (s32)((projectedPos.z * invW) * 16352.0f) + 16352;
s32 wZ = (s32)(projectedPos.z * invW * ((G_MAXZ / 2) * 32)) + ((G_MAXZ / 2) * 32);
s32 zBuf = SysCfb_GetZBufferInt(screenPosX, screenPosY);
if (wZ < zBuf) {

9
src/code/z_play_hireso.c
View File

@ -98,11 +98,12 @@ u16 sBombersNotebookEntries[BOMBERS_NOTEBOOK_PERSON_MAX][BOMBERS_NOTEBOOK_ENTRY_
},
{
/* Romani */
BOMBERS_NOTEBOOK_ENTRY(BOMBERS_NOTEBOOK_ENTRY_POS_CENTER, 1, BOMBERS_NOTEBOOK_EVENT_PROMISED_TO_HELP_WITH_THEM,
CLOCK_TIME(6, 0), CLOCK_TIME(18, 0)),
BOMBERS_NOTEBOOK_ENTRY(BOMBERS_NOTEBOOK_ENTRY_POS_ABOVE, 1, BOMBERS_NOTEBOOK_EVENT_DEFENDED_AGAINST_THEM,
BOMBERS_NOTEBOOK_ENTRY(BOMBERS_NOTEBOOK_ENTRY_POS_CENTER, 1,
BOMBERS_NOTEBOOK_EVENT_PROMISED_TO_HELP_WITH_ALIENS, CLOCK_TIME(6, 0),
CLOCK_TIME(18, 0)),
BOMBERS_NOTEBOOK_ENTRY(BOMBERS_NOTEBOOK_ENTRY_POS_ABOVE, 1, BOMBERS_NOTEBOOK_EVENT_DEFENDED_AGAINST_ALIENS,
CLOCK_TIME(2, 30), CLOCK_TIME(5, 15)),
BOMBERS_NOTEBOOK_ENTRY(BOMBERS_NOTEBOOK_ENTRY_POS_BELOW, 1, BOMBERS_NOTEBOOK_EVENT_RECEIVED_MILK_BOTTLE,
BOMBERS_NOTEBOOK_ENTRY(BOMBERS_NOTEBOOK_ENTRY_POS_BELOW, 1, BOMBERS_NOTEBOOK_EVENT_RECEIVED_ALIENS_BOTTLE,
CLOCK_TIME(2, 30), CLOCK_TIME(5, 15)),
BOMBERS_NOTEBOOK_ENTRY_END,
},

22
src/code/z_sram_NES.c
View File

@ -99,7 +99,7 @@ u16 sPersistentCycleWeekEventRegs[ARRAY_COUNT(gSaveContext.save.saveInfo.weekEve
/* 19 */ 0,
/* 20 */ 0,
/* 21 */ 0,
/* 22 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_22_02) |
/* 22 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_ALIENS_BOTTLE) |
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_HONEY_AND_DARLING_HEART_PIECE),
/* 23 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_GREAT_SPIN_ATTACK) |
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BEAVER_RACE_BOTTLE),
@ -195,9 +195,9 @@ u16 sPersistentCycleWeekEventRegs[ARRAY_COUNT(gSaveContext.save.saveInfo.weekEve
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_PENDANT_OF_MEMORIES) |
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_DELIVERED_PENDANT_OF_MEMORIES) |
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_ESCAPED_SAKONS_HIDEOUT) |
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_PROMISED_TO_HELP_WITH_THEM) |
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_DEFENDED_AGAINST_THEM) |
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_MILK_BOTTLE) |
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_PROMISED_TO_HELP_WITH_ALIENS) |
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_DEFENDED_AGAINST_ALIENS) |
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_ALIENS_BOTTLE) |
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_ESCORTED_CREMIA),
/* 70 */
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_ROMANIS_MASK) |
@ -625,13 +625,13 @@ void Sram_SaveEndOfCycle(PlayState* play) {
gSaveContext.save.saveInfo.skullTokenCount &= ~0x0000FFFF;
gSaveContext.save.saveInfo.unk_EA0 = 0;
gSaveContext.save.saveInfo.unk_E64[0] = 0;
gSaveContext.save.saveInfo.unk_E64[1] = 0;
gSaveContext.save.saveInfo.unk_E64[2] = 0;
gSaveContext.save.saveInfo.unk_E64[3] = 0;
gSaveContext.save.saveInfo.unk_E64[4] = 0;
gSaveContext.save.saveInfo.unk_E64[5] = 0;
gSaveContext.save.saveInfo.unk_E64[6] = 0;
gSaveContext.save.saveInfo.alienInfo[0] = 0;
gSaveContext.save.saveInfo.alienInfo[1] = 0;
gSaveContext.save.saveInfo.alienInfo[2] = 0;
gSaveContext.save.saveInfo.alienInfo[3] = 0;
gSaveContext.save.saveInfo.alienInfo[4] = 0;
gSaveContext.save.saveInfo.alienInfo[5] = 0;
gSaveContext.save.saveInfo.alienInfo[6] = 0;
Sram_ClearHighscores();

2
src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
View File

@ -151,7 +151,7 @@ bool func_808B736C(BgBreakwall* this, PlayState* play) {
}
bool func_808B7380(BgBreakwall* this, PlayState* play) {
if ((gSaveContext.save.day >= 2) && !CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM)) {
if ((gSaveContext.save.day >= 2) && !CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS)) {
return false;
}
return true;

16
src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c
View File

@ -133,11 +133,11 @@ void BgUmajump_Update(Actor* thisx, PlayState* play) {
Actor_SetObjectDependency(play, &this->dyna.actor);
if (this->dyna.actor.params == BG_UMAJUMP_TYPE_5) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS)) {
DynaPolyActor_LoadMesh(play, &this->dyna, &object_umajump_Colheader_001558);
}
} else if (this->dyna.actor.params == BG_UMAJUMP_TYPE_6) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM)) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS)) {
DynaPolyActor_LoadMesh(play, &this->dyna, &object_umajump_Colheader_001558);
}
} else if ((this->dyna.actor.params == BG_UMAJUMP_TYPE_4) || (this->dyna.actor.params == BG_UMAJUMP_TYPE_3)) {
@ -154,11 +154,11 @@ void BgUmajump_Update(Actor* thisx, PlayState* play) {
this->dyna.actor.update = func_8091A5A0;
} else if ((this->dyna.actor.params == BG_UMAJUMP_TYPE_5) || (this->dyna.actor.params == BG_UMAJUMP_TYPE_6)) {
if (this->dyna.actor.params == BG_UMAJUMP_TYPE_5) {
if ((this->dyna.bgId == BGACTOR_NEG_ONE) && CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM)) {
if ((this->dyna.bgId == BGACTOR_NEG_ONE) && CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS)) {
DynaPolyActor_LoadMesh(play, &this->dyna, &object_umajump_Colheader_001558);
}
} else if ((this->dyna.actor.params == BG_UMAJUMP_TYPE_6) && (this->dyna.bgId == BGACTOR_NEG_ONE) &&
(!CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM) ||
(!CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS) ||
((gSaveContext.save.day == 2) && (gSaveContext.save.isNight == true) &&
((CURRENT_TIME >= CLOCK_TIME(5, 30)) && (CURRENT_TIME <= CLOCK_TIME(6, 0)))))) {
DynaPolyActor_LoadMesh(play, &this->dyna, &object_umajump_Colheader_001558);
@ -189,18 +189,18 @@ void func_8091A5A0(Actor* thisx, PlayState* play) {
}
if (this->dyna.actor.params == BG_UMAJUMP_TYPE_5) {
if ((this->dyna.bgId == BGACTOR_NEG_ONE) && CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM)) {
if ((this->dyna.bgId == BGACTOR_NEG_ONE) && CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS)) {
DynaPolyActor_LoadMesh(play, &this->dyna, &object_umajump_Colheader_001558);
} else if ((this->dyna.bgId != BGACTOR_NEG_ONE) && !CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM)) {
} else if ((this->dyna.bgId != BGACTOR_NEG_ONE) && !CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS)) {
DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId);
}
} else if (this->dyna.actor.params == BG_UMAJUMP_TYPE_6) {
if ((this->dyna.bgId == BGACTOR_NEG_ONE) &&
(!CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM) ||
(!CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS) ||
((gSaveContext.save.day == 2) && (gSaveContext.save.isNight == true) &&
(CURRENT_TIME >= CLOCK_TIME(5, 30)) && (CURRENT_TIME <= CLOCK_TIME(6, 0))))) {
DynaPolyActor_LoadMesh(play, &this->dyna, &object_umajump_Colheader_001558);
} else if ((this->dyna.bgId != BGACTOR_NEG_ONE) && CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM) &&
} else if ((this->dyna.bgId != BGACTOR_NEG_ONE) && CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS) &&
((gSaveContext.save.day != 2) || (gSaveContext.save.isNight != true) ||
(CURRENT_TIME < CLOCK_TIME(5, 30)) || (CURRENT_TIME > CLOCK_TIME(6, 0)))) {
DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId);

48
src/overlays/actors/ovl_Boss_02/z_boss_02.c
View File

@ -26,8 +26,8 @@ void func_809DAA98(Boss02* this, PlayState* play);
void func_809DAAA8(Boss02* this, PlayState* play);
void func_809DAB78(Boss02* this, PlayState* play);
void Boss02_Tail_Update(Actor* thisx, PlayState* play);
void Boss02_Static_Update(Actor* thisx, PlayState* play);
void Boss02_Static_Draw(Actor* thisx, PlayState* play);
void Boss02_BattleHandler_Update(Actor* thisx, PlayState* play);
void Boss02_BattleHandler_Draw(Actor* thisx, PlayState* play);
void Boss02_UpdateEffects(PlayState* play);
void Boss02_DrawEffects(PlayState* play);
void Boss02_HandleGiantsMaskCutscene(Boss02* this, PlayState* play);
@ -68,7 +68,7 @@ u8 sIsInGiantMode;
Boss02* sRedTwinmold;
Boss02* sBlueTwinmold;
Boss02* sTwinmoldStatic;
Boss02* sTwinmoldBattleHandler;
u8 sTwinmoldMusicStartTimer;
DoorWarp1* sBlueWarp;
TwinmoldEffect sTwinmoldEffects[TWINMOLD_EFFECT_COUNT];
@ -595,11 +595,11 @@ void Boss02_Init(Actor* thisx, PlayState* play) {
this->actor.targetMode = TARGET_MODE_10;
this->subCamUp.z = this->subCamUp.x = 0.0f;
this->subCamUp.y = 1.0f;
if (TWINMOLD_GET_TYPE(&this->actor) == TWINMOLD_TYPE_STATIC) {
sTwinmoldStatic = this;
if (TWINMOLD_GET_TYPE(&this->actor) == TWINMOLD_TYPE_BATTLE_HANDLER) {
sTwinmoldBattleHandler = this;
play->specialEffects = (void*)sTwinmoldEffects;
this->actor.update = Boss02_Static_Update;
this->actor.draw = Boss02_Static_Draw;
this->actor.update = Boss02_BattleHandler_Update;
this->actor.draw = Boss02_BattleHandler_Draw;
this->actor.flags &= ~ACTOR_FLAG_TARGETABLE;
this->playerScale = 0.01f;
if ((KREG(64) != 0) || CHECK_EVENTINF(EVENTINF_INTRO_CS_WATCHED_TWINMOLD) || (sBlueWarp != NULL)) {
@ -611,7 +611,7 @@ void Boss02_Init(Actor* thisx, PlayState* play) {
R_MAGIC_CONSUME_TIMER_GIANTS_MASK = KREG(14) + 20;
this->giantModeScaleFactor = 1.0f;
Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_TANRON5, 0.0f, 1000.0f, 0.0f, 0, 0, 0,
TWINMOLD_PROP_PARAMS(TWINMOLD_PROP_TYPE_STATIC));
TWINMOLD_PROP_PARAMS(TWINMOLD_PROP_TYPE_SPAWN_HANDLER));
} else if (TWINMOLD_GET_TYPE(&this->actor) == TWINMOLD_TYPE_TAIL) {
this->actor.update = Boss02_Tail_Update;
this->actor.draw = NULL;
@ -619,7 +619,7 @@ void Boss02_Init(Actor* thisx, PlayState* play) {
} else {
if (TWINMOLD_GET_TYPE(&this->actor) != TWINMOLD_TYPE_BLUE) {
this->actor.params = TWINMOLD_TYPE_RED;
Actor_Spawn(&play->actorCtx, play, ACTOR_BOSS_02, 0.0f, 0.0f, 0.0f, 0, 0, 0, TWINMOLD_TYPE_STATIC);
Actor_Spawn(&play->actorCtx, play, ACTOR_BOSS_02, 0.0f, 0.0f, 0.0f, 0, 0, 0, TWINMOLD_TYPE_BATTLE_HANDLER);
sRedTwinmold = this;
sBlueTwinmold =
(Boss02*)Actor_Spawn(&play->actorCtx, play, ACTOR_BOSS_02, this->actor.world.pos.x,
@ -675,12 +675,12 @@ void func_809DAA98(Boss02* this, PlayState* play) {
void func_809DAAA8(Boss02* this, PlayState* play) {
this->actionFunc = func_809DAB78;
Animation_MorphToLoop(&this->skelAnime, &gTwinmoldHeadFlyAnim, 0.0f);
if (sTwinmoldStatic->unk_1D20 != 0) {
if (sTwinmoldBattleHandler->unk_1D20 != 0) {
this->unk_0144 = 10;
} else {
this->unk_0144 = 100;
this->unk_01A8 = 25.0f;
sTwinmoldStatic->unk_1D7E = 100;
sTwinmoldBattleHandler->unk_1D7E = 100;
this->actor.world.pos.x = 0.0f;
if (sRedTwinmold == this) {
this->actor.world.pos.z = -1000.0f;
@ -733,7 +733,7 @@ void func_809DAB78(Boss02* this, PlayState* play) {
this->unk_01A4 = Math_SinS(this->unk_0196) * this->unk_019C;
this->actor.world.rot.x = this->actor.shape.rot.x + this->unk_01A4;
if (!(this->unk_014C & 0x1F) && (sTwinmoldStatic->unk_1D20 == 0)) {
if (!(this->unk_014C & 0x1F) && (sTwinmoldBattleHandler->unk_1D20 == 0)) {
this->unk_01A0 = Rand_ZeroFloat(0x1000) + 0x800;
this->unk_019A = Rand_ZeroFloat(0x400) + 0x200;
}
@ -975,8 +975,8 @@ void func_809DAB78(Boss02* this, PlayState* play) {
this->unk_0144 = 21;
this->unk_0146[0] = 20;
this->unk_0152 = 0;
sTwinmoldStatic->unk_1D20 = 102;
sTwinmoldStatic->subCamAtVel = 0.0f;
sTwinmoldBattleHandler->unk_1D20 = 102;
sTwinmoldBattleHandler->subCamAtVel = 0.0f;
Audio_PlaySfx(NA_SE_EN_INBOSS_DEAD_PRE2_OLD);
} else if (!(this->unk_0146[1] & 0xF) && (Rand_ZeroOne() < 0.5f)) {
Actor_PlaySfx(&this->actor, NA_SE_EN_INBOSS_DAMAGE_OLD);
@ -1040,10 +1040,10 @@ void func_809DAB78(Boss02* this, PlayState* play) {
this->unk_0170 = this->unk_017C;
this->unk_016C = 30;
this->unk_0170.y = this->actor.floorHeight;
sTwinmoldStatic->unk_1D20 = 103;
sTwinmoldStatic->unk_1D1C = 0;
sTwinmoldStatic->unk_0146[0] = 15;
sTwinmoldStatic->unk_0150 = 0;
sTwinmoldBattleHandler->unk_1D20 = 103;
sTwinmoldBattleHandler->unk_1D1C = 0;
sTwinmoldBattleHandler->unk_0146[0] = 15;
sTwinmoldBattleHandler->unk_0150 = 0;
Audio_PlaySfx(NA_SE_EV_LIGHTNING);
for (i = 0; i < 30; i++) {
@ -1160,12 +1160,12 @@ void func_809DBFB4(Boss02* this, PlayState* play) {
this->actor.world.pos.y = 3130.0f;
}
sTwinmoldStatic->unk_1D20 = 100;
sTwinmoldBattleHandler->unk_1D20 = 100;
if (this == sRedTwinmold) {
sTwinmoldStatic->unk_0194 = 0;
sTwinmoldBattleHandler->unk_0194 = 0;
} else {
sTwinmoldStatic->unk_0194 = 1;
sTwinmoldBattleHandler->unk_0194 = 1;
}
}
}
@ -1210,7 +1210,7 @@ void Boss02_Twinmold_Update(Actor* thisx, PlayState* play) {
Actor_SetScale(&this->actor, 0.060000001f);
}
if (sTwinmoldStatic->giantsMaskCsState == GIANTS_MASK_CS_STATE_WAITING_FOR_MASK) {
if (sTwinmoldBattleHandler->giantsMaskCsState == GIANTS_MASK_CS_STATE_WAITING_FOR_MASK) {
for (i = 0; i < ARRAY_COUNT(this->unk_0146); i++) {
if (this->unk_0146[i] != 0) {
this->unk_0146[i]--;
@ -1316,7 +1316,7 @@ void Boss02_Twinmold_Update(Actor* thisx, PlayState* play) {
}
}
void Boss02_Static_Update(Actor* thisx, PlayState* play) {
void Boss02_BattleHandler_Update(Actor* thisx, PlayState* play) {
Boss02* this = THIS;
this->giantModeScaleFactor = sGiantModeScaleFactor;
@ -1501,7 +1501,7 @@ void Boss02_Twinmold_Draw(Actor* thisx, PlayState* play2) {
}
}
void Boss02_Static_Draw(Actor* thisx, PlayState* play) {
void Boss02_BattleHandler_Draw(Actor* thisx, PlayState* play) {
Boss02_DrawEffects(play);
}

2
src/overlays/actors/ovl_Boss_02/z_boss_02.h
View File

@ -38,7 +38,7 @@ typedef enum {
/* 0 */ TWINMOLD_TYPE_RED,
/* 35 */ TWINMOLD_TYPE_BLUE = 35,
/* 100 */ TWINMOLD_TYPE_TAIL = 100,
/* 200 */ TWINMOLD_TYPE_STATIC = 200
/* 200 */ TWINMOLD_TYPE_BATTLE_HANDLER = 200
} TwinmoldType;
typedef struct Boss02 {

2
src/overlays/actors/ovl_En_Cow/z_en_cow.c
View File

@ -118,7 +118,7 @@ void EnCow_Init(Actor* thisx, PlayState* play) {
this->actionFunc = EnCow_Idle;
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM) && (CURRENT_DAY != 1) &&
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS) && (CURRENT_DAY != 1) &&
(EN_COW_TYPE(thisx) == EN_COW_TYPE_ABDUCTED)) {
Actor_Kill(&this->actor);
return;

2
src/overlays/actors/ovl_En_In/z_en_in.c
View File

@ -224,7 +224,7 @@ s32 func_808F33B8(void) {
s32 ret = (((gSaveContext.save.day == 1) &&
((CURRENT_TIME >= CLOCK_TIME(5, 30)) && (CURRENT_TIME <= CLOCK_TIME(6, 0)))) ||
(gSaveContext.save.day >= 2)) &&
!CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM);
!CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS);
return ret;
}

5860
src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c
View File

File diff suppressed because it is too large Load Diff

167
src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.h
View File

@ -2,12 +2,177 @@
#define Z_EN_INVADEPOH_H
#include "global.h"
#include "assets/objects/object_cow/object_cow.h"
#include "assets/objects/object_dog/object_dog.h"
#include "assets/objects/object_ma1/object_ma1.h"
#include "assets/objects/object_ma2/object_ma2.h"
#include "assets/objects/object_uch/object_uch.h"
struct EnInvadepoh;
struct EnInvadepohEffect;
typedef void (*EnInvadepohActionFunc)(struct EnInvadepoh* this, PlayState* play);
typedef void (*EnInvadepohInitFunc)(struct EnInvadepoh* this, PlayState* play);
typedef void (*EnInvadepohDestroyFunc)(struct EnInvadepoh* this, PlayState* play);
typedef void (*EnInvadepohEffectUpdateFunc)(struct EnInvadepohEffect* warpEffect);
#define EN_INVADEPOH_GET_INDEX(thisx) ((thisx)->params & 7)
#define EN_INVADEPOH_GET_TYPE(thisx) ((thisx)->params >> 4 & 0xF)
#define EN_INVADEPOH_GET_PATH(thisx) ((thisx)->params >> 8 & 0x7F)
#define EN_INVADEPOH_PARAMS(path, type, index) (((index) & 7) | (((path) << 8) & 0x7F00) | (((type) << 4) & 0xF0))
typedef enum EnInvadepohType {
/* 0 */ EN_INVADEPOH_TYPE_INVASION_HANDLER, // Alien invasion event handler
/* 1 */ EN_INVADEPOH_TYPE_ALIEN, // The aliens that approach the barn
/* 2 */ EN_INVADEPOH_TYPE_COW, // An unused abudcted cow, spawned by the alien abductor
/* 3 */ EN_INVADEPOH_TYPE_COW_TAIL, // An unused abducted cow tail, spawned by the abducted cow
/* 4 */ EN_INVADEPOH_TYPE_ROMANI_ABDUCTED, // An unused abducted Romani, spawned by alien abductor
/* 5 */ EN_INVADEPOH_TYPE_ROMANI_SILENT, // A confused, silent Romani that wanders the ranch on day 2
/* 6 */ EN_INVADEPOH_TYPE_UFO, // The spinning ball of light that spawns the aliens and hovers over the barn
/* 7 */ EN_INVADEPOH_TYPE_ROMANI_NIGHT_1, // Romani running to the barn on night 1
/* 8 */ EN_INVADEPOH_TYPE_ROMANI_BARN, // Romani in the barn on night 1
/* 9 */ EN_INVADEPOH_TYPE_ROMANI_REWARD, // Romani rewarding you for defending the ranch from the aliens
/* 10 */ EN_INVADEPOH_TYPE_DOG, // Dog during alien invasion
/* 11 */ EN_INVADEPOH_TYPE_CREMIA_NIGHT_3, // Cremia walking from the barn to the house on night 3
/* 12 */ EN_INVADEPOH_TYPE_ROMANI_NIGHT_3, // Romnani walking from the barn to the house on night 3
/* 13 */ EN_INVADEPOH_TYPE_ALIEN_ABDUCTOR, // An unused alien variant that can carry either a cow or Romani
/* 14 */ EN_INVADEPOH_TYPE_MAX
} EnInvadepohType;
typedef enum EnInvadepohCowIndex {
/* 0 */ EN_INVADEPOH_COW_INDEX_0,
/* 1 */ EN_INVADEPOH_COW_INDEX_1,
/* 2 */ EN_INVADEPOH_COW_INDEX_2,
/* 3 */ EN_INVADEPOH_COW_INDEX_MAX
} EnInvadepohCowIndex;
typedef enum EnInvadepohAlienAbductorIndex {
/* 0 */ EN_INVADEPOH_ALIEN_ABDUCTOR_INDEX_COW_0,
/* 1 */ EN_INVADEPOH_ALIEN_ABDUCTOR_INDEX_COW_1,
/* 2 */ EN_INVADEPOH_ALIEN_ABDUCTOR_INDEX_COW_2,
/* 3 */ EN_INVADEPOH_ALIEN_ABDUCTOR_INDEX_COW_MAX,
// Any alien abductor with an index of 3 or higher will be carrying Romani
/* 3 */ EN_INVADEPOH_ALIEN_ABDUCTOR_INDEX_ROMANI = 3
} EnInvadepohAlienAbductorIndex;
#define EN_INVADEPOH_PATH_INDEX_NONE 0xFF
typedef struct EnInvadepohFaceFrames {
/* 0x0 */ s8* texIndex;
/* 0x4 */ s8 count;
} EnInvadepohFaceFrames; // size = 0x5
typedef struct EnInvadepohFaceAnimNext {
/* 0x0 */ s8 index;
/* 0x4 */ f32 chance;
} EnInvadepohFaceAnimNext; // size = 0x8
typedef struct EnInvadepohFaceAnimBase {
/* 0x0 */ s8 type;
/* 0x4 */ EnInvadepohFaceFrames* frames;
} EnInvadepohFaceAnimBase; // size = 0x8
typedef struct EnInvadepohFaceAnimOnce {
/* 0x0 */ EnInvadepohFaceAnimBase base;
} EnInvadepohFaceAnimOnce; // size = 0x8
typedef struct EnInvadepohFaceAnimChained {
/* 0x0 */ EnInvadepohFaceAnimBase base;
/* 0x8 */ s8 nextCount;
/* 0xC */ EnInvadepohFaceAnimNext* nextAnims;
} EnInvadepohFaceAnimChained; // size = 0x10
typedef struct EnInvadepohFaceAnimChainedDelay {
/* 0x00 */ EnInvadepohFaceAnimBase base;
/* 0x08 */ s8 nextCount;
/* 0x0C */ EnInvadepohFaceAnimNext* nextAnims;
/* 0x10 */ s16 minDelay;
/* 0x12 */ s16 maxDelay;
} EnInvadepohFaceAnimChainedDelay; // size = 0x14
typedef struct EnInvadepohFaceAnimInfo {
/* 0x0 */ EnInvadepohFaceAnimBase** animations;
/* 0x4 */ s8 type;
/* 0x8 */ EnInvadepohFaceAnimBase* curAnim;
/* 0xC */ s16 delayTimer;
/* 0xE */ s8 curFrame;
/* 0xF */ s8 curTexIndex;
} EnInvadepohFaceAnimInfo; // size = 0x10
typedef struct EnInvadepohModelInfo {
/* 0x00 */ EnInvadepohFaceAnimInfo eyeAnim;
/* 0x10 */ EnInvadepohFaceAnimInfo mouthAnim;
/* 0x20 */ Vec3s headRot;
/* 0x26 */ Vec3s headRotTarget;
/* 0x2C */ s16 headRotMaxStep;
/* 0x30 */ f32 headRotStepScale;
/* 0x34 */ f32 torsoRotScaleY;
/* 0x38 */ f32 torsoRotScaleTargetY;
/* 0x3C */ f32 torsoRotScaleStepY;
/* 0x40 */ s16 torsoRotX;
/* 0x42 */ s16 torsoTargetRotX;
/* 0x44 */ f32 torsoRotStepScale;
/* 0x48 */ s16 torsoRotMaxStep;
} EnInvadepohModelInfo; // size = 0x4C
typedef void (*EnInvadepohFaceAnimFunc) (EnInvadepohFaceAnimInfo*, EnInvadepohFaceAnimBase**);
#define EN_INVADEPOH_LIMB_MAX \
MAX(MAX(MAX(MAX(MAX((s32)COW_LIMB_MAX, \
(s32)COW_TAIL_LIMB_MAX), \
(s32)DOG_LIMB_MAX), \
(s32)ROMANI_LIMB_MAX), \
(s32)CREMIA_LIMB_MAX), \
(s32)ALIEN_LIMB_MAX)
typedef struct EnInvadepoh {
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0x27C];
/* 0x144 */ SkelAnime skelAnime;
/* 0x188 */ Vec3s jointTable[EN_INVADEPOH_LIMB_MAX];
/* 0x212 */ Vec3s morphTable[EN_INVADEPOH_LIMB_MAX];
/* 0x29C */ s8 isAnimFinished;
/* 0x2A0 */ ColliderCylinder collider;
/* 0x2EC */ EnInvadepohActionFunc actionFunc;
/* 0x2F0 */ s16 timer;
/* 0x2F2 */ s16 frameCounter;
/* 0x2F4 */ s8 objectSlot;
/* 0x2F8 */ f32 distanceToRomani;
/* 0x2FC */ UNK_TYPE1 unk_2FC[4];
/* 0x300 */ f32 alienAbductorAccelY;
/* 0x304 */ s16 angle;
/* 0x306 */ s16 angularVelocity;
/* 0x308 */ s8 endPoint;
/* 0x309 */ s8 currentPoint;
/* 0x30A */ s8 pathStep;
/* 0x30C */ Vec3s *pathPoints;
/* 0x310 */ f32 totalPathDistance;
/* 0x314 */ Vec3f currentPos;
/* 0x320 */ f32 pathProgress;
/* 0x324 */ EnInvadepohModelInfo modelInfo;
/* 0x370 */ s16 shapeAngularVelocityY;
/* 0x372 */ s16 shapeAngularAccelerationY;
/* 0x374 */ s8 silentRomaniStareState;
/* 0x376 */ u16 textId;
/* 0x378 */ s8 doorOpened;
/* 0x379 */ s8 alienCount;
/* 0x37C */ f32 pathCheckpoints[3];
/* 0x388 */ UNK_TYPE1 unk_388;
/* 0x389 */ u8 alpha;
/* 0x38A */ s8 pathCompleted;
/* 0x38B */ s8 shouldDraw;
/* 0x38C */ s8 shouldDrawDeathFlash;
/* 0x38D */ u8 eyeBeamAlpha;
/* 0x390 */ Vec3f deathFlashScale;
/* 0x39C */ f32 ufoPulseScale;
/* 0x3A0 */ f32 ufoPulseScaleTarget;
/* 0x3A4 */ f32 ufoPulseScaleSpeed;
/* 0x3A8 */ s16 ufoPulsePhase;
/* 0x3AA */ s16 ufoPulsePhaseVelocity;
/* 0x3AC */ s8 ufoTargetPosIndex;
/* 0x3AD */ UNK_TYPE1 unk_3AD[0xF];
/* 0x3BC */ s8 dogTargetPoint;
} EnInvadepoh; // size = 0x3C0
#endif // Z_EN_INVADEPOH_H

24
src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c
View File

@ -200,8 +200,8 @@ static EnInvadepohDemoFunc sDrawFuncs[EN_INVADEPOH_DEMO_TYPE_MAX] = {
EnInvadepohDemo_CowTail_Draw, // EN_INVADEPOH_DEMO_TYPE_COW_TAIL
};
MtxF sAlienLeftEyeBeamMtxF;
MtxF sAlienRightEyeBeamMtxF;
MtxF sInvadepohDemoAlienLeftEyeBeamMtxF;
MtxF sInvadepohDemoAlienRightEyeBeamMtxF;
void EnInvadepohDemo_DoNothing(EnInvadepohDemo* this, PlayState* play) {
}
@ -556,7 +556,7 @@ void EnInvadepohDemo_CowTail_WaitForObject(EnInvadepohDemo* this, PlayState* pla
}
}
void EnInvadepohDemo_Ufo_UpdateMatrixTranslation(Vec3f* translation) {
void EnInvadepohDemo_Ufo_SetMatrixTranslation(Vec3f* translation) {
MtxF* currentMatrix = Matrix_GetCurrent();
currentMatrix->xw = translation->x;
@ -564,15 +564,16 @@ void EnInvadepohDemo_Ufo_UpdateMatrixTranslation(Vec3f* translation) {
currentMatrix->zw = translation->z;
}
s32 EnInvadepohDemo_Ufo_ShouldDrawLensFlare(PlayState* play, Vec3f* pos) {
s32 EnInvadepohDemo_Ufo_LensFlareCheck(PlayState* play, Vec3f* pos) {
Vec3f projectedPos;
f32 invW;
Actor_GetProjectedPos(play, pos, &projectedPos, &invW);
if ((projectedPos.z > 1.0f) && (fabsf(projectedPos.x * invW) < 1.0f) && (fabsf(projectedPos.y * invW) < 1.0f)) {
f32 screenPosX = PROJECTED_TO_SCREEN_X(projectedPos, invW);
f32 screenPosY = PROJECTED_TO_SCREEN_Y(projectedPos, invW);
s32 wZ = (s32)(projectedPos.z * invW * 16352.0f) + 16352;
s32 wZ = (s32)(projectedPos.z * invW * ((G_MAXZ / 2) * 32)) + ((G_MAXZ / 2) * 32);
if (wZ < SysCfb_GetZBufferInt(screenPosX, screenPosY)) {
return true;
@ -589,14 +590,14 @@ void EnInvadepohDemo_Alien_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dL
Matrix_RotateZS(-0x53ED, MTXMODE_APPLY);
Matrix_RotateYS(-0x3830, MTXMODE_APPLY);
Matrix_Scale(1.0f, 1.0f, 1.5f, MTXMODE_APPLY);
Matrix_Get(&sAlienLeftEyeBeamMtxF);
Matrix_Get(&sInvadepohDemoAlienLeftEyeBeamMtxF);
Matrix_Pop();
} else if (limbIndex == ALIEN_LIMB_RIGHT_EYE) {
Matrix_Push();
Matrix_RotateZS(-0x53ED, MTXMODE_APPLY);
Matrix_RotateYS(-0x47D0, MTXMODE_APPLY);
Matrix_Scale(1.0f, 1.0f, 1.5f, MTXMODE_APPLY);
Matrix_Get(&sAlienRightEyeBeamMtxF);
Matrix_Get(&sInvadepohDemoAlienRightEyeBeamMtxF);
Matrix_Pop();
}
}
@ -631,14 +632,14 @@ void EnInvadepohDemo_Alien_Draw(EnInvadepohDemo* this, PlayState* play) {
gDPPipeSync(gfx++);
gDPSetPrimColor(gfx++, 0, 0xFF, 240, 180, 100, 60);
gDPSetEnvColor(gfx++, 255, 255, 255, 150);
Matrix_Mult(&sAlienLeftEyeBeamMtxF, MTXMODE_NEW);
Matrix_Mult(&sInvadepohDemoAlienLeftEyeBeamMtxF, MTXMODE_NEW);
mtx = Matrix_NewMtx(play->state.gfxCtx);
if (mtx != NULL) {
gSPMatrix(gfx++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfx++, gAlienEyeBeamDL);
Matrix_Mult(&sAlienRightEyeBeamMtxF, MTXMODE_NEW);
Matrix_Mult(&sInvadepohDemoAlienRightEyeBeamMtxF, MTXMODE_NEW);
mtx = Matrix_NewMtx(play->state.gfxCtx);
@ -732,7 +733,8 @@ void EnInvadepohDemo_Ufo_Draw(EnInvadepohDemo* this, PlayState* play) {
flashPos.x = this->actor.world.pos.x;
flashPos.y = this->actor.world.pos.y;
flashPos.z = this->actor.world.pos.z;
EnInvadepohDemo_Ufo_UpdateMatrixTranslation(&flashPos);
EnInvadepohDemo_Ufo_SetMatrixTranslation(&flashPos);
Matrix_ReplaceRotation(&play->billboardMtxF);
Matrix_RotateZS(this->ufoRotZ, MTXMODE_APPLY);
@ -749,7 +751,7 @@ void EnInvadepohDemo_Ufo_Draw(EnInvadepohDemo* this, PlayState* play) {
CLOSE_DISPS(play->state.gfxCtx);
if (EnInvadepohDemo_Ufo_ShouldDrawLensFlare(play, &flashPos)) {
if (EnInvadepohDemo_Ufo_LensFlareCheck(play, &flashPos)) {
Environment_DrawLensFlare(play, &play->envCtx, &play->view, play->state.gfxCtx, flashPos, 20.0f, 9.0f, 0,
false);
}

10
src/overlays/actors/ovl_En_Ma4/z_en_ma4.c
View File

@ -227,7 +227,7 @@ void EnMa4_Init(Actor* thisx, PlayState* play) {
if (CURRENT_DAY == 1) {
this->type = MA4_TYPE_DAY1;
} else if (CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM)) {
} else if (CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS)) {
this->type = MA4_TYPE_ALIENS_DEFEATED;
} else {
this->type = MA4_TYPE_ALIENS_WON;
@ -399,7 +399,7 @@ void EnMa4_HandlePlayerChoice(EnMa4* this, PlayState* play) {
case 0x3341:
if (play->msgCtx.choiceIndex == 0) {
Audio_PlaySfx_MessageDecide();
SET_WEEKEVENTREG(WEEKEVENTREG_PROMISED_TO_HELP_WITH_THEM);
SET_WEEKEVENTREG(WEEKEVENTREG_PROMISED_TO_HELP_WITH_ALIENS);
Message_StartTextbox(play, 0x3343, &this->actor);
this->textId = 0x3343;
} else {
@ -415,7 +415,7 @@ void EnMa4_HandlePlayerChoice(EnMa4* this, PlayState* play) {
case 0x3346:
if (play->msgCtx.choiceIndex == 0) {
Audio_PlaySfx_MessageDecide();
SET_WEEKEVENTREG(WEEKEVENTREG_PROMISED_TO_HELP_WITH_THEM);
SET_WEEKEVENTREG(WEEKEVENTREG_PROMISED_TO_HELP_WITH_ALIENS);
Message_StartTextbox(play, 0x3343, &this->actor);
this->textId = 0x3343;
} else {
@ -447,7 +447,7 @@ void EnMa4_HandlePlayerChoice(EnMa4* this, PlayState* play) {
Message_StartTextbox(play, 0x334E, &this->actor);
this->textId = 0x334E;
if (CHECK_QUEST_ITEM(QUEST_SONG_EPONA)) {
Message_BombersNotebookQueueEvent(play, BOMBERS_NOTEBOOK_EVENT_PROMISED_TO_HELP_WITH_THEM);
Message_BombersNotebookQueueEvent(play, BOMBERS_NOTEBOOK_EVENT_PROMISED_TO_HELP_WITH_ALIENS);
}
Message_BombersNotebookQueueEvent(play, BOMBERS_NOTEBOOK_EVENT_MET_ROMANI);
} else { // No.
@ -922,7 +922,7 @@ void EnMa4_StartDialogue(EnMa4* this, PlayState* play) {
}
} else if (this->state == MA4_STATE_DEFAULT) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_21_40)) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_PROMISED_TO_HELP_WITH_THEM)) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_PROMISED_TO_HELP_WITH_ALIENS)) {
Message_StartTextbox(play, 0x3346, &this->actor);
this->textId = 0x3346;
} else {

30
src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c
View File

@ -182,7 +182,7 @@ void EnMaYto_Init(Actor* thisx, PlayState* play) {
this->unk320 = 0;
this->eyeTexIndex = 0;
if ((CURRENT_DAY == 1) || CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM)) {
if ((CURRENT_DAY == 1) || CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS)) {
EnMaYto_SetFaceExpression(this, 0, 1);
} else {
EnMaYto_SetFaceExpression(this, 5, 2);
@ -215,19 +215,19 @@ void EnMaYto_Init(Actor* thisx, PlayState* play) {
s32 EnMaYto_CheckValidSpawn(EnMaYto* this, PlayState* play) {
switch (this->type) {
case MA_YTO_TYPE_DEFAULT:
if ((CURRENT_DAY == 3) && !CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM)) {
if ((CURRENT_DAY == 3) && !CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS)) {
return false;
}
break;
case MA_YTO_TYPE_DINNER:
if ((CURRENT_DAY != 1) && CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM)) {
if ((CURRENT_DAY != 1) && CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS)) {
return false;
}
break;
case MA_YTO_TYPE_BARN:
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS)) {
if (((this->actor.params & 0x0F00) >> 8) != 0) {
return false;
}
@ -269,7 +269,7 @@ void EnMaYto_InitAnimation(EnMaYto* this, PlayState* play) {
break;
case MA_YTO_TYPE_BARN:
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS)) {
EnMaYto_ChangeAnim(this, CREMIA_ANIM_12);
} else {
EnMaYto_ChangeAnim(this, CREMIA_ANIM_8);
@ -362,7 +362,7 @@ s32 EnMaYto_TryFindRomani(EnMaYto* this, PlayState* play) {
return 0;
case MA_YTO_TYPE_DINNER:
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM) && (CURRENT_DAY == 2)) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS) && (CURRENT_DAY == 2)) {
return 0;
}
if (EnMaYto_SearchRomani(this, play)) {
@ -371,7 +371,7 @@ s32 EnMaYto_TryFindRomani(EnMaYto* this, PlayState* play) {
return 1;
case MA_YTO_TYPE_BARN:
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS)) {
if (EnMaYto_SearchRomani(this, play)) {
return 2;
}
@ -528,7 +528,7 @@ void EnMaYto_DefaultChooseNextDialogue(EnMaYto* this, PlayState* play) {
}
void EnMaYto_SetupDinnerWait(EnMaYto* this) {
if ((CURRENT_DAY == 1) || CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM)) {
if ((CURRENT_DAY == 1) || CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS)) {
func_80B90E50(this, 0);
this->unk31E = 0;
} else {
@ -569,7 +569,7 @@ void EnMaYto_DinnerWait(EnMaYto* this, PlayState* play) {
}
void EnMaYto_SetupDinnerDialogueHandler(EnMaYto* this) {
if ((CURRENT_DAY == 1) || CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM)) {
if ((CURRENT_DAY == 1) || CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS)) {
func_80B90E50(this, 1);
} else {
func_80B90E50(this, 2);
@ -722,7 +722,7 @@ void EnMaYto_DinnerChooseNextDialogue(EnMaYto* this, PlayState* play) {
}
void EnMaYto_SetupBarnWait(EnMaYto* this) {
if ((CURRENT_DAY == 1) || CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM)) {
if ((CURRENT_DAY == 1) || CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS)) {
EnMaYto_ChangeAnim(this, CREMIA_ANIM_13);
func_80B90E50(this, 0);
this->unk31E = 0;
@ -750,7 +750,7 @@ void EnMaYto_BarnWait(EnMaYto* this, PlayState* play) {
Actor_ChangeFocus(&this->actor, play, &this->actor);
EnMaYto_BarnStartDialogue(this, play);
EnMaYto_SetupBarnDialogueHandler(this);
} else if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM) || (ABS_ALT(direction) < 0x2000)) {
} else if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS) || (ABS_ALT(direction) < 0x2000)) {
Actor_OfferTalk(&this->actor, play, 100.0f);
child = this->actor.child;
@ -762,7 +762,7 @@ void EnMaYto_BarnWait(EnMaYto* this, PlayState* play) {
}
void EnMaYto_SetupBarnDialogueHandler(EnMaYto* this) {
if ((CURRENT_DAY == 1) || CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM)) {
if ((CURRENT_DAY == 1) || CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS)) {
func_80B90E50(this, 1);
} else {
func_80B90E50(this, 2);
@ -1268,7 +1268,7 @@ void EnMaYto_DinnerStartDialogue(EnMaYto* this, PlayState* play) {
}
void EnMaYto_BarnStartDialogue(EnMaYto* this, PlayState* play) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS)) {
if (CURRENT_DAY == 2) {
if (this->unk310 == 1) {
Message_StartTextbox(play, 0x33AE, &this->actor);
@ -1391,7 +1391,7 @@ void EnMaYto_SetFaceExpression(EnMaYto* this, s16 overrideEyeTexIndex, s16 mouth
}
void EnMaYto_InitFaceExpression(EnMaYto* this) {
if ((CURRENT_DAY == 1) || CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM)) {
if ((CURRENT_DAY == 1) || CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS)) {
EnMaYto_SetFaceExpression(this, 0, 1);
EnMaYto_SetRomaniFaceExpression(this, 0, 0);
} else {
@ -1515,7 +1515,7 @@ void EnMaYto_Draw(Actor* thisx, PlayState* play) {
OPEN_DISPS(play->state.gfxCtx);
if ((this->type == MA_YTO_TYPE_BARN) && CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM)) {
if ((this->type == MA_YTO_TYPE_BARN) && CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS)) {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gCremiaWoodenBoxDL);
}

16
src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c
View File

@ -171,7 +171,7 @@ void EnMaYts_InitAnimation(EnMaYts* this, PlayState* play) {
case MA_YTS_TYPE_SITTING:
this->actor.targetMode = TARGET_MODE_6;
// Day 1 or "Winning" the alien invasion
if ((CURRENT_DAY == 1) || CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM)) {
if ((CURRENT_DAY == 1) || CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS)) {
EnMaYts_ChangeAnim(this, ENMATYS_ANIM_14);
} else {
EnMaYts_ChangeAnim(this, ENMATYS_ANIM_18);
@ -204,14 +204,14 @@ s32 EnMaYts_CheckValidSpawn(EnMaYts* this, PlayState* play) {
case 2:
// Failing the alien invasion
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM)) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS)) {
return false;
}
break;
case 3:
// "Winning" the alien invasion
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS)) {
return false;
}
break;
@ -223,7 +223,7 @@ s32 EnMaYts_CheckValidSpawn(EnMaYts* this, PlayState* play) {
case MA_YTS_TYPE_BARN:
// Failing the alien invasion
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM)) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS)) {
return false;
} else if ((CURRENT_TIME >= CLOCK_TIME(20, 0)) && (CURRENT_DAY == 3)) {
return false;
@ -232,7 +232,7 @@ s32 EnMaYts_CheckValidSpawn(EnMaYts* this, PlayState* play) {
case MA_YTS_TYPE_SLEEPING:
// "Winning" the alien invasion
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS)) {
return false;
}
break;
@ -281,7 +281,7 @@ void EnMaYts_Init(Actor* thisx, PlayState* play) {
this->hasBow = false;
}
if ((CURRENT_DAY == 1) || CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM)) {
if ((CURRENT_DAY == 1) || CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS)) {
this->overrideEyeTexIndex = 0;
this->eyeTexIndex = 0;
this->mouthTexIndex = 0;
@ -300,7 +300,7 @@ void EnMaYts_Init(Actor* thisx, PlayState* play) {
this->unk_32C = 2;
EnMaYts_SetupEndCreditsHandler(this);
} else if ((CURRENT_DAY == 2) && (gSaveContext.save.isNight == 1) &&
CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM)) {
CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS)) {
EnMaYts_SetupStartDialogue(this);
} else {
EnMaYts_SetupDoNothing(this);
@ -355,7 +355,7 @@ void EnMaYts_StartDialogue(EnMaYts* this, PlayState* play) {
this->textId = 0x3366;
Message_BombersNotebookQueueEvent(play, BOMBERS_NOTEBOOK_EVENT_MET_ROMANI);
}
} else if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_PROMISED_TO_HELP_WITH_THEM)) {
} else if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_PROMISED_TO_HELP_WITH_ALIENS)) {
EnMaYts_SetFaceExpression(this, 0, 0);
Message_StartTextbox(play, 0x3367, &this->actor);
this->textId = 0x3367;

2
src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c
View File

@ -251,7 +251,7 @@ void EnTanron5_Init(Actor* thisx, PlayState* play) {
this->dList = gRuinFragmentDL;
this->timer = 150;
}
} else if (TWINMOLD_PROP_GET_TYPE(&this->actor) == TWINMOLD_PROP_TYPE_STATIC) {
} else if (TWINMOLD_PROP_GET_TYPE(&this->actor) == TWINMOLD_PROP_TYPE_SPAWN_HANDLER) {
EnTanron5* child;
s32 i;

2
src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.h
View File

@ -9,7 +9,7 @@ struct EnTanron5;
#define TWINMOLD_PROP_PARAMS(type) (type)
typedef enum {
/* 0 */ TWINMOLD_PROP_TYPE_STATIC,
/* 0 */ TWINMOLD_PROP_TYPE_SPAWN_HANDLER,
/* 1 */ TWINMOLD_PROP_TYPE_RUIN_PILLAR_1,
/* 2 */ TWINMOLD_PROP_TYPE_RUIN_PILLAR_2,
/* 3 */ TWINMOLD_PROP_TYPE_RUIN_PILLAR_3,

2
src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c
View File

@ -32,7 +32,7 @@ void ObjDinner_Init(Actor* thisx, PlayState* play) {
ObjDinner* this = THIS;
if ((gSaveContext.save.isNight != true) ||
((CURRENT_DAY == 3) && CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM))) {
((CURRENT_DAY == 3) && CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS))) {
Actor_Kill(&this->actor);
}
Actor_SetScale(&this->actor, 0.1f);

2
src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c
View File

@ -74,7 +74,7 @@ void ObjMilkBin_Update(Actor* thisx, PlayState* play2) {
ObjMilkBin* this = THIS;
if (this->type == OBJ_MILK_BIN_TYPE_1) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS)) {
if (((gSaveContext.save.day == 2) && (gSaveContext.save.isNight == 1)) || (gSaveContext.save.day >= 3)) {
Actor_Kill(&this->actor);
return;

16
src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c
View File

@ -222,7 +222,7 @@ void ObjMine_Water_CheckAC(ObjMine* this, Vec3f* knockbackDir) {
void ObjMine_AirWater_Noop(ObjMine* this) {
}
void ObjMine_ReplaceTranslation(Vec3f* translation) {
void ObjMine_SetMatrixTranslation(Vec3f* translation) {
MtxF* matrix = Matrix_GetCurrent();
matrix->xw = translation->x;
@ -230,7 +230,7 @@ void ObjMine_ReplaceTranslation(Vec3f* translation) {
matrix->zw = translation->z;
}
void ObjMine_SetRotation(ObjMineMtxF3* basis) {
void ObjMine_SetMatrixRotation(ObjMineMtxF3* basis) {
MtxF* matrix = Matrix_GetCurrent();
matrix->xx = basis->x.x;
@ -1150,7 +1150,7 @@ void ObjMine_Air_Draw(Actor* thisx, PlayState* play) {
gSPMatrix(gfx++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfx++, object_ny_DL_000030);
ObjMine_SetRotation(&airChain->basis);
ObjMine_SetMatrixRotation(&airChain->basis);
Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY);
if (linkCount != 0) {
// Sets pivot point to be half a chain link length below home
@ -1165,7 +1165,7 @@ void ObjMine_Air_Draw(Actor* thisx, PlayState* play) {
linkPos.x += linkOffset.x;
linkPos.y += linkOffset.y;
linkPos.z += linkOffset.z;
ObjMine_ReplaceTranslation(&linkPos);
ObjMine_SetMatrixTranslation(&linkPos);
gSPMatrix(gfx++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfx++, object_ny_DL_000030);
@ -1173,7 +1173,7 @@ void ObjMine_Air_Draw(Actor* thisx, PlayState* play) {
}
Matrix_RotateXS(0x2000, MTXMODE_APPLY);
ObjMine_ReplaceTranslation(&this->actor.world.pos);
ObjMine_SetMatrixTranslation(&this->actor.world.pos);
gSPMatrix(gfx++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPPipeSync(gfx++);
@ -1207,20 +1207,20 @@ void ObjMine_Water_Draw(Actor* thisx, PlayState* play) {
gSPDisplayList(gfx++, object_ny_DL_000030);
for (i = 0, waterLink = waterChain->links; i < linkCount; i++, waterLink++) {
ObjMine_SetRotation(&waterLink->basis);
ObjMine_SetMatrixRotation(&waterLink->basis);
Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY);
// Consecutive chain links are offset 90 degrees.
if ((i % 2) == 0) {
Matrix_RotateYS(0x4000, MTXMODE_APPLY);
}
ObjMine_ReplaceTranslation(&waterLink->pos);
ObjMine_SetMatrixTranslation(&waterLink->pos);
gSPMatrix(gfx++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfx++, object_ny_DL_000030);
}
Matrix_RotateXS(0x2000, MTXMODE_APPLY);
ObjMine_ReplaceTranslation(&this->actor.world.pos);
ObjMine_SetMatrixTranslation(&this->actor.world.pos);
gSPMatrix(gfx++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPPipeSync(gfx++);

4
src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c
View File

@ -53,7 +53,7 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
void ObjTokeiStep_SetSysMatrix(ObjTokeiStepPanel* panel) {
void ObjTokeiStep_SetMatrixTranslation(ObjTokeiStepPanel* panel) {
MtxF* mtx = Matrix_GetCurrent();
mtx->xw = panel->pos.x;
@ -285,7 +285,7 @@ void ObjTokeiStep_DrawOpen(Actor* thisx, PlayState* play) {
for (i = 0; i < ARRAY_COUNT(this->panels); i++) {
panel = &this->panels[i];
ObjTokeiStep_SetSysMatrix(panel);
ObjTokeiStep_SetMatrixTranslation(panel);
gSPMatrix(gfx++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfx++, gClocktowerPanelDL);
}

4
src/overlays/actors/ovl_Obj_Um/z_obj_um.c
View File

@ -15,7 +15,7 @@
/**
* weekEventReg flags checked by this actor:
* - WEEKEVENTREG_DEFENDED_AGAINST_THEM: Aliens defeated
* - WEEKEVENTREG_DEFENDED_AGAINST_ALIENS: Aliens defeated
* If false: The actor doesn't spawn
* - WEEKEVENTREG_31_40
* If true: Cremia doesn't explain again she'll deliever milk to town
@ -680,7 +680,7 @@ void ObjUm_Init(Actor* thisx, PlayState* play) {
this->initialPathIndex = OBJ_UM_GET_PATH_INDEX(thisx);
// if (!AliensDefeated)
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM)) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS)) {
Actor_Kill(&this->dyna.actor);
return;
}

25
src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c
View File

@ -41,19 +41,12 @@ static InitChainEntry sInitChain[] = {
ICHAIN_F32(uncullZoneDownward, 900, ICHAIN_STOP),
};
s32 func_80C07C80(s32 arg0) {
s32 var_v1;
if (!(arg0 & 1)) {
var_v1 = gSaveContext.save.saveInfo.unk_E64[arg0 >> 1] & 0xFFFF;
} else {
var_v1 = (gSaveContext.save.saveInfo.unk_E64[arg0 >> 1] & 0xFFFF0000) >> 0x10;
}
return var_v1 + CLOCK_TIME(2, 30);
s32 ObjUsiyane_GetAlienSpawnTime(s32 alienIndex) {
return CLOCK_TIME(2, 30) + ALIEN_GET_SPAWN_TIME_OFFSET(alienIndex);
}
s32 func_80C07CD0(void) {
if (CURRENT_DAY <= 0) {
if (CURRENT_DAY < 1) {
return false;
}
@ -66,21 +59,21 @@ s32 func_80C07CD0(void) {
}
if (time < CLOCK_TIME(5, 15)) {
s32 var_s1 = CLOCK_TIME(5, 15);
s32 temp_v0_2;
s32 firstSpawn = CLOCK_TIME(5, 15);
s32 spawnTime;
for (i = 0; i < 8; i++) {
temp_v0_2 = func_80C07C80(i);
var_s1 = CLAMP_MAX(var_s1, temp_v0_2);
spawnTime = ObjUsiyane_GetAlienSpawnTime(i);
firstSpawn = CLAMP_MAX(firstSpawn, spawnTime);
}
if (time < (var_s1 + 0xE11)) {
if (time < (firstSpawn + (80 * CLOCK_TIME_MINUTE) + 1)) {
return false;
}
}
}
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_ALIENS)) {
return false;
}
return true;

500
tools/disasm/functions.txt
View File

@ -9308,9 +9308,9 @@
0x809DBFB4:("func_809DBFB4",),
0x809DC218:("Boss02_Tail_Update",),
0x809DC320:("Boss02_Twinmold_Update",),
0x809DC78C:("Boss02_Static_Update",),
0x809DC78C:("Boss02_BattleHandler_Update",),
0x809DCA00:("Boss02_Twinmold_Draw",),
0x809DD0A8:("Boss02_Static_Draw",),
0x809DD0A8:("Boss02_BattleHandler_Draw",),
0x809DD0CC:("Boss02_UpdateEffects",),
0x809DD2F8:("Boss02_DrawEffects",),
0x809DD934:("Boss02_HandleGiantsMaskCutscene",),
@ -11159,8 +11159,8 @@
0x80A8146C:("ObjMine_Air_CheckAC",),
0x80A81544:("ObjMine_Water_CheckAC",),
0x80A81640:("ObjMine_AirWater_Noop",),
0x80A8164C:("ObjMine_ReplaceTranslation",),
0x80A81684:("ObjMine_ReplaceRotation",),
0x80A8164C:("ObjMine_SetMatrixTranslation",),
0x80A81684:("ObjMine_SetMatrixRotation",),
0x80A81714:("ObjMine_StepUntilParallel",),
0x80A81818:("ObjMine_UpdateCollider",),
0x80A81868:("ObjMine_Air_InitChain",),
@ -12210,7 +12210,7 @@
0x80AD5584:("EnTrt2_PostLimbDraw",),
0x80AD566C:("EnTrt2_TransformLimbDraw",),
0x80AD56E8:("func_80AD56E8",),
0x80AD5BB0:("ObjTokeiStep_SetSysMatrix",),
0x80AD5BB0:("ObjTokeiStep_SetMatrixTranslation",),
0x80AD5BE8:("ObjTokeiStep_RequestQuakeAndRumble",),
0x80AD5C70:("ObjTokeiStep_SpawnDust",),
0x80AD5DFC:("ObjTokeiStep_InitSteps",),
@ -13724,250 +13724,250 @@
0x80B43008:("func_80B43008",),
0x80B43074:("func_80B43074",),
0x80B431D0:("EnKgy_Draw",),
0x80B439B0:("func_80B439B0",),
0x80B43A24:("func_80B43A24",),
0x80B43A74:("func_80B43A74",),
0x80B43A9C:("func_80B43A9C",),
0x80B43AB0:("func_80B43AB0",),
0x80B43AF0:("func_80B43AF0",),
0x80B43B80:("func_80B43B80",),
0x80B43BC8:("func_80B43BC8",),
0x80B43DD4:("func_80B43DD4",),
0x80B43E6C:("func_80B43E6C",),
0x80B43F0C:("func_80B43F0C",),
0x80B43F70:("func_80B43F70",),
0x80B44024:("func_80B44024",),
0x80B4407C:("func_80B4407C",),
0x80B440B8:("func_80B440B8",),
0x80B44234:("func_80B44234",),
0x80B442E4:("func_80B442E4",),
0x80B443A0:("func_80B443A0",),
0x80B444BC:("func_80B444BC",),
0x80B444F4:("func_80B444F4",),
0x80B44514:("func_80B44514",),
0x80B44540:("func_80B44540",),
0x80B44570:("func_80B44570",),
0x80B44620:("func_80B44620",),
0x80B44640:("func_80B44640",),
0x80B44664:("func_80B44664",),
0x80B44690:("func_80B44690",),
0x80B446D0:("func_80B446D0",),
0x80B44700:("func_80B44700",),
0x80B447C0:("func_80B447C0",),
0x80B44A90:("func_80B44A90",),
0x80B44B78:("func_80B44B78",),
0x80B44B84:("func_80B44B84",),
0x80B44C24:("func_80B44C24",),
0x80B44C80:("func_80B44C80",),
0x80B44E90:("func_80B44E90",),
0x80B44EFC:("func_80B44EFC",),
0x80B44F58:("func_80B44F58",),
0x80B44FEC:("func_80B44FEC",),
0x80B45080:("func_80B45080",),
0x80B450C0:("func_80B450C0",),
0x80B4516C:("func_80B4516C",),
0x80B451A0:("func_80B451A0",),
0x80B452EC:("func_80B452EC",),
0x80B453F4:("func_80B453F4",),
0x80B45460:("func_80B45460",),
0x80B454BC:("func_80B454BC",),
0x80B45518:("func_80B45518",),
0x80B45550:("func_80B45550",),
0x80B4560C:("func_80B4560C",),
0x80B45648:("func_80B45648",),
0x80B456A8:("func_80B456A8",),
0x80B457A0:("func_80B457A0",),
0x80B458D8:("func_80B458D8",),
0x80B45980:("func_80B45980",),
0x80B459E8:("func_80B459E8",),
0x80B45A4C:("func_80B45A4C",),
0x80B45A94:("func_80B45A94",),
0x80B45B1C:("func_80B45B1C",),
0x80B45BB8:("func_80B45BB8",),
0x80B45C04:("func_80B45C04",),
0x80B45CE0:("func_80B45CE0",),
0x80B45EC8:("func_80B45EC8",),
0x80B46118:("func_80B46118",),
0x80B46184:("func_80B46184",),
0x80B461DC:("func_80B461DC",),
0x80B4627C:("func_80B4627C",),
0x80B46414:("func_80B46414",),
0x80B46520:("func_80B46520",),
0x80B465CC:("func_80B465CC",),
0x80B46644:("func_80B46644",),
0x80B468B4:("func_80B468B4",),
0x80B469C4:("func_80B469C4",),
0x80B46A80:("func_80B46A80",),
0x80B439B0:("EnInvadepoh_Alien_SetSpawnTime",),
0x80B43A24:("EnInvadepoh_Alien_GetSpawnTime",),
0x80B43A74:("EnInvadepoh_Alien_SetKillCount",),
0x80B43A9C:("EnInvadepoh_Alien_GetKillCount",),
0x80B43AB0:("EnInvadepoh_Alien_AddKill",),
0x80B43AF0:("EnInvadepoh_Alien_SetRespawnTime",),
0x80B43B80:("EnInvadepoh_Alien_GetCurrentPoint",),
0x80B43BC8:("EnInvadepoh_Romani_PathUpdate",),
0x80B43DD4:("EnInvadepoh_Alien_StepYawAlongPath",),
0x80B43E6C:("EnInvadepoh_Romani_StepYawAlongPath",),
0x80B43F0C:("EnInvadepoh_SetYawAlongPath",),
0x80B43F70:("EnInvadepoh_GetTotalPathDistance",),
0x80B44024:("EnInvadepoh_InitPath",),
0x80B4407C:("EnInvadepoh_SetPosToPathPoint",),
0x80B440B8:("EnInvadepoh_Dog_IsCloseToPath",),
0x80B44234:("EnInvadepoh_Dog_FindClosestPointToTarget",),
0x80B442E4:("EnInvadepoh_Alien_PathComputeProgress",),
0x80B443A0:("EnInvadepoh_Alien_SetCheckpoints",),
0x80B444BC:("EnInvadepoh_Alien_InitPath",),
0x80B444F4:("EnInvadepoh_SilentRomani_InitPath",),
0x80B44514:("EnInvadepoh_SilentRomani_SetPathPointToNext",),
0x80B44540:("EnInvadepoh_Night1Romani_InitPath",),
0x80B44570:("EnInvadepoh_Night1Romani_PathComputeProgress",),
0x80B44620:("EnInvadepoh_BarnRomani_InitPath",),
0x80B44640:("EnInvadepoh_BarnRomani_SetPathPointToNext",),
0x80B44664:("EnInvadepoh_Dog_InitPath",),
0x80B44690:("EnInvadepoh_Dog_SetPathPointToNext",),
0x80B446D0:("EnInvadepoh_Night3Romani_InitPath",),
0x80B44700:("EnInvadepoh_Night3Romani_PathComputeProgress",),
0x80B447C0:("EnInvadepoh_Alien_PathUpdate",),
0x80B44A90:("EnInvadepoh_Alien_Knockback",),
0x80B44B78:("EnInvadepoh_Alien_DoNothing",),
0x80B44B84:("EnInvadepoh_Romani_MoveAlongPath",),
0x80B44C24:("EnInvadepoh_Night1Romani_MoveAlongTimePath",),
0x80B44C80:("EnInvadepoh_Dog_MoveAlongPath",),
0x80B44E90:("EnInvadepoh_Dog_Move",),
0x80B44EFC:("EnInvadepoh_Night3Romani_MoveAlongTimePath",),
0x80B44F58:("EnInvadepoh_Romani_DesegmentTextures",),
0x80B44FEC:("EnInvadepoh_Cremia_DesegmentTextures",),
0x80B45080:("EnInvadepoh_Alien_DesegmentTexAnims",),
0x80B450C0:("EnInvadepoh_StepToXZ",),
0x80B4516C:("EnInvadepoh_SnapToFloor",),
0x80B451A0:("EnInvadepoh_InvasionHandler_SetInitialInvasionState",),
0x80B452EC:("EnInvadepoh_InvasionHandler_SpawnAliens",),
0x80B453F4:("EnInvadepoh_AlienAbductor_SpawnCow",),
0x80B45460:("EnInvadepoh_AlienAbductor_SpawnRomani",),
0x80B454BC:("EnInvadepoh_InvasionHandler_SpawnUfo",),
0x80B45518:("EnInvadepoh_Ufo_SetMatrixTranslation",),
0x80B45550:("EnInvadepoh_Romani_OpenDoor",),
0x80B4560C:("EnInvadepoh_Romani_StartTextbox",),
0x80B45648:("EnInvadepoh_InvasionHandler_SetCutscenes",),
0x80B456A8:("EnInvadepoh_LensFlareCheck",),
0x80B457A0:("EnInvadepoh_InvasionHandler_SetClosestAlienThreat",),
0x80B458D8:("EnInvadepoh_Dog_GetClosestAlienThreat",),
0x80B45980:("EnInvadepoh_ModelInfo_GetNextFaceAnim",),
0x80B459E8:("EnInvadepoh_ModelInfo_SetNextFaceAnim",),
0x80B45A4C:("EnInvadepoh_ModelInfo_UpdateFaceAnimOnce",),
0x80B45A94:("EnInvadepoh_ModelInfo_UpdateFaceAnimChained",),
0x80B45B1C:("EnInvadepoh_ModelInfo_UpdateFaceAnimChainedDelay",),
0x80B45BB8:("EnInvadepoh_ModelInfo_UpdateFaceAnim",),
0x80B45C04:("EnInvadepoh_ModelInfo_Init",),
0x80B45CE0:("EnInvadepoh_ModelInfo_Update",),
0x80B45EC8:("EnInvadepoh_Ufo_SpawnSparkles",),
0x80B46118:("EnInvadepoh_SpawnWarpEffect",),
0x80B46184:("EnInvadepoh_UpdateWarpEffect",),
0x80B461DC:("EnInvadepoh_UpdateEffects",),
0x80B4627C:("EnInvadepoh_InvasionHandler_Init",),
0x80B46414:("EnInvadepoh_Alien_Init",),
0x80B46520:("EnInvadepoh_Cow_Init",),
0x80B465CC:("EnInvadepoh_CowTail_Init",),
0x80B46644:("EnInvadepoh_Romani_Init",),
0x80B468B4:("EnInvadepoh_Ufo_Init",),
0x80B469C4:("EnInvadepoh_Dog_Init",),
0x80B46A80:("EnInvadepoh_Cremia_Init",),
0x80B46B74:("EnInvadepoh_Init",),
0x80B46BB0:("func_80B46BB0",),
0x80B46BC0:("func_80B46BC0",),
0x80B46C08:("func_80B46C08",),
0x80B46C34:("func_80B46C34",),
0x80B46C50:("func_80B46C50",),
0x80B46C7C:("func_80B46C7C",),
0x80B46C94:("func_80B46C94",),
0x80B46CC0:("func_80B46CC0",),
0x80B46CF4:("func_80B46CF4",),
0x80B46D28:("func_80B46D28",),
0x80B46BB0:("EnInvadepoh_InvasionHandler_Destroy",),
0x80B46BC0:("EnInvadepoh_Alien_Destroy",),
0x80B46C08:("EnInvadepoh_Cow_Destroy",),
0x80B46C34:("EnInvadepoh_CowTail_Destroy",),
0x80B46C50:("EnInvadepoh_Romani_Destroy",),
0x80B46C7C:("EnInvadepoh_Ufo_Destroy",),
0x80B46C94:("EnInvadepoh_Dog_Destroy",),
0x80B46CC0:("EnInvadepoh_Cremia_Destroy",),
0x80B46CF4:("EnInvadepoh_Night3Romani_Destroy",),
0x80B46D28:("EnInvadepoh_AlienAbductor_Destroy",),
0x80B46D6C:("EnInvadepoh_Destroy",),
0x80B46DA8:("func_80B46DA8",),
0x80B46DC8:("func_80B46DC8",),
0x80B46E20:("func_80B46E20",),
0x80B46E44:("func_80B46E44",),
0x80B46EC0:("func_80B46EC0",),
0x80B46EE8:("func_80B46EE8",),
0x80B46F88:("func_80B46F88",),
0x80B46FA8:("func_80B46FA8",),
0x80B47064:("func_80B47064",),
0x80B47084:("func_80B47084",),
0x80B470E0:("func_80B470E0",),
0x80B47108:("func_80B47108",),
0x80B471C0:("func_80B471C0",),
0x80B471E0:("func_80B471E0",),
0x80B47248:("func_80B47248",),
0x80B47268:("func_80B47268",),
0x80B47278:("func_80B47278",),
0x80B47298:("func_80B47298",),
0x80B47304:("func_80B47304",),
0x80B47324:("func_80B47324",),
0x80B47334:("EnInvadepoh_Update",),
0x80B47380:("func_80B47380",),
0x80B473E4:("func_80B473E4",),
0x80B47478:("func_80B47478",),
0x80B474DC:("func_80B474DC",),
0x80B47568:("func_80B47568",),
0x80B47600:("func_80B47600",),
0x80B4770C:("func_80B4770C",),
0x80B477B4:("func_80B477B4",),
0x80B47830:("func_80B47830",),
0x80B478F4:("func_80B478F4",),
0x80B47938:("func_80B47938",),
0x80B479E8:("func_80B479E8",),
0x80B47BAC:("func_80B47BAC",),
0x80B47D30:("func_80B47D30",),
0x80B47FA8:("func_80B47FA8",),
0x80B48060:("func_80B48060",),
0x80B481C4:("func_80B481C4",),
0x80B4827C:("func_80B4827C",),
0x80B482D4:("func_80B482D4",),
0x80B48324:("func_80B48324",),
0x80B48374:("func_80B48374",),
0x80B483CC:("func_80B483CC",),
0x80B4843C:("func_80B4843C",),
0x80B484EC:("func_80B484EC",),
0x80B48588:("func_80B48588",),
0x80B48610:("func_80B48610",),
0x80B48620:("func_80B48620",),
0x80B4873C:("func_80B4873C",),
0x80B487B4:("func_80B487B4",),
0x80B48848:("func_80B48848",),
0x80B48948:("func_80B48948",),
0x80B48AD4:("func_80B48AD4",),
0x80B48DE4:("func_80B48DE4",),
0x80B48E4C:("func_80B48E4C",),
0x80B48FB0:("func_80B48FB0",),
0x80B490F0:("func_80B490F0",),
0x80B491EC:("func_80B491EC",),
0x80B49228:("func_80B49228",),
0x80B492FC:("func_80B492FC",),
0x80B4934C:("func_80B4934C",),
0x80B49404:("func_80B49404",),
0x80B49454:("func_80B49454",),
0x80B49628:("func_80B49628",),
0x80B49670:("func_80B49670",),
0x80B497A4:("func_80B497A4",),
0x80B497EC:("func_80B497EC",),
0x80B49904:("func_80B49904",),
0x80B4994C:("func_80B4994C",),
0x80B499BC:("func_80B499BC",),
0x80B49A00:("func_80B49A00",),
0x80B49B1C:("func_80B49B1C",),
0x80B49BD0:("func_80B49BD0",),
0x80B49C38:("func_80B49C38",),
0x80B49DA0:("func_80B49DA0",),
0x80B49DFC:("func_80B49DFC",),
0x80B49F88:("func_80B49F88",),
0x80B4A168:("func_80B4A168",),
0x80B4A1B8:("func_80B4A1B8",),
0x80B4A2C0:("func_80B4A2C0",),
0x80B4A350:("func_80B4A350",),
0x80B4A570:("func_80B4A570",),
0x80B4A5E4:("func_80B4A5E4",),
0x80B4A614:("func_80B4A614",),
0x80B4A67C:("func_80B4A67C",),
0x80B4A7C0:("func_80B4A7C0",),
0x80B4A81C:("func_80B4A81C",),
0x80B4A9C8:("func_80B4A9C8",),
0x80B4AB8C:("func_80B4AB8C",),
0x80B4ABDC:("func_80B4ABDC",),
0x80B4ACDC:("func_80B4ACDC",),
0x80B4ACF0:("func_80B4ACF0",),
0x80B4AD3C:("func_80B4AD3C",),
0x80B4AD60:("func_80B4AD60",),
0x80B4ADB8:("func_80B4ADB8",),
0x80B4ADCC:("func_80B4ADCC",),
0x80B4AEC0:("func_80B4AEC0",),
0x80B4AEDC:("func_80B4AEDC",),
0x80B4AF80:("func_80B4AF80",),
0x80B4AF94:("func_80B4AF94",),
0x80B4B024:("func_80B4B024",),
0x80B4B048:("func_80B4B048",),
0x80B4B0C4:("func_80B4B0C4",),
0x80B4B218:("func_80B4B218",),
0x80B4B3DC:("func_80B4B3DC",),
0x80B4B430:("func_80B4B430",),
0x80B4B484:("func_80B4B484",),
0x80B4B510:("func_80B4B510",),
0x80B4B564:("func_80B4B564",),
0x80B4B724:("func_80B4B724",),
0x80B4B768:("func_80B4B768",),
0x80B4B820:("func_80B4B820",),
0x80B4B864:("func_80B4B864",),
0x80B4B8BC:("func_80B4B8BC",),
0x80B4BA30:("func_80B4BA30",),
0x80B4BA84:("func_80B4BA84",),
0x80B4BBE0:("func_80B4BBE0",),
0x80B4BC4C:("func_80B4BC4C",),
0x80B4BFFC:("func_80B4BFFC",),
0x80B4C058:("func_80B4C058",),
0x80B4C1BC:("func_80B4C1BC",),
0x80B4C218:("func_80B4C218",),
0x80B4C3A0:("func_80B4C3A0",),
0x80B4C568:("func_80B4C568",),
0x80B4C5C0:("func_80B4C5C0",),
0x80B4C6C8:("func_80B4C6C8",),
0x80B4C730:("func_80B4C730",),
0x80B4CAB0:("func_80B4CAB0",),
0x80B4CB0C:("func_80B4CB0C",),
0x80B4CC70:("func_80B4CC70",),
0x80B4CCCC:("func_80B4CCCC",),
0x80B4CE54:("func_80B4CE54",),
0x80B4CFFC:("func_80B4CFFC",),
0x80B4D054:("func_80B4D054",),
0x80B4D15C:("func_80B4D15C",),
0x80B4D290:("func_80B4D290",),
0x80B4D3E4:("func_80B4D3E4",),
0x80B4D480:("func_80B4D480",),
0x80B4D670:("func_80B4D670",),
0x80B4D760:("func_80B4D760",),
0x80B4D7B8:("func_80B4D7B8",),
0x80B4D9B4:("func_80B4D9B4",),
0x80B4D9D8:("func_80B4D9D8",),
0x80B4D9F4:("func_80B4D9F4",),
0x80B4DB14:("func_80B4DB14",),
0x80B4E120:("func_80B4E120",),
0x80B4E158:("func_80B4E158",),
0x80B4E1B0:("func_80B4E1B0",),
0x80B4E200:("func_80B4E200",),
0x80B4E2AC:("func_80B4E2AC",),
0x80B4E324:("func_80B4E324",),
0x80B4E3F0:("func_80B4E3F0",),
0x80B4E5B0:("func_80B4E5B0",),
0x80B4E61C:("func_80B4E61C",),
0x80B4E660:("func_80B4E660",),
0x80B4E6E4:("func_80B4E6E4",),
0x80B4E784:("func_80B4E784",),
0x80B4E7BC:("func_80B4E7BC",),
0x80B46DA8:("EnInvadepoh_InvasionHandler_SetupWaitForInvasion",),
0x80B46DC8:("EnInvadepoh_InvasionHandler_WaitForInvasion",),
0x80B46E20:("EnInvadepoh_InvasionHandler_SetupStartIntroCutscene",),
0x80B46E44:("EnInvadepoh_InvasionHandler_StartIntroCutscene",),
0x80B46EC0:("EnInvadepoh_InvasionHandler_SetupIntroCutscene",),
0x80B46EE8:("EnInvadepoh_InvasionHandler_IntroCutscene",),
0x80B46F88:("EnInvadepoh_InvasionHandler_SetupHandle",),
0x80B46FA8:("EnInvadepoh_InvasionHandler_Handle",),
0x80B47064:("EnInvadepoh_InvasionHandler_SetupStartSuccessCutscene",),
0x80B47084:("EnInvadepoh_InvasionHandler_StartSuccessCutscene",),
0x80B470E0:("EnInvadepoh_InvasionHandler_SetupSuccessCutscene",),
0x80B47108:("EnInvadepoh_InvasionHandler_SuccessCutscene",),
0x80B471C0:("EnInvadepoh_InvasionHandler_SetupWaitForRomaniReward",),
0x80B471E0:("EnInvadepoh_InvasionHandler_WaitForRomaniReward",),
0x80B47248:("EnInvadepoh_InvasionHandler_SetupSuccessEnd",),
0x80B47268:("EnInvadepoh_InvasionHandler_SuccessEnd",),
0x80B47278:("EnInvadepoh_InvasionHandler_SetupStartFailureCutscene",),
0x80B47298:("EnInvadepoh_InvasionHandler_StartFailureCutscene",),
0x80B47304:("EnInvadepoh_InvasionHandler_SetupFailureEnd",),
0x80B47324:("EnInvadepoh_InvasionHandler_FailureEnd",),
0x80B47334:("EnInvadepoh_InvasionHandler_Update",),
0x80B47380:("EnInvadepoh_Alien_SetupWaitForInvasion",),
0x80B473E4:("EnInvadepoh_Alien_WaitForInvasion",),
0x80B47478:("EnInvadepoh_Alien_SetupWaitToRespawn",),
0x80B474DC:("EnInvadepoh_Alien_WaitToRespawn",),
0x80B47568:("EnInvadepoh_Alien_SetupWarpIn",),
0x80B47600:("EnInvadepoh_Alien_WarpIn",),
0x80B4770C:("EnInvadepoh_Alien_SetupFloatForward",),
0x80B477B4:("EnInvadepoh_Alien_FloatForward",),
0x80B47830:("EnInvadepoh_Alien_SetupDamaged",),
0x80B478F4:("EnInvadepoh_Alien_Damaged",),
0x80B47938:("EnInvadepoh_Alien_SetupDead",),
0x80B479E8:("EnInvadepoh_Alien_Dead",),
0x80B47BAC:("EnInvadepoh_Alien_WaitForObject",),
0x80B47D30:("EnInvadepoh_Alien_Update",),
0x80B47FA8:("EnInvadepoh_Cow_WaitForObject",),
0x80B48060:("EnInvadepoh_Cow_Update",),
0x80B481C4:("EnInvadepoh_CowTail_WaitForObject",),
0x80B4827C:("EnInvadepoh_CowTail_Update",),
0x80B482D4:("EnInvadepoh_AbductedRomani_SetupWait",),
0x80B48324:("EnInvadepoh_AbductedRomani_Wait",),
0x80B48374:("EnInvadepoh_AbductedRomani_SetupYell",),
0x80B483CC:("EnInvadepoh_AbductedRomani_Yell",),
0x80B4843C:("EnInvadepoh_AbductedRomani_SetupStruggle",),
0x80B484EC:("EnInvadepoh_AbductedRomani_Struggle",),
0x80B48588:("EnInvadepoh_AbductedRomani_SetupEnd",),
0x80B48610:("EnInvadepoh_AbductedRomani_End",),
0x80B48620:("EnInvadepoh_AbductedRomani_WaitForObject",),
0x80B4873C:("EnInvadepoh_AbductedRomani_Update",),
0x80B487B4:("EnInvadepoh_SilentRomani_SetupWalk",),
0x80B48848:("EnInvadepoh_SilentRomani_Walk",),
0x80B48948:("EnInvadepoh_SilentRomani_SetupIdle",),
0x80B48AD4:("EnInvadepoh_SilentRomani_Idle",),
0x80B48DE4:("EnInvadepoh_SilentRomani_SetupTalk",),
0x80B48E4C:("EnInvadepoh_SilentRomani_Talk",),
0x80B48FB0:("EnInvadepoh_SilentRomani_WaitForObject",),
0x80B490F0:("EnInvadepoh_SilentRomani_Update",),
0x80B491EC:("EnInvadepoh_Ufo_SetupIntroDescend",),
0x80B49228:("EnInvadepoh_Ufo_IntroDescend",),
0x80B492FC:("EnInvadepoh_Ufo_SetupIntroWait",),
0x80B4934C:("EnInvadepoh_Ufo_IntroWait",),
0x80B49404:("EnInvadepoh_Ufo_SetupIntroFlyAround",),
0x80B49454:("EnInvadepoh_Ufo_IntroFlyAround",),
0x80B49628:("EnInvadepoh_Ufo_SetupHoverAboveBarn",),
0x80B49670:("EnInvadepoh_Ufo_HoverAboveBarn",),
0x80B497A4:("EnInvadepoh_Ufo_SetupOutroCircle",),
0x80B497EC:("EnInvadepoh_Ufo_OutroCircle",),
0x80B49904:("EnInvadepoh_Ufo_SetupOutroFlee",),
0x80B4994C:("EnInvadepoh_Ufo_OutroFlee",),
0x80B499BC:("EnInvadepoh_Ufo_SetupOutroDescend",),
0x80B49A00:("EnInvadepoh_Ufo_OutroDescend",),
0x80B49B1C:("EnInvadepoh_Ufo_Update",),
0x80B49BD0:("EnInvadepoh_Night1Romani_SetupWalk",),
0x80B49C38:("EnInvadepoh_Night1Romani_Walk",),
0x80B49DA0:("EnInvadepoh_Night1Romani_SetupTalk",),
0x80B49DFC:("EnInvadepoh_Night1Romani_Talk",),
0x80B49F88:("EnInvadepoh_Night1Romani_WaitForObject",),
0x80B4A168:("EnInvadepoh_Night1Romani_WaitForTime",),
0x80B4A1B8:("EnInvadepoh_Night1Romani_Update",),
0x80B4A2C0:("EnInvadepoh_BarnRomani_SetupIdle",),
0x80B4A350:("EnInvadepoh_BarnRomani_Idle",),
0x80B4A570:("EnInvadepoh_BarnRomani_SetupLookAround",),
0x80B4A5E4:("EnInvadepoh_BarnRomani_LookAround",),
0x80B4A614:("EnInvadepoh_BarnRomani_SetupWalk",),
0x80B4A67C:("EnInvadepoh_BarnRomani_Walk",),
0x80B4A7C0:("EnInvadepoh_BarnRomani_SetupTalk",),
0x80B4A81C:("EnInvadepoh_BarnRomani_Talk",),
0x80B4A9C8:("EnInvadepoh_BarnRomani_WaitForObject",),
0x80B4AB8C:("EnInvadepoh_BarnRomani_WaitForTime",),
0x80B4ABDC:("EnInvadepoh_BarnRomani_Update",),
0x80B4ACDC:("EnInvadepoh_RewardRomani_SetupWaitForSuccess",),
0x80B4ACF0:("EnInvadepoh_RewardRomani_WaitForSuccess",),
0x80B4AD3C:("EnInvadepoh_RewardRomani_SetupStartTalking",),
0x80B4AD60:("EnInvadepoh_RewardRomani_StartTalking",),
0x80B4ADB8:("EnInvadepoh_RewardRomani_SetupTalk",),
0x80B4ADCC:("EnInvadepoh_RewardRomani_Talk",),
0x80B4AEC0:("EnInvadepoh_RewardRomani_SetupGiveBottle",),
0x80B4AEDC:("EnInvadepoh_RewardRomani_GiveBottle",),
0x80B4AF80:("EnInvadepoh_RewardRomani_SetupAfterGivingBottle",),
0x80B4AF94:("EnInvadepoh_RewardRomani_AfterGivingBottle",),
0x80B4B024:("EnInvadepoh_RewardRomani_SetupFinish",),
0x80B4B048:("EnInvadepoh_RewardRomani_Finish",),
0x80B4B0C4:("EnInvadepoh_RewardRomani_WaitForObject",),
0x80B4B218:("EnInvadepoh_RewardRomani_Update",),
0x80B4B3DC:("EnInvadepoh_Dog_PlayWalkSfx",),
0x80B4B430:("EnInvadepoh_Dog_SetupWalk",),
0x80B4B484:("EnInvadepoh_Dog_Walk",),
0x80B4B510:("EnInvadepoh_Dog_SetupRun",),
0x80B4B564:("EnInvadepoh_Dog_Run",),
0x80B4B724:("EnInvadepoh_Dog_SetupBark",),
0x80B4B768:("EnInvadepoh_Dog_Bark",),
0x80B4B820:("EnInvadepoh_Dog_SetupJump",),
0x80B4B864:("EnInvadepoh_Dog_Jump",),
0x80B4B8BC:("EnInvadepoh_Dog_WaitForObject",),
0x80B4BA30:("EnInvadepoh_Dog_WaitForInvasion",),
0x80B4BA84:("EnInvadepoh_Dog_Update",),
0x80B4BBE0:("EnInvadepoh_Night3Cremia_SetupWalk",),
0x80B4BC4C:("EnInvadepoh_Night3Cremia_Walk",),
0x80B4BFFC:("EnInvadepoh_Night3Cremia_SetupTalk",),
0x80B4C058:("EnInvadepoh_Night3Cremia_Talk",),
0x80B4C1BC:("EnInvadepoh_Night3Cremia_SetupIdle",),
0x80B4C218:("EnInvadepoh_Night3Cremia_Idle",),
0x80B4C3A0:("EnInvadepoh_Night3Cremia_WaitForObject",),
0x80B4C568:("EnInvadepoh_Night3Cremia_WaitForTime",),
0x80B4C5C0:("EnInvadepoh_Night3Cremia_Update",),
0x80B4C6C8:("EnInvadepoh_Night3Romani_SetupWalk",),
0x80B4C730:("EnInvadepoh_Night3Romani_Walk",),
0x80B4CAB0:("EnInvadepoh_Night3Romani_SetupTalk",),
0x80B4CB0C:("EnInvadepoh_Night3Romani_Talk",),
0x80B4CC70:("EnInvadepoh_Night3Romani_SetupIdle",),
0x80B4CCCC:("EnInvadepoh_Night3Romani_Idle",),
0x80B4CE54:("EnInvadepoh_Night3Romani_WaitForObject",),
0x80B4CFFC:("EnInvadepoh_Night3Romani_WaitForTime",),
0x80B4D054:("EnInvadepoh_Night3Romani_Update",),
0x80B4D15C:("EnInvadepoh_AlienAbductor_SetupAbductCow",),
0x80B4D290:("EnInvadepoh_AlienAbductor_AbductCow",),
0x80B4D3E4:("EnInvadepoh_AlienAbductor_SetupAbductRomani",),
0x80B4D480:("EnInvadepoh_AlienAbductor_AbductRomani",),
0x80B4D670:("EnInvadepoh_AlienAbductor_WaitForObject",),
0x80B4D760:("EnInvadepoh_AlienAbductor_Update",),
0x80B4D7B8:("EnInvadepoh_DrawWarpEffects",),
0x80B4D9B4:("EnInvadepoh_InvasionHandler_Draw",),
0x80B4D9D8:("EnInvadepoh_Alien_OverrideLimbDraw",),
0x80B4D9F4:("EnInvadepoh_Alien_PostLimbDraw",),
0x80B4DB14:("EnInvadepoh_Alien_Draw",),
0x80B4E120:("EnInvadepoh_Cow_OverrideLimbDraw",),
0x80B4E158:("EnInvadepoh_Cow_Draw",),
0x80B4E1B0:("EnInvadepoh_CowTail_Draw",),
0x80B4E200:("EnInvadepoh_Romani_OverrideLimbDraw",),
0x80B4E2AC:("EnInvadepoh_Romani_PostLimbDraw",),
0x80B4E324:("EnInvadepoh_Romani_Draw",),
0x80B4E3F0:("EnInvadepoh_Ufo_Draw",),
0x80B4E5B0:("EnInvadepoh_Dog_OverrideLimbDraw",),
0x80B4E61C:("EnInvadepoh_Dog_PostLimbDraw",),
0x80B4E660:("EnInvadepoh_Dog_Draw",),
0x80B4E6E4:("EnInvadepoh_Cremia_OverrideLimbDraw",),
0x80B4E784:("EnInvadepoh_Cremia_PostLimbDraw",),
0x80B4E7BC:("EnInvadepoh_Cremia_Draw",),
0x80B50410:("func_80B50410",),
0x80B50710:("func_80B50710",),
0x80B507A0:("func_80B507A0",),
@ -16596,7 +16596,7 @@
0x80C07BA0:("ObjKepnKoya_Destroy",),
0x80C07BD4:("ObjKepnKoya_Update",),
0x80C07BE4:("ObjKepnKoya_Draw",),
0x80C07C80:("func_80C07C80",),
0x80C07C80:("ObjUsiyane_GetAlienSpawnTime",),
0x80C07CD0:("func_80C07CD0",),
0x80C07DC4:("func_80C07DC4",),
0x80C07DFC:("func_80C07DFC",),
@ -16899,8 +16899,8 @@
0x80C19E04:("EnInvadepohDemo_Romani_WaitForObject",),
0x80C19EC0:("EnInvadepohDemo_Cow_WaitForObject",),
0x80C19F7C:("EnInvadepohDemo_CowTail_WaitForObject",),
0x80C1A038:("EnInvadepohDemo_Ufo_UpdateMatrixTranslation",),
0x80C1A070:("EnInvadepohDemo_Ufo_ShouldDrawLensFlare",),
0x80C1A038:("EnInvadepohDemo_Ufo_SetMatrixTranslation",),
0x80C1A070:("EnInvadepohDemo_Ufo_LensFlareCheck",),
0x80C1A168:("EnInvadepohDemo_Alien_PostLimbDraw",),
0x80C1A244:("EnInvadepohDemo_Alien_Draw",),
0x80C1A590:("EnInvadepohDemo_Romani_Draw",),

230
tools/disasm/variables.txt
View File

@ -10051,7 +10051,7 @@
0x809E0422:("sIsInGiantMode","UNK_TYPE1","",0x1),
0x809E0424:("sRedTwinmold","UNK_TYPE4","",0x4),
0x809E0428:("sBlueTwinmold","UNK_TYPE4","",0x4),
0x809E042C:("sTwinmoldStatic","UNK_TYPE4","",0x4),
0x809E042C:("sTwinmoldBattleHandler","UNK_TYPE4","",0x4),
0x809E0430:("sTwinmoldMusicStartTimer","UNK_TYPE1","",0x1),
0x809E0434:("sBlueWarp","UNK_TYPE4","",0x4),
0x809E0438:("sTwinmoldEffects","UNK_TYPE1","",0x1),
@ -14106,103 +14106,102 @@
0x80B43400:("jtbl_80B43400","UNK_PTR","",0x4),
0x80B43414:("jtbl_80B43414","UNK_PTR","",0x4),
0x80B43460:("D_80B43460","f32","",0x4),
0x80B4E890:("En_Invadepoh_InitVars","UNK_TYPE1","",0x1),
0x80B4E8B0:("D_80B4E8B0","UNK_TYPE1","",0x1),
0x80B4E8DC:("D_80B4E8DC","UNK_TYPE1","",0x1),
0x80B4E908:("D_80B4E908","UNK_TYPE1","",0x1),
0x80B4E934:("D_80B4E934","UNK_TYPE4","",0x4),
0x80B4E938:("D_80B4E938","f32","",0x4),
0x80B4E940:("D_80B4E940","UNK_TYPE4","",0x4),
0x80B4E944:("D_80B4E944","UNK_TYPE4","",0x4),
0x80B4E958:("D_80B4E958","UNK_TYPE4","",0x4),
0x80B4E968:("D_80B4E968","UNK_TYPE1","",0x1),
0x80B4E96C:("D_80B4E96C","UNK_TYPE4","",0x4),
0x80B4E984:("D_80B4E984","UNK_TYPE4","",0x4),
0x80B4E994:("D_80B4E994","UNK_TYPE1","",0x1),
0x80B4E998:("D_80B4E998","UNK_TYPE1","",0x1),
0x80B4E99C:("D_80B4E99C","UNK_TYPE1","",0x1),
0x80B4E9A0:("D_80B4E9A0","UNK_TYPE1","",0x1),
0x80B4E9A4:("D_80B4E9A4","UNK_TYPE1","",0x1),
0x80B4E9AC:("D_80B4E9AC","UNK_TYPE1","",0x1),
0x80B4E9B4:("D_80B4E9B4","UNK_TYPE1","",0x1),
0x80B4E9BC:("D_80B4E9BC","UNK_TYPE1","",0x1),
0x80B4E9C0:("D_80B4E9C0","UNK_TYPE1","",0x1),
0x80B4E9C4:("D_80B4E9C4","UNK_TYPE1","",0x1),
0x80B4E9CC:("D_80B4E9CC","UNK_TYPE1","",0x1),
0x80B4E9D4:("D_80B4E9D4","UNK_TYPE1","",0x1),
0x80B4E9DC:("D_80B4E9DC","UNK_TYPE1","",0x1),
0x80B4E9E4:("D_80B4E9E4","UNK_TYPE1","",0x1),
0x80B4E9EC:("D_80B4E9EC","UNK_TYPE1","",0x1),
0x80B4E9F4:("D_80B4E9F4","UNK_TYPE1","",0x1),
0x80B4E9FC:("D_80B4E9FC","UNK_TYPE1","",0x1),
0x80B4EA04:("D_80B4EA04","UNK_TYPE1","",0x1),
0x80B4EA24:("D_80B4EA24","UNK_TYPE1","",0x1),
0x80B4EA2C:("D_80B4EA2C","UNK_TYPE1","",0x1),
0x80B4EA40:("D_80B4EA40","UNK_PTR","",0x4),
0x80B4EA50:("D_80B4EA50","UNK_PTR","",0x4),
0x80B4EA60:("D_80B4EA60","UNK_PTR","",0x4),
0x80B4EA70:("D_80B4EA70","UNK_PTR","",0x4),
0x80B4EA80:("D_80B4EA80","UNK_TYPE1","",0x1),
0x80B4EA88:("D_80B4EA88","UNK_TYPE1","",0x1),
0x80B4EA90:("D_80B4EA90","UNK_PTR","",0x4),
0x80B4EAB0:("D_80B4EAB0","UNK_TYPE1","",0x1),
0x80B4EAB4:("D_80B4EAB4","UNK_TYPE1","",0x1),
0x80B4EAB8:("D_80B4EAB8","UNK_TYPE1","",0x1),
0x80B4EABC:("D_80B4EABC","UNK_TYPE1","",0x1),
0x80B4EAC0:("D_80B4EAC0","UNK_TYPE1","",0x1),
0x80B4EAC8:("D_80B4EAC8","UNK_TYPE1","",0x1),
0x80B4EAD0:("D_80B4EAD0","UNK_TYPE1","",0x1),
0x80B4EAD8:("D_80B4EAD8","UNK_TYPE1","",0x1),
0x80B4EAE0:("D_80B4EAE0","UNK_TYPE1","",0x1),
0x80B4EAE8:("D_80B4EAE8","UNK_TYPE1","",0x1),
0x80B4EAF0:("D_80B4EAF0","UNK_TYPE1","",0x1),
0x80B4EAF8:("D_80B4EAF8","UNK_TYPE1","",0x1),
0x80B4EB00:("D_80B4EB00","UNK_PTR","",0x4),
0x80B4EB10:("D_80B4EB10","UNK_TYPE1","",0x1),
0x80B4EB14:("D_80B4EB14","UNK_TYPE1","",0x1),
0x80B4EB18:("D_80B4EB18","UNK_TYPE1","",0x1),
0x80B4EB20:("D_80B4EB20","UNK_TYPE1","",0x1),
0x80B4EB28:("D_80B4EB28","UNK_TYPE1","",0x1),
0x80B4EB30:("D_80B4EB30","UNK_TYPE1","",0x1),
0x80B4EB38:("D_80B4EB38","UNK_TYPE1","",0x1),
0x80B4EB40:("D_80B4EB40","UNK_TYPE1","",0x1),
0x80B4EB48:("D_80B4EB48","UNK_TYPE1","",0x1),
0x80B4EB50:("D_80B4EB50","UNK_TYPE1","",0x1),
0x80B4EB58:("D_80B4EB58","UNK_TYPE1","",0x1),
0x80B4EB60:("D_80B4EB60","UNK_TYPE1","",0x1),
0x80B4EB80:("D_80B4EB80","UNK_TYPE1","",0x1),
0x80B4EB88:("D_80B4EB88","UNK_TYPE1","",0x1),
0x80B4EB9C:("D_80B4EB9C","UNK_PTR","",0x4),
0x80B4EBAC:("D_80B4EBAC","UNK_PTR","",0x4),
0x80B4EBBC:("D_80B4EBBC","UNK_PTR","",0x4),
0x80B4EBCC:("D_80B4EBCC","UNK_PTR","",0x4),
0x80B4EBDC:("D_80B4EBDC","UNK_PTR","",0x4),
0x80B4EBF4:("D_80B4EBF4","UNK_TYPE1","",0x1),
0x80B4EBF8:("D_80B4EBF8","UNK_TYPE1","",0x1),
0x80B4EC00:("D_80B4EC00","UNK_TYPE1","",0x1),
0x80B4EC08:("D_80B4EC08","UNK_PTR","",0x4),
0x80B4EC0C:("D_80B4EC0C","UNK_TYPE1","",0x1),
0x80B4EC18:("D_80B4EC18","UNK_TYPE1","",0x1),
0x80B4EC1C:("D_80B4EC1C","UNK_TYPE1","",0x1),
0x80B4EC20:("D_80B4EC20","UNK_TYPE1","",0x1),
0x80B4EC24:("D_80B4EC24","UNK_TYPE1","",0x1),
0x80B4EC34:("D_80B4EC34","UNK_TYPE1","",0x1),
0x80B4EC44:("D_80B4EC44","UNK_TYPE1","",0x1),
0x80B4EC54:("D_80B4EC54","UNK_TYPE1","",0x1),
0x80B4EC68:("D_80B4EC68","UNK_TYPE1","",0x1),
0x80B4EC80:("D_80B4EC80","UNK_TYPE1","",0x1),
0x80B4EC98:("D_80B4EC98","UNK_TYPE1","",0x1),
0x80B4ECB0:("D_80B4ECB0","UNK_PTR","",0x4),
0x80B4ECE8:("D_80B4ECE8","UNK_PTR","",0x4),
0x80B4ED20:("D_80B4ED20","UNK_TYPE2","",0x2),
0x80B4ED30:("D_80B4ED30","UNK_TYPE4","",0x4),
0x80B4ED6C:("D_80B4ED6C","UNK_TYPE1","",0x1),
0x80B4EDC0:("D_80B4EDC0","UNK_TYPE1","",0x1),
0x80B4EDC8:("D_80B4EDC8","UNK_TYPE1","",0x1),
0x80B4EDD0:("D_80B4EDD0","UNK_TYPE1","",0x1),
0x80B4EE0C:("D_80B4EE0C","UNK_TYPE1","",0x1),
0x80B4EE24:("D_80B4EE24","UNK_TYPE1","",0x1),
0x80B4EE30:("D_80B4EE30","UNK_TYPE1","",0x1),
0x80B4E890:("En_Invadepoh_InitVars","ActorInit","",0x20),
0x80B4E8B0:("sAlienCylinderInit","ColliderCylinderInit","",0x2C),
0x80B4E8DC:("sRomaniAndCremiaCylinderInit","ColliderCylinderInit","",0x2C),
0x80B4E908:("sDogCylinderInit","ColliderCylinderInit","",0x2C),
0x80B4E934:("sUfoSpawnOffset","Vec3f","",0xC),
0x80B4E940:("sInvasionState","s32","",0x4),
0x80B4E944:("sRomaniEyeTextures","TexturePtr","[5]",0x14),
0x80B4E958:("sRomaniMouthTextures","TexturePtr","[4]",0x10),
0x80B4E968:("sRomaniTexturesDesegmented","s8","",0x1),
0x80B4E96C:("sCremiaEyeTextures","TexturePtr","[6]",0x18),
0x80B4E984:("sCremiaMouthTextures","TexturePtr","[4]",0x10),
0x80B4E994:("sCremiaTexturesDesegmented","s8","",0x1),
0x80B4E998:("sRewardFinished","s8","",0x1),
0x80B4E99C:("sRomaniEyeOpenIndices","s8","[1]",0x1),
0x80B4E9A0:("sRomaniFastBlinkIndices","s8","[4]",0x4),
0x80B4E9A4:("sRomaniMediumBlinkIndices","s8","[5]",0x5),
0x80B4E9AC:("sRomaniSlowBlinkIndices","s8","[6]",0x6),
0x80B4E9B4:("sRomaniDoubleBlinkIndices","s8","[8]",0x8),
0x80B4E9BC:("sRomaniEyeHalfIndices","s8","[1]",0x1),
0x80B4E9C0:("sRomaniEyeHappyIndices","s8","[1]",0x1),
0x80B4E9C4:("sRomaniEyeOpenFrames","EnInvadepohFaceFrames","",0x5),
0x80B4E9CC:("sRomaniFastBlinkFrames","EnInvadepohFaceFrames","",0x5),
0x80B4E9D4:("sRomaniMediumBlinkFrames","EnInvadepohFaceFrames","",0x5),
0x80B4E9DC:("sRomaniSlowBlinkFrames","EnInvadepohFaceFrames","",0x5),
0x80B4E9E4:("sRomaniDoubleBlinkFrames","EnInvadepohFaceFrames","",0x5),
0x80B4E9EC:("sRomaniEyeHalfFrames","EnInvadepohFaceFrames","",0x5),
0x80B4E9F4:("sRomaniEyeHappyFrames","EnInvadepohFaceFrames","",0x5),
0x80B4E9FC:("sRomaniEyeOpenAnim","EnInvadepohFaceAnimOnce","",0x8),
0x80B4EA04:("sRomaniRandomBlinkNext","EnInvadepohFaceAnimNext","[4]",0x20),
0x80B4EA24:("sRomaniEyeOpenNext","EnInvadepohFaceAnimNext","[1]",0x8),
0x80B4EA2C:("sRomaniEyeOpenThenRandomBlinkAnim","EnInvadepohFaceAnimChainedDelay","",0x14),
0x80B4EA40:("sRomaniFastBlinkAnim","EnInvadepohFaceAnimChained","",0x10),
0x80B4EA50:("sRomaniMediumBlinkAnim","EnInvadepohFaceAnimChained","",0x10),
0x80B4EA60:("sRomaniSlowBlinkAnim","EnInvadepohFaceAnimChained","",0x10),
0x80B4EA70:("sRomaniDoubleBlinkAnim","EnInvadepohFaceAnimChained","",0x10),
0x80B4EA80:("sRomaniEyeHalfAnim","EnInvadepohFaceAnimOnce","",0x8),
0x80B4EA88:("sRomaniEyeHappyAnim","EnInvadepohFaceAnimOnce","",0x8),
0x80B4EA90:("sRomaniEyeAnimations","EnInvadepohFaceAnimBase*","[8]",0x20),
0x80B4EAB0:("sRomaniMouthHappyIndices","s8","[1]",0x1),
0x80B4EAB4:("sRomaniMouthFrownIndices","s8","[1]",0x1),
0x80B4EAB8:("sRomaniMouthHangingOpenIndices","s8","[1]",0x1),
0x80B4EABC:("sRomaniMouthSmileIndices","s8","[1]",0x1),
0x80B4EAC0:("sRomaniMouthHappyFrames","EnInvadepohFaceFrames","",0x5),
0x80B4EAC8:("sRomaniMouthFrownFrames","EnInvadepohFaceFrames","",0x5),
0x80B4EAD0:("sRomaniMouthHangingOpenFrames","EnInvadepohFaceFrames","",0x5),
0x80B4EAD8:("sRomaniMouthSmileFrames","EnInvadepohFaceFrames","",0x5),
0x80B4EAE0:("sRomaniMouthHappyAnim","EnInvadepohFaceAnimOnce","",0x8),
0x80B4EAE8:("sRomaniMouthFrownAnim","EnInvadepohFaceAnimOnce","",0x8),
0x80B4EAF0:("sRomaniMouthHangingOpenAnim","EnInvadepohFaceAnimOnce","",0x8),
0x80B4EAF8:("sRomaniMouthSmileAnim","EnInvadepohFaceAnimOnce","",0x8),
0x80B4EB00:("sRomaniMouthAnimations","EnInvadepohFaceAnimBase*","[4]",0x10),
0x80B4EB10:("sCremiaEyeOpenIndices","s8","[1]",0x1),
0x80B4EB14:("sCremiaFastBlinkIndices","s8","[4]",0x4),
0x80B4EB18:("sCremiaMediumBlinkIndices","s8","[5]",0x5),
0x80B4EB20:("sCremiaSlowBlinkIndices","s8","[6]",0x6),
0x80B4EB28:("sCremiaDoubleBlinkIndices","s8","[8]",0x8),
0x80B4EB30:("sCremiaEyeOpenFrames","EnInvadepohFaceFrames","",0x5),
0x80B4EB38:("sCremiaFastBlinkFrames","EnInvadepohFaceFrames","",0x5),
0x80B4EB40:("sCremiaMediumBlinkFrames","EnInvadepohFaceFrames","",0x5),
0x80B4EB48:("sCremiaSlowBlinkFrames","EnInvadepohFaceFrames","",0x5),
0x80B4EB50:("sCremiaDoubleBlinkFrames","EnInvadepohFaceFrames","",0x5),
0x80B4EB58:("sCremiaEyeOpenAnim","EnInvadepohFaceAnimOnce","",0x8),
0x80B4EB60:("sCremiaRandomBlinkNext","EnInvadepohFaceAnimNext","[4]",0x20),
0x80B4EB80:("sCremiaEyeOpenNext","EnInvadepohFaceAnimNext","[1]",0x8),
0x80B4EB88:("sCremiaEyeOpenThenRandomBlinkAnim","EnInvadepohFaceAnimChainedDelay","",0x14),
0x80B4EB9C:("sCremiaFastBlinkAnim","EnInvadepohFaceAnimChained","",0x10),
0x80B4EBAC:("sCremiaMediumBlinkAnim","EnInvadepohFaceAnimChained","",0x10),
0x80B4EBBC:("sCremiaSlowBlinkAnim","EnInvadepohFaceAnimChained","",0x10),
0x80B4EBCC:("sCremiaDoubleBlinkAnim","EnInvadepohFaceAnimChained","",0x10),
0x80B4EBDC:("sCremiaEyeAnimations","EnInvadepohFaceAnimBase*","[6]",0x18),
0x80B4EBF4:("sCremiaMouthNormalIndices","s8","[1]",0x1),
0x80B4EBF8:("sCremiaMouthNormalFrames","EnInvadepohFaceFrames","",0x5),
0x80B4EC00:("sCremiaMouthNormalAnim","EnInvadepohFaceAnimOnce","",0x8),
0x80B4EC08:("sCremiaMouthAnimations","EnInvadepohFaceAnimBase*","[1]",0x4),
0x80B4EC0C:("sFaceAnimUpdateFuncs","EnInvadepohFaceFunc","[3]",0xC),
0x80B4EC18:("sPrimColor","Color_RGBA8","",0x4),
0x80B4EC1C:("sEnvColor","Color_RGBA8","",0x4),
0x80B4EC20:("sEffectUpdateFuncs","EnInvadepohEffectUpdateFunc","[1]",0x4),
0x80B4EC24:("sAlienInitChain","InitChainEntry","[4]",0x10),
0x80B4EC34:("sCowInitChain","InitChainEntry","[4]",0x10),
0x80B4EC44:("sCowTailInitChain","InitChainEntry","[4]",0x10),
0x80B4EC54:("sRomaniInitChain","InitChainEntry","[5]",0x14),
0x80B4EC68:("sUfoInitChain","InitChainEntry","[6]",0x18),
0x80B4EC80:("sDogInitChain","InitChainEntry","[6]",0x18),
0x80B4EC98:("sCremiaInitChain","InitChainEntry","[6]",0x18),
0x80B4ECB0:("sInitFuncs","EnInvadepohInitFunc","[14]",0x38),
0x80B4ECE8:("sDestroyFuncs","EnInvadepohDestroyFunc","[14]",0x38),
0x80B4ED20:("sAlienSpawnTimes","s16","[8]",0x10),
0x80B4ED30:("sDeathScales","Vec3f","[5]",0x3C),
0x80B4ED6C:("sDeathFlashScales","Vec3f","[7]",0x54),
0x80B4EDC0:("sCowAngularVelocity","s16","[3]",0x6),
0x80B4EDC8:("sHeadRotTargetX","s16","[4]",0x8),
0x80B4EDD0:("sUfoTargetOffsets","Vec3f","[5]",0x3C),
0x80B4EE0C:("sCowAbductionInfo","EnInvadepohCowAbductionInfo","[3]",0x18),
0x80B4EE24:("sFocusOffset","Vec3f","",0xC),
0x80B4EE30:("sFocusOffset","Vec3f","",0xC),
0x80B4EE40:("D_80B4EE40","f32","",0x4),
0x80B4EE44:("D_80B4EE44","f32","",0x4),
0x80B4EE48:("D_80B4EE48","f32","",0x4),
@ -14346,24 +14345,19 @@
0x80B4F070:("D_80B4F070","f32","",0x4),
0x80B4F074:("D_80B4F074","f32","",0x4),
0x80B4F078:("D_80B4F078","f32","",0x4),
0x80B502A0:("D_80B502A0","UNK_TYPE1","",0x1),
0x80B502E0:("D_80B502E0","UNK_TYPE1","",0x1),
0x80B50320:("D_80B50320","UNK_TYPE4","",0x4),
0x80B50324:("D_80B50324","UNK_TYPE4","",0x4),
0x80B50328:("D_80B50328","UNK_TYPE4","",0x4),
0x80B5032C:("D_80B5032C","UNK_TYPE4","",0x4),
0x80B50340:("D_80B50340","UNK_TYPE1","",0x1),
0x80B50348:("D_80B50348","UNK_TYPE1","",0x1),
0x80B50350:("D_80B50350","UNK_TYPE1","",0x1),
0x80B503F0:("D_80B503F0","UNK_TYPE4","",0x4),
0x80B503F4:("D_80B503F4","UNK_TYPE4","",0x4),
0x80B503F8:("D_80B503F8","UNK_TYPE4","",0x4),
0x80B503FC:("D_80B503FC","UNK_TYPE4","",0x4),
0x80B50400:("D_80B50400","UNK_TYPE4","",0x4),
0x80B50404:("D_80B50404","UNK_TYPE2","",0x2),
0x80B50406:("D_80B50406","UNK_TYPE2","",0x2),
0x80B5040A:("D_80B5040A","UNK_TYPE1","",0x1),
0x80B5040C:("D_80B5040C","UNK_TYPE4","",0x4),
0x80B502A0:("sInvadepohAlienLeftEyeBeamMtxF","MtxF","",0x40),
0x80B502E0:("sInvadepohAlienRightEyeBeamMtxF","MtxF","",0x40),
0x80B50320:("sAliens","EnInvadepoh*","[8]",0x20),
0x80B50340:("sAlienStateFlags","u8","[8]",0x8),
0x80B50348:("sAliensExtremeThreat","s8","",0x1),
0x80B50350:("sEffects","EnInvadepohEffect","[10]",0xA0),
0x80B503F0:("sUfo","EnInvadepoh*","",0x4),
0x80B503F4:("sNight3Romani","EnInvadepoh*","",0x4),
0x80B503F8:("sNight3Cremia","EnInvadepoh*","",0x4),
0x80B503FC:("sAlienEyeBeamTexAnim","AnimatedMaterial*","",0x4),
0x80B50400:("sAlienEmptyTexAnim","AnimatedMaterial*","",0x4),
0x80B50404:("sInvadepohCsIdList","s16","[3]",0x6),
0x80B5040C:("sClosestAlienThreat","EnInvadepoh*","",0x4),
0x80B531F0:("En_Gk_InitVars","UNK_TYPE1","",0x1),
0x80B53210:("D_80B53210","UNK_TYPE1","",0x1),
0x80B5323C:("D_80B5323C","UNK_TYPE1","",0x1),
@ -16329,8 +16323,8 @@
0x80C1AB64:("D_80C1AB64","f32","",0x4),
0x80C1AB68:("D_80C1AB68","f32","",0x4),
0x80C1AB6C:("D_80C1AB6C","f32","",0x4),
0x80C1AD40:("sAlienLeftEyeBeamMtxF","MtxF","",0x40),
0x80C1AD80:("sAlienRightEyeBeamMtxF","MtxF","",0x40),
0x80C1AD40:("sInvadepohDemoAlienLeftEyeBeamMtxF","MtxF","",0x40),
0x80C1AD80:("sInvadepohDemoAlienRightEyeBeamMtxF","MtxF","",0x40),
0x80C1B520:("Obj_Danpeilift_InitVars","UNK_TYPE1","",0x1),
0x80C1B540:("D_80C1B540","UNK_TYPE1","",0x1),
0x80C1B550:("D_80C1B550","f32","",0x4),

1
tools/namefixer.py
View File

@ -1089,6 +1089,7 @@ wordReplace = {
"gSaveContext.save.pictoFlags1": "gSaveContext.save.saveInfo.pictoFlags1",
"gSaveContext.save.unk_E84": "gSaveContext.save.saveInfo.unk_E60",
"gSaveContext.save.unk_E88": "gSaveContext.save.saveInfo.unk_E64",
"gSaveContext.save.unk_E64": "gSaveContext.save.saveInfo.alienInfo",
"gSaveContext.save.scenesVisible": "gSaveContext.save.saveInfo.scenesVisible",
"gSaveContext.save.skullTokenCount": "gSaveContext.save.saveInfo.skullTokenCount",
"gSaveContext.save.unk_EC4": "gSaveContext.save.saveInfo.unk_EA0",

16
tools/weekeventregconvert.py
View File

@ -177,11 +177,11 @@ weekEventReg = {
(21 << 8) | 0x04: "WEEKEVENTREG_TALKED_GORON_GRAVEMAKER_AS_GORON",
(21 << 8) | 0x08: "WEEKEVENTREG_TALKED_THAWED_GRAVEYARD_GORON",
(21 << 8) | 0x10: "WEEKEVENTREG_21_10",
(21 << 8) | 0x20: "WEEKEVENTREG_PROMISED_TO_HELP_WITH_THEM",
(21 << 8) | 0x20: "WEEKEVENTREG_PROMISED_TO_HELP_WITH_ALIENS",
(21 << 8) | 0x40: "WEEKEVENTREG_21_40",
(21 << 8) | 0x80: "WEEKEVENTREG_21_80",
(22 << 8) | 0x01: "WEEKEVENTREG_DEFENDED_AGAINST_THEM",
(22 << 8) | 0x02: "WEEKEVENTREG_22_02",
(22 << 8) | 0x01: "WEEKEVENTREG_DEFENDED_AGAINST_ALIENS",
(22 << 8) | 0x02: "WEEKEVENTREG_RECEIVED_ALIENS_BOTTLE",
(22 << 8) | 0x04: "WEEKEVENTREG_CALMED_GORON_ELDERS_SON",
(22 << 8) | 0x08: "WEEKEVENTREG_22_08",
(22 << 8) | 0x10: "WEEKEVENTREG_22_10",
@ -440,7 +440,7 @@ weekEventReg = {
(54 << 8) | 0x02: "WEEKEVENTREG_54_02",
(54 << 8) | 0x04: "WEEKEVENTREG_54_04",
(54 << 8) | 0x08: "WEEKEVENTREG_54_08",
(54 << 8) | 0x10: "WEEKEVENTREG_54_10",
(54 << 8) | 0x10: "WEEKEVENTREG_TALKED_ROMANI_ON_NIGHT_1",
(54 << 8) | 0x20: "WEEKEVENTREG_54_20",
(54 << 8) | 0x40: "WEEKEVENTREG_RECEIVED_SPIRIT_HOUSE_HEART_PIECE",
(54 << 8) | 0x80: "WEEKEVENTREG_54_80",
@ -560,9 +560,9 @@ weekEventReg = {
(69 << 8) | 0x02: "WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_PENDANT_OF_MEMORIES",
(69 << 8) | 0x04: "WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_DELIVERED_PENDANT_OF_MEMORIES",
(69 << 8) | 0x08: "WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_ESCAPED_SAKONS_HIDEOUT",
(69 << 8) | 0x10: "WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_PROMISED_TO_HELP_WITH_THEM",
(69 << 8) | 0x20: "WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_DEFENDED_AGAINST_THEM",
(69 << 8) | 0x40: "WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_MILK_BOTTLE",
(69 << 8) | 0x10: "WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_PROMISED_TO_HELP_WITH_ALIENS",
(69 << 8) | 0x20: "WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_DEFENDED_AGAINST_ALIENS",
(69 << 8) | 0x40: "WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_ALIENS_BOTTLE",
(69 << 8) | 0x80: "WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_ESCORTED_CREMIA",
(70 << 8) | 0x01: "WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_ROMANIS_MASK",
(70 << 8) | 0x02: "WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_KEATON_MASK",
@ -720,7 +720,7 @@ weekEventReg = {
(89 << 8) | 0x02: "WEEKEVENTREG_GATEKEEPER_OPENED_GORON_SHRINE_FOR_ZORA",
(89 << 8) | 0x04: "WEEKEVENTREG_GATEKEEPER_OPENED_GORON_SHRINE_FOR_GORON",
(89 << 8) | 0x08: "WEEKEVENTREG_89_08",
(89 << 8) | 0x10: "WEEKEVENTREG_89_10",
(89 << 8) | 0x10: "WEEKEVENTREG_FAILED_TO_DEFEND_AGAINST_ALIENS",
(89 << 8) | 0x20: "WEEKEVENTREG_89_20",
(89 << 8) | 0x40: "WEEKEVENTREG_89_40",
(89 << 8) | 0x80: "WEEKEVENTREG_89_80",

49
undefined_syms.txt
View File

@ -319,55 +319,6 @@ D_060009A0 = 0x060009A0;
D_06001EFC = 0x06001EFC;
D_0600A808 = 0x0600A808;
// ovl_En_Invadepoh
D_06000080 = 0x06000080;
D_060003B0 = 0x060003B0;
D_06000550 = 0x06000550;
D_06000560 = 0x06000560;
D_06000608 = 0x06000608;
D_060006C8 = 0x060006C8;
D_06000720 = 0x06000720;
D_06000998 = 0x06000998;
D_06001560 = 0x06001560;
D_06001674 = 0x06001674;
D_06001BD8 = 0x06001BD8;
D_06001D80 = 0x06001D80;
D_060021C8 = 0x060021C8;
D_06002A8C = 0x06002A8C;
D_06004010 = 0x06004010;
D_06004264 = 0x06004264;
D_06004C30 = 0x06004C30;
D_06004E50 = 0x06004E50;
D_06004E98 = 0x06004E98;
D_06007328 = 0x06007328;
D_060080F0 = 0x060080F0;
D_06009E58 = 0x06009E58;
D_0600A174 = 0x0600A174;
D_0600FFC8 = 0x0600FFC8;
D_060107C8 = 0x060107C8;
D_06010FC8 = 0x06010FC8;
D_060117C8 = 0x060117C8;
D_06011AD8 = 0x06011AD8;
D_06011FC8 = 0x06011FC8;
D_060122D8 = 0x060122D8;
D_060127C8 = 0x060127C8;
D_06012AD8 = 0x06012AD8;
D_06012BC8 = 0x06012BC8;
D_06012FC8 = 0x06012FC8;
D_060132D8 = 0x060132D8;
D_060133C8 = 0x060133C8;
D_06013928 = 0x06013928;
D_06013AD8 = 0x06013AD8;
D_06014088 = 0x06014088;
D_060142D8 = 0x060142D8;
D_06014AD8 = 0x06014AD8;
D_06014ED8 = 0x06014ED8;
D_060152D8 = 0x060152D8;
D_06015C28 = 0x06015C28;
D_060156D8 = 0x060156D8;
D_06016720 = 0x06016720;
// ovl_En_Kitan
D_06000CE8 = 0x06000CE8;