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

Merge pull request #332 from hatal175/spawnstate 

Use PlayerSpawnType enum in a few places
This commit is contained in:
notyourav 2022-01-31 00:21:12 -08:00 committed by GitHub
parent 8dfc9f47f2 326143afcc
commit 2b8d880ffc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/manager/manager1A.c
View File

@ -155,9 +155,9 @@ void sub_0805B210(Manager1A* this) {
gRoomTransition.player_status.room_next = tmp->unk_02;
gRoomTransition.player_status.layer = tmp->unk_03;
if (gPlayerState.flags & PL_MINISH) {
gRoomTransition.player_status.spawn_type = 6;
gRoomTransition.player_status.spawn_type = PL_SPAWN_DROP_MINISH;
} else {
gRoomTransition.player_status.spawn_type = 2;
gRoomTransition.player_status.spawn_type = PL_SPAWN_DROP;
}
switch (tmp->unk_00) {
case 0:
@ -171,7 +171,7 @@ void sub_0805B210(Manager1A* this) {
case 2:
gRoomTransition.player_status.start_pos_x = tmp->unk_04;
gRoomTransition.player_status.start_pos_y = tmp->unk_06;
gRoomTransition.player_status.spawn_type = 6;
gRoomTransition.player_status.spawn_type = PL_SPAWN_DROP_MINISH;
break;
}
}

2
src/manager/manager2C.c
View File

@ -25,7 +25,7 @@ void Manager2C_Main(Manager2C* manager) {
MemClear(&gRoomTransition.player_status, 0x20);
gRoomTransition.transitioningOut = 1;
gRoomTransition.type = TRANSITION_DEFAULT;
gRoomTransition.player_status.spawn_type = 0xb;
gRoomTransition.player_status.spawn_type = PL_SPAWN_PARACHUTE_UP;
gRoomTransition.player_status.area_next = manager->manager.unk_0b;
gRoomTransition.player_status.room_next = manager->manager.unk_0e;
gRoomTransition.player_status.start_anim = manager->field_0x37;

2
src/manager/managerC.c
View File

@ -206,7 +206,7 @@ const u16 gUnk_081082E8[0xC] = { 0xB8, 0x80, 0x0, 0xB8, 0x110, 0x2, 0x118, 0x80,
void sub_08058B5C(ManagerC* this, u32 unk1) {
gRoomTransition.transitioningOut = 1;
gRoomTransition.type = TRANSITION_DEFAULT;
gRoomTransition.player_status.spawn_type = 4;
gRoomTransition.player_status.spawn_type = PL_SPAWN_STEP_IN;
gRoomTransition.player_status.area_next = gRoomControls.area;
gRoomTransition.player_status.room_next = 6;
gRoomTransition.player_status.start_anim = unk1 & 1 ? 4 : 0;

2
src/object/warpPoint.c
View File

@ -152,7 +152,7 @@ void sub_0808B684(Entity* this) {
gRoomTransition.player_status.start_pos_y = ((this->cutsceneBeh.HWORD & 0xfc0) >> 2) + 8;
gRoomTransition.player_status.layer = 0;
gRoomTransition.player_status.start_anim = 4;
gRoomTransition.player_status.spawn_type = 0;
gRoomTransition.player_status.spawn_type = PL_SPAWN_DEFAULT;
if (this->type == 2) {
gRoomTransition.type = TRANSITION_FADE_WHITE_SLOW;
}

2
src/roomInit.c
View File

@ -5313,7 +5313,7 @@ void sub_StateChange_HouseInteriors3_Bakery(void) {
u32 sub_unk3_HouseInteriors3_Simon(void) {
if (CheckGlobalFlag(MAROYA_WAKEUP)) {
gRoomTransition.player_status.spawn_type = 5;
gRoomTransition.player_status.spawn_type = PL_SPAWN_SPECIAL;
}
return 1;
}

2
src/sub_0807CA18.c
View File

@ -49,7 +49,7 @@ u32 FinalizeSave(void) {
gSave.saved_status.area_next = 0x22;
gSave.saved_status.room_next = 0x15; // links room
gSave.saved_status.start_anim = 0;
gSave.saved_status.spawn_type = 0;
gSave.saved_status.spawn_type = PL_SPAWN_DEFAULT;
gSave.saved_status.layer = 1;
gSave.saved_status.start_pos_x = 0x90;
gSave.saved_status.start_pos_y = 0x38;