naming work

This commit is contained in:
theo3
2022-01-03 23:58:02 -08:00
parent f26b2e286a
commit 52db70bb9d
212 changed files with 1762 additions and 1736 deletions
+25 -25
View File
@@ -11,35 +11,35 @@ extern u32 gUnk_02025EB0;
extern u8 gUpdateVisibleTiles;
void sub_080808D8(void) {
gScreenTransition.transitionType = TRANSITION_DEFAULT;
gRoomTransition.type = TRANSITION_DEFAULT;
}
void sub_080808E4(void) {
if (sub_08052638(gScreenTransition.player_status.area_next)) {
gScreenTransition.transitionType = TRANSITION_DEFAULT;
if (sub_08052638(gRoomTransition.player_status.area_next)) {
gRoomTransition.type = TRANSITION_DEFAULT;
} else {
gScreenTransition.transitionType = TRANSITION_FADE_BLACK;
gRoomTransition.type = TRANSITION_FADE_BLACK;
}
}
void sub_08080904(void) {
gScreenTransition.transitionType = TRANSITION_CUT;
gRoomTransition.type = TRANSITION_CUT;
}
void sub_08080910(void) {
gScreenTransition.transitionType = TRANSITION_CUT;
gRoomTransition.type = TRANSITION_CUT;
}
void sub_0808091C(ScreenTransitionData* param_1, u32 param_2) {
DoExitTransition(param_1);
gScreenTransition.transitionType = param_2;
gRoomTransition.type = param_2;
}
void sub_08080930(void) {
gRoomControls.unk3 = 5;
gRoomControls.unk4 = 0;
gRoomControls.unk2 = 2;
gRoomControls.unk_10 = 0;
gRoomControls.reload_flags = 2;
gRoomControls.scroll_direction = 0;
SetInitializationPriority();
}
@@ -52,36 +52,36 @@ u32* GetLayerByIndex(u32 param_1) {
}
void InitScreenShake(u32 time, u32 magnitude) {
gRoomControls.screenShakeTime = time;
gRoomControls.screenShakeMagnitude = magnitude & 7;
gRoomControls.shake_duration = time;
gRoomControls.shake_magnitude = magnitude & 7;
}
void sub_08080974(u32 arg0, u32 arg1) {
u32 var0, var1;
RoomControls* roomControls = &gRoomControls;
var0 = roomControls->roomOriginX;
var0 = roomControls->origin_x;
if (arg0 <= var0 + 120) {
roomControls->roomScrollX = var0;
roomControls->scroll_x = var0;
} else {
var0 += roomControls->width;
var1 = var0 - 120;
if (arg0 < var1) {
var1 = arg0;
}
roomControls->roomScrollX = var1 - 120;
roomControls->scroll_x = var1 - 120;
}
var0 = roomControls->roomOriginY;
var0 = roomControls->origin_y;
if (arg1 <= var0 + 80) {
roomControls->roomScrollY = var0;
roomControls->scroll_y = var0;
} else {
var0 += roomControls->height;
var1 = var0 - 80;
if (arg1 < var1) {
var1 = arg1;
}
roomControls->roomScrollY = var1 - 80;
roomControls->scroll_y = var1 - 80;
}
sub_080809D4();
@@ -95,32 +95,32 @@ void sub_080809D4(void) {
RoomControls* roomControls = &gRoomControls;
roomControls->scroll_flags &= ~4;
target = roomControls->cameraTarget;
target = roomControls->camera_target;
x = target->x.HALF.HI;
var0 = roomControls->roomOriginX;
var0 = roomControls->origin_x;
if (x <= var0 + 120) {
roomControls->roomScrollX = var0;
roomControls->scroll_x = var0;
} else {
var0 += roomControls->width;
var1 = var0 - 120;
if (x < var1) {
var1 = (u16)target->x.HALF.HI;
}
roomControls->roomScrollX = var1 - 120;
roomControls->scroll_x = var1 - 120;
}
target = roomControls->cameraTarget;
target = roomControls->camera_target;
y = target->y.HALF.HI;
var0 = roomControls->roomOriginY;
var0 = roomControls->origin_y;
if (y <= var0 + 80) {
roomControls->roomScrollY = var0;
roomControls->scroll_y = var0;
} else {
var0 += roomControls->height;
var1 = var0 - 80;
if (y < var1) {
var1 = (u16)target->y.HALF.HI;
}
roomControls->roomScrollY = var1 - 80;
roomControls->scroll_y = var1 - 80;
}
sub_08080BC4();