From 6f4decf6b346d65da28f07dd541aef2844baacb5 Mon Sep 17 00:00:00 2001 From: Tyler McGavran Date: Mon, 4 Mar 2024 21:28:31 -0500 Subject: [PATCH] Update StarSpawn to StarCloudData (#578) * Update StarSpawn to StarCloudData Add and better specify the struct used to control how stars and clouds are handled in various courses. --- .../update_objects/func_800789AC.s | 41 -- include/objects.h | 23 +- src/code_8006E9C0.c | 64 +-- src/code_8006E9C0.h | 18 +- src/data/some_data.c | 334 +++++++------- src/data/some_data.h | 16 +- src/update_objects.c | 81 ++-- src/update_objects.h | 3 +- tools/doxygen_syms.md | 430 +++++++++--------- 9 files changed, 474 insertions(+), 536 deletions(-) delete mode 100644 asm/non_matchings/update_objects/func_800789AC.s diff --git a/asm/non_matchings/update_objects/func_800789AC.s b/asm/non_matchings/update_objects/func_800789AC.s deleted file mode 100644 index 9a4416b72..000000000 --- a/asm/non_matchings/update_objects/func_800789AC.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_800789AC -/* 0795AC 800789AC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 0795B0 800789B0 AFB40028 */ sw $s4, 0x28($sp) -/* 0795B4 800789B4 3C148019 */ lui $s4, %hi(D_8018D1F0) # $s4, 0x8019 -/* 0795B8 800789B8 2694D1F0 */ addiu $s4, %lo(D_8018D1F0) # addiu $s4, $s4, -0x2e10 -/* 0795BC 800789BC 8E8E0000 */ lw $t6, ($s4) -/* 0795C0 800789C0 AFB30024 */ sw $s3, 0x24($sp) -/* 0795C4 800789C4 AFB20020 */ sw $s2, 0x20($sp) -/* 0795C8 800789C8 AFB00018 */ sw $s0, 0x18($sp) -/* 0795CC 800789CC 00C09025 */ move $s2, $a2 -/* 0795D0 800789D0 00A09825 */ move $s3, $a1 -/* 0795D4 800789D4 AFBF002C */ sw $ra, 0x2c($sp) -/* 0795D8 800789D8 AFB1001C */ sw $s1, 0x1c($sp) -/* 0795DC 800789DC 19C00011 */ blez $t6, .L80078A24 -/* 0795E0 800789E0 00008025 */ move $s0, $zero -/* 0795E4 800789E4 3C188019 */ lui $t8, %hi(D_8018CC80) # $t8, 0x8019 -/* 0795E8 800789E8 2718CC80 */ addiu $t8, %lo(D_8018CC80) # addiu $t8, $t8, -0x3380 -/* 0795EC 800789EC 00047880 */ sll $t7, $a0, 2 -/* 0795F0 800789F0 01F88821 */ addu $s1, $t7, $t8 -/* 0795F4 800789F4 0010C8C0 */ sll $t9, $s0, 3 -.L800789F8: -/* 0795F8 800789F8 03324021 */ addu $t0, $t9, $s2 -/* 0795FC 800789FC 8E240000 */ lw $a0, ($s1) -/* 079600 80078A00 95050000 */ lhu $a1, ($t0) -/* 079604 80078A04 0C01E23E */ jal func_800788F8 -/* 079608 80078A08 02603025 */ move $a2, $s3 -/* 07960C 80078A0C 8E890000 */ lw $t1, ($s4) -/* 079610 80078A10 26100001 */ addiu $s0, $s0, 1 -/* 079614 80078A14 26310004 */ addiu $s1, $s1, 4 -/* 079618 80078A18 0209082A */ slt $at, $s0, $t1 -/* 07961C 80078A1C 5420FFF6 */ bnel $at, $zero, .L800789F8 -/* 079620 80078A20 0010C8C0 */ sll $t9, $s0, 3 -.L80078A24: -/* 079624 80078A24 8FBF002C */ lw $ra, 0x2c($sp) -/* 079628 80078A28 8FB00018 */ lw $s0, 0x18($sp) -/* 07962C 80078A2C 8FB1001C */ lw $s1, 0x1c($sp) -/* 079630 80078A30 8FB20020 */ lw $s2, 0x20($sp) -/* 079634 80078A34 8FB30024 */ lw $s3, 0x24($sp) -/* 079638 80078A38 8FB40028 */ lw $s4, 0x28($sp) -/* 07963C 80078A3C 03E00008 */ jr $ra -/* 079640 80078A40 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/include/objects.h b/include/objects.h index 88dc9a7a8..e3c5dd73a 100644 --- a/include/objects.h +++ b/include/objects.h @@ -289,13 +289,6 @@ extern Vec3s gHedgehogPatrolPoints[]; */ extern s32 indexObjectList2[]; -// This struct is used by a lot of different objects -// Stars, clouds, exahust smoke (I think?) -typedef struct { - Vec3su pos; - u16 id; -} StarSpawn; - #define NUM_BOOS 0xA #define NUM_FIRE_BREATHS 4 @@ -407,6 +400,22 @@ extern s32 gLeafParticle[]; //! Next free spot in gLeafParticle? Wraps back around to 0 if it gets bigger than gLeafParticle_SIZE extern s32 gNextFreeLeafParticle; +// Struct used for clouds and stars +// See `func_80070328` and `func_80070250` for cloud initialization +// See `func_800704A0` and `func_800703E0` for star initialization +typedef struct { + // rotY and posY seem relative to the camera. + // See `func_800788F8` to see how rotY is used to decide whether and where to display clouds/stars + // See `func_80078A44` and `func_800789AC` to see how stars and clouds (respectively) are looped over + /* 0x00 */ u16 rotY; + /* 0x02 */ u16 posY; + // Can be bigger than 100! + /* 0x04 */ u16 scalePercent; + // There are a couple different cloud shapes, this decides which one is used + // For stars, this is always 0 since they don't have multiple textures + /* 0x06 */ u16 subType; +} StarData, CloudData; // size = 0x8 + #define D_8018CC80_SIZE 0x64 /** diff --git a/src/code_8006E9C0.c b/src/code_8006E9C0.c index bbbb9b036..3eda50bb9 100644 --- a/src/code_8006E9C0.c +++ b/src/code_8006E9C0.c @@ -22,6 +22,7 @@ #include "data/other_textures.h" #include "render_objects.h" #include "code_80091750.h" +#include "src/data/some_data.h" void init_hud(void) { @@ -604,30 +605,30 @@ void init_object_list_index(void) { } } -void func_80070250(s32 objectIndex, s32 arg1, StarSpawn *arg2) { +void init_cloud_object(s32 objectIndex, s32 arg1, CloudData *arg2) { ItemWindowObjects *temp_v0; init_object(objectIndex, arg1); temp_v0 = &gObjectList[objectIndex]; - temp_v0->unk_0D5 = arg2->id; + temp_v0->unk_0D5 = arg2->subType; temp_v0->currentItem = ITEM_NONE; - temp_v0->direction_angle[1] = arg2->pos[0]; - temp_v0->unk_09E = arg2->pos[1]; - temp_v0->sizeScaling = (f32) arg2->pos[2] / 100.0; - temp_v0->activeTexture = &D_8018D220[arg2->id]; + temp_v0->direction_angle[1] = arg2->rotY; + temp_v0->unk_09E = arg2->posY; + temp_v0->sizeScaling = (f32) arg2->scalePercent / 100.0; + temp_v0->activeTexture = &D_8018D220[arg2->subType]; func_80073404(objectIndex, 0x40U, 0x20U, &D_0D005FB0); temp_v0->primAlpha = 0x00FF; } -void func_80070328(StarSpawn *arg0) { +void init_clouds(CloudData *cloudList) { s32 var_s0 = 0; - StarSpawn *test = arg0; + CloudData *test = &cloudList[0]; do { if(1) {} - func_80070250(find_unused_obj_index(&D_8018CC80[D_8018D1F8 + var_s0]), 1, test); + init_cloud_object(find_unused_obj_index(&D_8018CC80[D_8018D1F8 + var_s0]), 1, test); var_s0++; test++; - } while (test->pos[0] != 0xFFFF); + } while (test->rotY != 0xFFFF); D_8018D1F8 += var_s0; D_8018D1F0 = var_s0; D_8018D230 = 0; @@ -642,34 +643,34 @@ void func_80070328(StarSpawn *arg0) { * The stars in Wario's Stadium, Toad's Turnpike, and Rainbow Road are not part of the skybox. * They are instead objects that seemingly hover in the air around the player * They have no true x/y/z position, instead they seem to be kept in a position relative to the - * player they hang around. There is however an x/y position for where they should be on screen + * player they hang around. There is however an y rotation and y position for where they should be on screen * when they are visbile (unk_09E[0] and [1]). * sizeScaling is some sort of size scaling on the start texture. * unk_0A2 is an alpha value, used to make the star twinkle. **/ -void func_800703E0(s32 objectIndex, s32 arg1, StarSpawn *arg2) { +void init_star_object(s32 objectIndex, s32 arg1, StarData *arg2) { ItemWindowObjects *temp_v0; init_object(objectIndex, arg1); temp_v0 = &gObjectList[objectIndex]; - temp_v0->unk_0D5 = arg2->id; // No idea, all 0's for stars + temp_v0->unk_0D5 = arg2->subType; temp_v0->currentItem = ITEM_BANANA; - temp_v0->direction_angle[1] = arg2->pos[0]; // No idea - temp_v0->unk_09E = arg2->pos[1]; // screen Y position - temp_v0->sizeScaling = (f32)arg2->pos[2] / 100.0; // some type of scaling on the texture + temp_v0->direction_angle[1] = arg2->rotY; + temp_v0->unk_09E = arg2->posY; // screen Y position + temp_v0->sizeScaling = (f32) arg2->scalePercent / 100.0; // some type of scaling on the texture temp_v0->activeTexture = D_0D0293D8; func_80073404(objectIndex, 0x10U, 0x10U, common_vtx_rectangle); } -void func_800704A0(StarSpawn *arg0) { +void init_stars(StarData *starList) { s32 var_s0 = 0; - StarSpawn *test = arg0; + StarData *test = &starList[0]; do { if(1) {} - func_800703E0(find_unused_obj_index(&D_8018CC80[D_8018D1F8 + var_s0]), 1, test); + init_star_object(find_unused_obj_index(&D_8018CC80[D_8018D1F8 + var_s0]), 1, test); var_s0++; test++; - } while (test->pos[0] != 0xFFFF); + } while (test->rotY != 0xFFFF); D_8018D1F8 += var_s0; D_8018D1F0 = var_s0; D_8018D230 = 1; @@ -681,10 +682,11 @@ void func_8007055C(void) { switch (gCurrentCourseId) { case COURSE_MARIO_RACEWAY: - func_80070328(&D_800E6C10); + // Uses Kalimari Desert's clouds for initialization? + init_clouds(gKalimariDesertClouds); break; case COURSE_YOSHI_VALLEY: - func_80070328(&D_800E6AA8); + init_clouds(gYoshiValleyMooMooFarmClouds); break; case COURSE_FRAPPE_SNOWLAND: if (gPlayerCount == 1) { @@ -699,31 +701,31 @@ void func_8007055C(void) { D_8018D1F0 = var_s0; break; case COURSE_KOOPA_BEACH: - func_80070328(D_800E6B00); + init_clouds(gKoopaTroopaBeachClouds); break; case COURSE_ROYAL_RACEWAY: - func_80070328(D_800E6B38); + init_clouds(gRoyalRacewayClouds); break; case COURSE_LUIGI_RACEWAY: - func_80070328(D_800E6A38); + init_clouds(gLuigiRacewayClouds); break; case COURSE_MOO_MOO_FARM: - func_80070328(D_800E6AA8); + init_clouds(gYoshiValleyMooMooFarmClouds); break; case COURSE_TOADS_TURNPIKE: - func_800704A0(D_800E6C80); + init_stars(gToadsTurnpikeRainbowRoadStars); break; case COURSE_KALAMARI_DESERT: - func_80070328(D_800E6C10); + init_clouds(gKalimariDesertClouds); break; case COURSE_SHERBET_LAND: - func_80070328(D_800E6BA8); + init_clouds(gSherbetLandClouds); break; case COURSE_RAINBOW_ROAD: - func_800704A0(D_800E6C80); + init_stars(gToadsTurnpikeRainbowRoadStars); break; case COURSE_WARIO_STADIUM: - func_800704A0(D_800E6DE0); + init_stars(gWarioStadiumStars); break; } func_8008C23C(); diff --git a/src/code_8006E9C0.h b/src/code_8006E9C0.h index f948e1145..175cf7792 100644 --- a/src/code_8006E9C0.h +++ b/src/code_8006E9C0.h @@ -19,10 +19,10 @@ void func_8006F8CC(void); void func_8006FA94(void); void func_80070148(void); void init_object_list_index(void); -void func_80070250(s32, s32, StarSpawn*); -void func_80070328(StarSpawn*); -void func_800703E0(s32, s32, StarSpawn*); -void func_800704A0(StarSpawn*); +void init_cloud_object(s32, s32, CloudData*); +void init_clouds(CloudData*); +void init_star_object(s32, s32, StarData*); +void init_stars(StarData*); void func_8007055C(void); void func_80070714(void); void init_course_object(void); @@ -35,14 +35,4 @@ extern s16 D_800E5520[]; extern s16 D_800E5548[]; extern u8 *gCourseOutlineTextures[0x14]; // 800e54d0 -// These are found in data_update_objects -extern StarSpawn D_800E6A38[]; /* unable to generate initializer */ -extern StarSpawn D_800E6AA8[]; /* unable to generate initializer */ -extern StarSpawn D_800E6B00[]; /* unable to generate initializer */ -extern StarSpawn D_800E6B38[]; /* unable to generate initializer */ -extern StarSpawn D_800E6BA8[]; /* unable to generate initializer */ -extern StarSpawn D_800E6C10[]; /* unable to generate initializer */ -extern StarSpawn D_800E6C80[]; /* unable to generate initializer */ -extern StarSpawn D_800E6DE0[]; /* unable to generate initializer */ - #endif diff --git a/src/data/some_data.c b/src/data/some_data.c index cf51e665d..b267c63e7 100644 --- a/src/data/some_data.c +++ b/src/data/some_data.c @@ -1071,187 +1071,187 @@ SplineData8 D_800E69F4 = { } }; -StarSpawn D_800E6A38[] = { - {{ 0x04fa, 0xfff6, 0x0096 }, 0x0000 }, - {{ 0x4718, 0x003c, 0x007d }, 0x0000 }, - {{ 0x5550, 0x0046, 0x0096 }, 0x0000 }, - {{ 0x954c, 0x002d, 0x004b }, 0x0000 }, - {{ 0xae2e, 0x0028, 0x004b }, 0x0000 }, - {{ 0x0e38, 0x001e, 0x0032 }, 0x0001 }, - {{ 0xa384, 0x0032, 0x0064 }, 0x0001 }, - {{ 0xd548, 0x001e, 0x0032 }, 0x0001 }, - {{ 0x31c4, 0x0032, 0x0064 }, 0x0002 }, - {{ 0x7ff8, 0x0037, 0x0064 }, 0x0002 }, - {{ 0xaaa0, 0x004b, 0x0096 }, 0x0002 }, - {{ 0xb8d8, 0xfff9, 0x0064 }, 0x0002 }, - {{ 0xee2a, 0x003c, 0x0050 }, 0x0002 }, - {{ 0xffff, 0x0000, 0x0000 }, 0x0000 }, +CloudData gLuigiRacewayClouds[] = { + { 0x04fa, 0xfff6, 0x0096, 0x0000 }, + { 0x4718, 0x003c, 0x007d, 0x0000 }, + { 0x5550, 0x0046, 0x0096, 0x0000 }, + { 0x954c, 0x002d, 0x004b, 0x0000 }, + { 0xae2e, 0x0028, 0x004b, 0x0000 }, + { 0x0e38, 0x001e, 0x0032, 0x0001 }, + { 0xa384, 0x0032, 0x0064, 0x0001 }, + { 0xd548, 0x001e, 0x0032, 0x0001 }, + { 0x31c4, 0x0032, 0x0064, 0x0002 }, + { 0x7ff8, 0x0037, 0x0064, 0x0002 }, + { 0xaaa0, 0x004b, 0x0096, 0x0002 }, + { 0xb8d8, 0xfff9, 0x0064, 0x0002 }, + { 0xee2a, 0x003c, 0x0050, 0x0002 }, + { 0xffff, 0x0000, 0x0000, 0x0000 }, }; -StarSpawn D_800E6AA8[] = { - {{ 0x00b6, 0x0050, 0x0041 }, 0x0000 }, - {{ 0x4718, 0x003c, 0x0064 }, 0x0000 }, - {{ 0x18e2, 0x0032, 0x004b }, 0x0000 }, - {{ 0x7ff8, 0x0037, 0x0064 }, 0x0000 }, - {{ 0x9ff6, 0x002d, 0x0032 }, 0x0000 }, - {{ 0xc710, 0x0046, 0x003c }, 0x0000 }, - {{ 0x0aaa, 0x001e, 0x0064 }, 0x0001 }, - {{ 0x5c6c, 0x0046, 0x0046 }, 0x0001 }, - {{ 0x31c4, 0x0028, 0x0050 }, 0x0002 }, - {{ 0xf1b8, 0x0028, 0x004b }, 0x0002 }, - {{ 0xffff, 0x0000, 0x0000 }, 0x0000 }, +CloudData gYoshiValleyMooMooFarmClouds[] = { + { 0x00b6, 0x0050, 0x0041, 0x0000 }, + { 0x4718, 0x003c, 0x0064, 0x0000 }, + { 0x18e2, 0x0032, 0x004b, 0x0000 }, + { 0x7ff8, 0x0037, 0x0064, 0x0000 }, + { 0x9ff6, 0x002d, 0x0032, 0x0000 }, + { 0xc710, 0x0046, 0x003c, 0x0000 }, + { 0x0aaa, 0x001e, 0x0064, 0x0001 }, + { 0x5c6c, 0x0046, 0x0046, 0x0001 }, + { 0x31c4, 0x0028, 0x0050, 0x0002 }, + { 0xf1b8, 0x0028, 0x004b, 0x0002 }, + { 0xffff, 0x0000, 0x0000, 0x0000 }, }; -StarSpawn D_800E6B00[] = { - {{ 0x1554, 0x001e, 0x00c8 }, 0x0000 }, - {{ 0xce2c, 0x001e, 0x00c8 }, 0x0000 }, - {{ 0xa384, 0x001e, 0x00c8 }, 0x0001 }, - {{ 0x070c, 0x001e, 0x00c8 }, 0x0001 }, - {{ 0x4718, 0x001e, 0x00c8 }, 0x0002 }, - {{ 0x8714, 0x001e, 0x00c8 }, 0x0003 }, - {{ 0xffff, 0x0000, 0x0000 }, 0x0000 }, +CloudData gKoopaTroopaBeachClouds[] = { + { 0x1554, 0x001e, 0x00c8, 0x0000 }, + { 0xce2c, 0x001e, 0x00c8, 0x0000 }, + { 0xa384, 0x001e, 0x00c8, 0x0001 }, + { 0x070c, 0x001e, 0x00c8, 0x0001 }, + { 0x4718, 0x001e, 0x00c8, 0x0002 }, + { 0x8714, 0x001e, 0x00c8, 0x0003 }, + { 0xffff, 0x0000, 0x0000, 0x0000 }, }; -StarSpawn D_800E6B38[] = { - {{ 0x60b0, 0x003c, 0x007d }, 0x0000 }, - {{ 0xb8d8, 0x0037, 0x0064 }, 0x0000 }, - {{ 0xd548, 0x000a, 0x0082 }, 0x0000 }, - {{ 0xf1b8, 0x0023, 0x0064 }, 0x0000 }, - {{ 0x04fa, 0x0046, 0x0096 }, 0x0001 }, - {{ 0x4718, 0x003c, 0x007d }, 0x0001 }, - {{ 0x954c, 0x002d, 0x004b }, 0x0001 }, - {{ 0x0e38, 0x001e, 0x0032 }, 0x0002 }, - {{ 0x8880, 0x0046, 0x0096 }, 0x0002 }, - {{ 0x31c4, 0x0032, 0x0064 }, 0x0003 }, - {{ 0x5056, 0x0028, 0x004b }, 0x0003 }, - {{ 0x7ff8, 0x0037, 0x0064 }, 0x0003 }, - {{ 0xaaa0, 0x004b, 0x0096 }, 0x0003 }, - {{ 0xffff, 0x0000, 0x0000 }, 0x0000 }, +CloudData gRoyalRacewayClouds[] = { + { 0x60b0, 0x003c, 0x007d, 0x0000 }, + { 0xb8d8, 0x0037, 0x0064, 0x0000 }, + { 0xd548, 0x000a, 0x0082, 0x0000 }, + { 0xf1b8, 0x0023, 0x0064, 0x0000 }, + { 0x04fa, 0x0046, 0x0096, 0x0001 }, + { 0x4718, 0x003c, 0x007d, 0x0001 }, + { 0x954c, 0x002d, 0x004b, 0x0001 }, + { 0x0e38, 0x001e, 0x0032, 0x0002 }, + { 0x8880, 0x0046, 0x0096, 0x0002 }, + { 0x31c4, 0x0032, 0x0064, 0x0003 }, + { 0x5056, 0x0028, 0x004b, 0x0003 }, + { 0x7ff8, 0x0037, 0x0064, 0x0003 }, + { 0xaaa0, 0x004b, 0x0096, 0x0003 }, + { 0xffff, 0x0000, 0x0000, 0x0000 }, }; -StarSpawn D_800E6BA8[] = { - {{ 0x4718, 0x003c, 0x007d }, 0x0000 }, - {{ 0x5550, 0x0046, 0x0096 }, 0x0000 }, - {{ 0x954c, 0x002d, 0x004b }, 0x0000 }, - {{ 0xf546, 0x0028, 0x004b }, 0x0000 }, - {{ 0x0e38, 0x001e, 0x0032 }, 0x0001 }, - {{ 0x0222, 0x0032, 0x0064 }, 0x0002 }, - {{ 0x1ffe, 0x0028, 0x004b }, 0x0002 }, - {{ 0x31c4, 0x0032, 0x0064 }, 0x0002 }, - {{ 0x7ff8, 0x0037, 0x0064 }, 0x0002 }, - {{ 0xaaa0, 0x004b, 0x0096 }, 0x0002 }, - {{ 0xb8d8, 0x0037, 0x0064 }, 0x0002 }, - {{ 0xdff2, 0x001e, 0x0032 }, 0x0002 }, - {{ 0xffff, 0x0000, 0x0000 }, 0x0000 }, +CloudData gSherbetLandClouds[] = { + { 0x4718, 0x003c, 0x007d, 0x0000 }, + { 0x5550, 0x0046, 0x0096, 0x0000 }, + { 0x954c, 0x002d, 0x004b, 0x0000 }, + { 0xf546, 0x0028, 0x004b, 0x0000 }, + { 0x0e38, 0x001e, 0x0032, 0x0001 }, + { 0x0222, 0x0032, 0x0064, 0x0002 }, + { 0x1ffe, 0x0028, 0x004b, 0x0002 }, + { 0x31c4, 0x0032, 0x0064, 0x0002 }, + { 0x7ff8, 0x0037, 0x0064, 0x0002 }, + { 0xaaa0, 0x004b, 0x0096, 0x0002 }, + { 0xb8d8, 0x0037, 0x0064, 0x0002 }, + { 0xdff2, 0x001e, 0x0032, 0x0002 }, + { 0xffff, 0x0000, 0x0000, 0x0000 }, }; -StarSpawn D_800E6C10[] = { - {{ 0x1ffe, 0x0028, 0x004b }, 0x0000 }, - {{ 0x60b0, 0x003c, 0x007d }, 0x0000 }, - {{ 0xb8d8, 0x0037, 0x0064 }, 0x0000 }, - {{ 0x4718, 0x003c, 0x007d }, 0x0001 }, - {{ 0x954c, 0x002d, 0x004b }, 0x0001 }, - {{ 0xf546, 0x0028, 0x004b }, 0x0001 }, - {{ 0x0e38, 0x001e, 0x0032 }, 0x0002 }, - {{ 0xa384, 0x0032, 0x0064 }, 0x0002 }, - {{ 0xddd0, 0x0046, 0x0096 }, 0x0002 }, - {{ 0x0222, 0x0032, 0x0064 }, 0x0003 }, - {{ 0x31c4, 0x0032, 0x0064 }, 0x0003 }, - {{ 0x7ff8, 0x0037, 0x0064 }, 0x0003 }, - {{ 0xaaa0, 0x004b, 0x0096 }, 0x0003 }, - {{ 0xffff, 0x0000, 0x0000 }, 0x0000 }, +CloudData gKalimariDesertClouds[] = { + { 0x1ffe, 0x0028, 0x004b, 0x0000 }, + { 0x60b0, 0x003c, 0x007d, 0x0000 }, + { 0xb8d8, 0x0037, 0x0064, 0x0000 }, + { 0x4718, 0x003c, 0x007d, 0x0001 }, + { 0x954c, 0x002d, 0x004b, 0x0001 }, + { 0xf546, 0x0028, 0x004b, 0x0001 }, + { 0x0e38, 0x001e, 0x0032, 0x0002 }, + { 0xa384, 0x0032, 0x0064, 0x0002 }, + { 0xddd0, 0x0046, 0x0096, 0x0002 }, + { 0x0222, 0x0032, 0x0064, 0x0003 }, + { 0x31c4, 0x0032, 0x0064, 0x0003 }, + { 0x7ff8, 0x0037, 0x0064, 0x0003 }, + { 0xaaa0, 0x004b, 0x0096, 0x0003 }, + { 0xffff, 0x0000, 0x0000, 0x0000 }, }; -StarSpawn D_800E6C80[] = { - {{ 0x0222, 0x0032, 0x000a }, 0x0000 }, - {{ 0x04fa, 0x0046, 0x000f }, 0x0000 }, - {{ 0x093e, 0x000a, 0x0014 }, 0x0000 }, - {{ 0x0e38, 0x001e, 0x000f }, 0x0000 }, - {{ 0x11c6, 0x0028, 0x0014 }, 0x0000 }, - {{ 0x1554, 0xfff6, 0x000f }, 0x0000 }, - {{ 0x1ddc, 0x000a, 0x0011 }, 0x0000 }, - {{ 0x1ffe, 0x0030, 0x0019 }, 0x0000 }, - {{ 0x271a, 0x0046, 0x0014 }, 0x0000 }, - {{ 0x27d0, 0xfff1, 0x0016 }, 0x0000 }, - {{ 0x2c14, 0x0014, 0x000f }, 0x0000 }, - {{ 0x31c4, 0x0032, 0x0016 }, 0x0000 }, - {{ 0x327a, 0x0000, 0x000a }, 0x0000 }, - {{ 0x3a4c, 0x000f, 0x0016 }, 0x0000 }, - {{ 0x3ffc, 0x002d, 0x0011 }, 0x0000 }, - {{ 0x40b2, 0xffdd, 0x0016 }, 0x0000 }, - {{ 0x4440, 0x0037, 0x0014 }, 0x0000 }, - {{ 0x4718, 0x003c, 0x000c }, 0x0000 }, - {{ 0x4718, 0x0050, 0x000c }, 0x0000 }, - {{ 0x4aa6, 0xfff6, 0x000f }, 0x0000 }, - {{ 0x5056, 0x0028, 0x000a }, 0x0000 }, - {{ 0x5550, 0x0046, 0x000f }, 0x0000 }, - {{ 0x60b0, 0x003c, 0x0016 }, 0x0000 }, - {{ 0x6388, 0xffdd, 0x0019 }, 0x0000 }, - {{ 0x64f4, 0x0023, 0x0011 }, 0x0000 }, - {{ 0x6aa4, 0x004b, 0x0014 }, 0x0000 }, - {{ 0x7054, 0x002d, 0x0019 }, 0x0000 }, - {{ 0x7498, 0x0014, 0x0012 }, 0x0000 }, - {{ 0x7bb4, 0xfff1, 0x001b }, 0x0000 }, - {{ 0x7ff8, 0x0037, 0x000a }, 0x0000 }, - {{ 0x8386, 0x0041, 0x0014 }, 0x0000 }, - {{ 0x8880, 0x0046, 0x000f }, 0x0000 }, - {{ 0x954c, 0x002d, 0x0011 }, 0x0000 }, - {{ 0x98da, 0x003c, 0x000f }, 0x0000 }, - {{ 0x9dd4, 0x0000, 0x000a }, 0x0000 }, - {{ 0xa384, 0x0046, 0x000f }, 0x0000 }, - {{ 0xa43a, 0x0032, 0x0017 }, 0x0000 }, - {{ 0xaaa0, 0x004b, 0x000f }, 0x0000 }, - {{ 0xae2e, 0x0028, 0x0011 }, 0x0000 }, - {{ 0xb1bc, 0x0023, 0x0014 }, 0x0000 }, - {{ 0xb8d8, 0xfff1, 0x000a }, 0x0000 }, - {{ 0xbc66, 0xffe2, 0x000f }, 0x0000 }, - {{ 0xc710, 0x001e, 0x000c }, 0x0000 }, - {{ 0xffff, 0x0000, 0x0000 }, 0x0000 }, +StarData gToadsTurnpikeRainbowRoadStars[] = { + { 0x0222, 0x0032, 0x000a, 0x0000 }, + { 0x04fa, 0x0046, 0x000f, 0x0000 }, + { 0x093e, 0x000a, 0x0014, 0x0000 }, + { 0x0e38, 0x001e, 0x000f, 0x0000 }, + { 0x11c6, 0x0028, 0x0014, 0x0000 }, + { 0x1554, 0xfff6, 0x000f, 0x0000 }, + { 0x1ddc, 0x000a, 0x0011, 0x0000 }, + { 0x1ffe, 0x0030, 0x0019, 0x0000 }, + { 0x271a, 0x0046, 0x0014, 0x0000 }, + { 0x27d0, 0xfff1, 0x0016, 0x0000 }, + { 0x2c14, 0x0014, 0x000f, 0x0000 }, + { 0x31c4, 0x0032, 0x0016, 0x0000 }, + { 0x327a, 0x0000, 0x000a, 0x0000 }, + { 0x3a4c, 0x000f, 0x0016, 0x0000 }, + { 0x3ffc, 0x002d, 0x0011, 0x0000 }, + { 0x40b2, 0xffdd, 0x0016, 0x0000 }, + { 0x4440, 0x0037, 0x0014, 0x0000 }, + { 0x4718, 0x003c, 0x000c, 0x0000 }, + { 0x4718, 0x0050, 0x000c, 0x0000 }, + { 0x4aa6, 0xfff6, 0x000f, 0x0000 }, + { 0x5056, 0x0028, 0x000a, 0x0000 }, + { 0x5550, 0x0046, 0x000f, 0x0000 }, + { 0x60b0, 0x003c, 0x0016, 0x0000 }, + { 0x6388, 0xffdd, 0x0019, 0x0000 }, + { 0x64f4, 0x0023, 0x0011, 0x0000 }, + { 0x6aa4, 0x004b, 0x0014, 0x0000 }, + { 0x7054, 0x002d, 0x0019, 0x0000 }, + { 0x7498, 0x0014, 0x0012, 0x0000 }, + { 0x7bb4, 0xfff1, 0x001b, 0x0000 }, + { 0x7ff8, 0x0037, 0x000a, 0x0000 }, + { 0x8386, 0x0041, 0x0014, 0x0000 }, + { 0x8880, 0x0046, 0x000f, 0x0000 }, + { 0x954c, 0x002d, 0x0011, 0x0000 }, + { 0x98da, 0x003c, 0x000f, 0x0000 }, + { 0x9dd4, 0x0000, 0x000a, 0x0000 }, + { 0xa384, 0x0046, 0x000f, 0x0000 }, + { 0xa43a, 0x0032, 0x0017, 0x0000 }, + { 0xaaa0, 0x004b, 0x000f, 0x0000 }, + { 0xae2e, 0x0028, 0x0011, 0x0000 }, + { 0xb1bc, 0x0023, 0x0014, 0x0000 }, + { 0xb8d8, 0xfff1, 0x000a, 0x0000 }, + { 0xbc66, 0xffe2, 0x000f, 0x0000 }, + { 0xc710, 0x001e, 0x000c, 0x0000 }, + { 0xffff, 0x0000, 0x0000, 0x0000 }, }; -StarSpawn D_800E6DE0[] = { - {{ 0x0222, 0x0050, 0x000a }, 0x0000 }, - {{ 0x04fa, 0x0064, 0x000f }, 0x0000 }, - {{ 0x093e, 0x005a, 0x0014 }, 0x0000 }, - {{ 0x0e38, 0x003c, 0x000f }, 0x0000 }, - {{ 0x11c6, 0x0046, 0x0014 }, 0x0000 }, - {{ 0x1554, 0x0078, 0x000f }, 0x0000 }, - {{ 0x1c70, 0x001e, 0x0011 }, 0x0000 }, - {{ 0x1ffe, 0x0046, 0x0011 }, 0x0000 }, - {{ 0x271a, 0x0064, 0x0014 }, 0x0000 }, - {{ 0x2c14, 0x0032, 0x000f }, 0x0000 }, - {{ 0x31c4, 0x0050, 0x000a }, 0x0000 }, - {{ 0x3996, 0x0019, 0x000c }, 0x0000 }, - {{ 0x3a4c, 0x0037, 0x0016 }, 0x0000 }, - {{ 0x3bb8, 0x0019, 0x000c }, 0x0000 }, - {{ 0x3ffc, 0x004b, 0x0011 }, 0x0000 }, - {{ 0x4440, 0x0055, 0x0014 }, 0x0000 }, - {{ 0x4718, 0x005a, 0x000c }, 0x0000 }, - {{ 0x4aa6, 0x003c, 0x000f }, 0x0000 }, - {{ 0x5056, 0x0046, 0x000a }, 0x0000 }, - {{ 0x5550, 0x0064, 0x000f }, 0x0000 }, - {{ 0x60b0, 0x005a, 0x0016 }, 0x0000 }, - {{ 0x64f4, 0x0041, 0x0014 }, 0x0000 }, - {{ 0x6aa4, 0x0069, 0x0014 }, 0x0000 }, - {{ 0x7054, 0x004b, 0x0014 }, 0x0000 }, - {{ 0x71c0, 0x0078, 0x0012 }, 0x0000 }, - {{ 0x7498, 0x003c, 0x0012 }, 0x0000 }, - {{ 0x7ff8, 0x0055, 0x000a }, 0x0000 }, - {{ 0x8714, 0x0073, 0x000a }, 0x0000 }, - {{ 0x8880, 0x0064, 0x000f }, 0x0000 }, - {{ 0x954c, 0x004b, 0x0011 }, 0x0000 }, - {{ 0x98da, 0x003c, 0x000f }, 0x0000 }, - {{ 0x9dd4, 0x0032, 0x000a }, 0x0000 }, - {{ 0xa384, 0x0050, 0x000a }, 0x0000 }, - {{ 0xa43a, 0x006e, 0x000a }, 0x0000 }, - {{ 0xaaa0, 0x0069, 0x000f }, 0x0000 }, - {{ 0xae2e, 0x0046, 0x0011 }, 0x0000 }, - {{ 0xb1bc, 0x0041, 0x0014 }, 0x0000 }, - {{ 0xb8d8, 0x0055, 0x000a }, 0x0000 }, - {{ 0xbc66, 0x003c, 0x000f }, 0x0000 }, - {{ 0xc710, 0x0064, 0x000a }, 0x0000 }, - {{ 0xffff, 0x0000, 0x0000 }, 0x0000 }, - {{ 0x0000, 0x0000, 0x0000 }, 0x0000 }, +StarData gWarioStadiumStars[] = { + { 0x0222, 0x0050, 0x000a, 0x0000 }, + { 0x04fa, 0x0064, 0x000f, 0x0000 }, + { 0x093e, 0x005a, 0x0014, 0x0000 }, + { 0x0e38, 0x003c, 0x000f, 0x0000 }, + { 0x11c6, 0x0046, 0x0014, 0x0000 }, + { 0x1554, 0x0078, 0x000f, 0x0000 }, + { 0x1c70, 0x001e, 0x0011, 0x0000 }, + { 0x1ffe, 0x0046, 0x0011, 0x0000 }, + { 0x271a, 0x0064, 0x0014, 0x0000 }, + { 0x2c14, 0x0032, 0x000f, 0x0000 }, + { 0x31c4, 0x0050, 0x000a, 0x0000 }, + { 0x3996, 0x0019, 0x000c, 0x0000 }, + { 0x3a4c, 0x0037, 0x0016, 0x0000 }, + { 0x3bb8, 0x0019, 0x000c, 0x0000 }, + { 0x3ffc, 0x004b, 0x0011, 0x0000 }, + { 0x4440, 0x0055, 0x0014, 0x0000 }, + { 0x4718, 0x005a, 0x000c, 0x0000 }, + { 0x4aa6, 0x003c, 0x000f, 0x0000 }, + { 0x5056, 0x0046, 0x000a, 0x0000 }, + { 0x5550, 0x0064, 0x000f, 0x0000 }, + { 0x60b0, 0x005a, 0x0016, 0x0000 }, + { 0x64f4, 0x0041, 0x0014, 0x0000 }, + { 0x6aa4, 0x0069, 0x0014, 0x0000 }, + { 0x7054, 0x004b, 0x0014, 0x0000 }, + { 0x71c0, 0x0078, 0x0012, 0x0000 }, + { 0x7498, 0x003c, 0x0012, 0x0000 }, + { 0x7ff8, 0x0055, 0x000a, 0x0000 }, + { 0x8714, 0x0073, 0x000a, 0x0000 }, + { 0x8880, 0x0064, 0x000f, 0x0000 }, + { 0x954c, 0x004b, 0x0011, 0x0000 }, + { 0x98da, 0x003c, 0x000f, 0x0000 }, + { 0x9dd4, 0x0032, 0x000a, 0x0000 }, + { 0xa384, 0x0050, 0x000a, 0x0000 }, + { 0xa43a, 0x006e, 0x000a, 0x0000 }, + { 0xaaa0, 0x0069, 0x000f, 0x0000 }, + { 0xae2e, 0x0046, 0x0011, 0x0000 }, + { 0xb1bc, 0x0041, 0x0014, 0x0000 }, + { 0xb8d8, 0x0055, 0x000a, 0x0000 }, + { 0xbc66, 0x003c, 0x000f, 0x0000 }, + { 0xc710, 0x0064, 0x000a, 0x0000 }, + { 0xffff, 0x0000, 0x0000, 0x0000 }, + { 0x0000, 0x0000, 0x0000, 0x0000 }, }; u8 D_800E6F30[][3] = { diff --git a/src/data/some_data.h b/src/data/some_data.h index da56ef091..881393de5 100644 --- a/src/data/some_data.h +++ b/src/data/some_data.h @@ -76,14 +76,14 @@ extern SplineDataUnused13 D_800E68E0; extern SplineData12 D_800E694C; extern SplineData8 D_800E69B0; extern SplineData8 D_800E69F4; -extern StarSpawn D_800E6A38[]; -extern StarSpawn D_800E6AA8[]; -extern StarSpawn D_800E6B00[]; -extern StarSpawn D_800E6B38[]; -extern StarSpawn D_800E6BA8[]; -extern StarSpawn D_800E6C10[]; -extern StarSpawn D_800E6C80[]; -extern StarSpawn D_800E6DE0[]; +extern CloudData gLuigiRacewayClouds[]; +extern CloudData gYoshiValleyMooMooFarmClouds[]; +extern CloudData gKoopaTroopaBeachClouds[]; +extern CloudData gRoyalRacewayClouds[]; +extern CloudData gSherbetLandClouds[]; +extern CloudData gKalimariDesertClouds[]; +extern StarData gToadsTurnpikeRainbowRoadStars[]; +extern StarData gWarioStadiumStars[]; extern u8 D_800E6F30[][3]; extern u8 D_800E6F48[][3]; diff --git a/src/update_objects.c b/src/update_objects.c index 8f0dea1b4..37037b091 100644 --- a/src/update_objects.c +++ b/src/update_objects.c @@ -2741,52 +2741,28 @@ void func_800788F8(s32 objectIndex, u16 rot, Camera *camera) { set_object_flag_status_false(objectIndex, 0x00000010); } -#ifdef MIPS_TO_C -//generated by m2c commit beb457dabfc7a01ec6540a5404a6a05097a13602 on Nov-13-2023 -void func_800789AC(s32 arg0, Camera *arg1, s16 (*arg2)[4]) { - s32 *var_s1; - s32 var_s0; +void update_clouds(s32 arg0, Camera *arg1, CloudData *cloudList) { + s32 cloudIndex; + s32 objectIndex; + CloudData *cloud; - var_s0 = 0; - if (D_8018D1F0 > 0) { - var_s1 = &D_8018CC80[arg0]; - do { - func_800788F8(*var_s1, (u16) *arg2[var_s0], arg1); - var_s0 += 1; - var_s1 += 4; - } while (var_s0 < D_8018D1F0); + for (cloudIndex = 0; cloudIndex < D_8018D1F0; cloudIndex++) { + cloud = &cloudList[cloudIndex]; + objectIndex = D_8018CC80[arg0 + cloudIndex]; + func_800788F8(objectIndex, cloud->rotY, arg1); } - /* - s32 var_s0; - - for (var_s0 = 0; var_s0 < D_8018D1F0; var_s0++) { - func_800788F8(D_8018CC80[arg0 + var_s0], arg2[0][var_s0], arg1); - } - */ } -#else -GLOBAL_ASM("asm/non_matchings/update_objects/func_800789AC.s") -#endif -typedef struct { - Vec3su unk0; - u16 pad; - Vec3su unkA; - u16 pad2; -} test; +void update_stars(s32 arg0, Camera *camera, StarData *starList) { + s32 starIndex; + s32 objectIndex; + StarData *star; -typedef u16 testA[44][4]; - -void func_80078A44(s32 arg0, Camera *camera, u16 rot[][4]) { - s32 objectIndex; - s32 i; - - for (i = 0; i < D_8018D1F0; i++, arg0++) { - objectIndex = D_8018CC80[arg0]; - - // rot[i][0] - func_800788F8(objectIndex, *(u16 *)(rot + i), camera); - switch (i % 5U) { + for (starIndex = 0; starIndex < D_8018D1F0; starIndex++) { + star = &starList[starIndex]; + objectIndex = D_8018CC80[arg0 + starIndex]; + func_800788F8(objectIndex, star->rotY, camera); + switch (starIndex % 5U) { case 0: func_80073CB0(objectIndex, &gObjectList[objectIndex].primAlpha, 0x00000028, 0x000000B4, 0x000000FF, 0, -1); break; @@ -2849,40 +2825,41 @@ void func_80078C70(s32 arg0) { D_8018D218 = 0xA0; switch (gCurrentCourseId) { /* switch 2 */ case COURSE_MARIO_RACEWAY: /* switch 2 */ - func_800789AC(sp1C, camera, D_800E6A38); + // Uses Luigi Raceway's clouds for display purposes? + update_clouds(sp1C, camera, gLuigiRacewayClouds); break; case COURSE_YOSHI_VALLEY: /* switch 2 */ - func_800789AC(sp1C, camera, D_800E6AA8); + update_clouds(sp1C, camera, gYoshiValleyMooMooFarmClouds); break; case COURSE_FRAPPE_SNOWLAND: /* switch 2 */ func_80078170(sp1C, camera); break; case COURSE_KOOPA_BEACH: /* switch 2 */ - func_800789AC(sp1C, camera, D_800E6B00); + update_clouds(sp1C, camera, gKoopaTroopaBeachClouds); break; case COURSE_ROYAL_RACEWAY: /* switch 2 */ - func_800789AC(sp1C, camera, D_800E6B38); + update_clouds(sp1C, camera, gRoyalRacewayClouds); break; case COURSE_LUIGI_RACEWAY: /* switch 2 */ - func_800789AC(sp1C, camera, D_800E6A38); + update_clouds(sp1C, camera, gLuigiRacewayClouds); break; case COURSE_MOO_MOO_FARM: /* switch 2 */ - func_800789AC(sp1C, camera, D_800E6AA8); + update_clouds(sp1C, camera, gYoshiValleyMooMooFarmClouds); break; case COURSE_TOADS_TURNPIKE: /* switch 2 */ - func_80078A44(sp1C, camera, D_800E6C80); + update_stars(sp1C, camera, gToadsTurnpikeRainbowRoadStars); break; case COURSE_KALAMARI_DESERT: /* switch 2 */ - func_800789AC(sp1C, camera, D_800E6C10); + update_clouds(sp1C, camera, gKalimariDesertClouds); break; case COURSE_SHERBET_LAND: /* switch 2 */ - func_800789AC(sp1C, camera, D_800E6BA8); + update_clouds(sp1C, camera, gSherbetLandClouds); break; case COURSE_RAINBOW_ROAD: /* switch 2 */ - func_80078A44(sp1C, camera, D_800E6C80); + update_stars(sp1C, camera, gToadsTurnpikeRainbowRoadStars); break; case COURSE_WARIO_STADIUM: /* switch 2 */ - func_80078A44(sp1C, camera, D_800E6DE0); + update_stars(sp1C, camera, gWarioStadiumStars); break; } } diff --git a/src/update_objects.h b/src/update_objects.h index 4350d5125..890029484 100644 --- a/src/update_objects.h +++ b/src/update_objects.h @@ -176,7 +176,8 @@ void func_800786EC(s32); void func_80078790(void); void update_snowflakes(void); void func_800788F8(s32, u16, Camera*); -void func_800789AC(s32, Camera*, Vec4s*); +void update_clouds(s32, Camera*, CloudData*); +void update_stars(s32, Camera*, StarData*); void func_80078C68(void); void func_80078C70(s32); void func_80078F64(void); diff --git a/tools/doxygen_syms.md b/tools/doxygen_syms.md index ed8220111..7cf2f868f 100644 --- a/tools/doxygen_syms.md +++ b/tools/doxygen_syms.md @@ -1179,10 +1179,10 @@ Variable Name | Memory Address [func_8006FA94](@ref func_8006FA94) | 0x8006FA94 [func_80070148](@ref func_80070148) | 0x80070148 [init_object_list_index](@ref init_object_list_index) | 0x80070190 -[func_80070250](@ref func_80070250) | 0x80070250 -[func_80070328](@ref func_80070328) | 0x80070328 -[func_800703E0](@ref func_800703E0) | 0x800703E0 -[func_800704A0](@ref func_800704A0) | 0x800704A0 +[init_cloud_object](@ref init_cloud_object) | 0x80070250 +[init_clouds](@ref init_clouds) | 0x80070328 +[init_star_object](@ref init_star_object) | 0x800703E0 +[init_stars](@ref init_stars) | 0x800704A0 [func_8007055C](@ref func_8007055C) | 0x8007055C [func_80070714](@ref func_80070714) | 0x80070714 [init_course_object](@ref init_course_object) | 0x80070780 @@ -1366,8 +1366,8 @@ Variable Name | Memory Address [func_80078790](@ref func_80078790) | 0x80078790 [update_snowflakes](@ref update_snowflakes) | 0x80078838 [func_800788F8](@ref func_800788F8) | 0x800788F8 -[func_800789AC](@ref func_800789AC) | 0x800789AC -[func_80078A44](@ref func_80078A44) | 0x80078A44 +[update_clouds](@ref update_clouds) | 0x800789AC +[update_stars](@ref update_stars) | 0x80078A44 [func_80078C68](@ref func_80078C68) | 0x80078C68 [func_80078C70](@ref func_80078C70) | 0x80078C70 [func_80078F64](@ref func_80078F64) | 0x80078F64 @@ -2580,10 +2580,10 @@ Variable Name | Memory Address [rspF3DBootStart](@ref rspF3DBootStart) | 0x800D8F70 [rspF3DBootEnd](@ref rspF3DBootEnd) | 0x800D9040 [gspF3DEXTextStart](@ref gspF3DEXTextStart) | 0x800D9040 -[gspF3DLXTextStart](@ref gspF3DLXTextStart) | 0x800DA420 [gspF3DEXTextEnd](@ref gspF3DEXTextEnd) | 0x800DA420 -[rspAspMainStart](@ref rspAspMainStart) | 0x800DB830 +[gspF3DLXTextStart](@ref gspF3DLXTextStart) | 0x800DA420 [gspF3DLXTextEnd](@ref gspF3DLXTextEnd) | 0x800DB830 +[rspAspMainStart](@ref rspAspMainStart) | 0x800DB830 [rspAspMainEnd](@ref rspAspMainEnd) | 0x800DC4A0 [gVblankHandler1](@ref gVblankHandler1) | 0x800DC4A0 [gVblankHandler2](@ref gVblankHandler2) | 0x800DC4A4 @@ -3187,14 +3187,14 @@ Variable Name | Memory Address [D_800E694C](@ref D_800E694C) | 0x800E694C [D_800E69B0](@ref D_800E69B0) | 0x800E69B0 [D_800E69F4](@ref D_800E69F4) | 0x800E69F4 -[D_800E6A38](@ref D_800E6A38) | 0x800E6A38 -[D_800E6AA8](@ref D_800E6AA8) | 0x800E6AA8 -[D_800E6B00](@ref D_800E6B00) | 0x800E6B00 -[D_800E6B38](@ref D_800E6B38) | 0x800E6B38 -[D_800E6BA8](@ref D_800E6BA8) | 0x800E6BA8 -[D_800E6C10](@ref D_800E6C10) | 0x800E6C10 -[D_800E6C80](@ref D_800E6C80) | 0x800E6C80 -[D_800E6DE0](@ref D_800E6DE0) | 0x800E6DE0 +[gLuigiRacewayClouds](@ref gLuigiRacewayClouds) | 0x800E6A38 +[gYoshiValleyMooMooFarmClouds](@ref gYoshiValleyMooMooFarmClouds) | 0x800E6AA8 +[gKoopaTroopaBeachClouds](@ref gKoopaTroopaBeachClouds) | 0x800E6B00 +[gRoyalRacewayClouds](@ref gRoyalRacewayClouds) | 0x800E6B38 +[gSherbetLandClouds](@ref gSherbetLandClouds) | 0x800E6BA8 +[gKalimariDesertClouds](@ref gKalimariDesertClouds) | 0x800E6C10 +[gToadsTurnpikeRainbowRoadStars](@ref gToadsTurnpikeRainbowRoadStars) | 0x800E6C80 +[gWarioStadiumStars](@ref gWarioStadiumStars) | 0x800E6DE0 [D_800E6F30](@ref D_800E6F30) | 0x800E6F30 [D_800E6F48](@ref D_800E6F48) | 0x800E6F48 [D_800E70A0](@ref D_800E70A0) | 0x800E70A0 @@ -3703,8 +3703,8 @@ Variable Name | Memory Address [gspF3DEXDataStart](@ref gspF3DEXDataStart) | 0x800F3D00 [gspF3DEXDataEnd](@ref gspF3DEXDataEnd) | 0x800F4500 [gspF3DLXDataStart](@ref gspF3DLXDataStart) | 0x800F4500 -[gspF3DLXDataEnd](@ref gspF3DLXDataEnd) | 0x800F4D00 [rspAspMainDataStart](@ref rspAspMainDataStart) | 0x800F4D00 +[gspF3DLXDataEnd](@ref gspF3DLXDataEnd) | 0x800F4D00 [rspAspMainDataEnd](@ref rspAspMainDataEnd) | 0x800F5000 [sSawtoothWaves](@ref sSawtoothWaves) | 0x800F5000 [sTriangleWaves](@ref sTriangleWaves) | 0x800F5200 @@ -18690,66 +18690,66 @@ Variable Name | Memory Address [gCosineTable](@ref gCosineTable) | 0x802BB370 [gArctanTable](@ref gArctanTable) | 0x802BF370 [gTextureMarioFace00](@ref gTextureMarioFace00) | 0x0A000000 -[gTextureMarioFace01](@ref gTextureMarioFace01) | 0x0A000CD4 [gTextureMarioFace00_end](@ref gTextureMarioFace00_end) | 0x0A000CD4 -[gTextureMarioFace02](@ref gTextureMarioFace02) | 0x0A001994 +[gTextureMarioFace01](@ref gTextureMarioFace01) | 0x0A000CD4 [gTextureMarioFace01_end](@ref gTextureMarioFace01_end) | 0x0A001994 -[gTextureMarioFace03](@ref gTextureMarioFace03) | 0x0A002650 +[gTextureMarioFace02](@ref gTextureMarioFace02) | 0x0A001994 [gTextureMarioFace02_end](@ref gTextureMarioFace02_end) | 0x0A002650 -[gTextureMarioFace03_end](@ref gTextureMarioFace03_end) | 0x0A0032BC +[gTextureMarioFace03](@ref gTextureMarioFace03) | 0x0A002650 [gTextureMarioFace04](@ref gTextureMarioFace04) | 0x0A0032BC -[gTextureMarioFace05](@ref gTextureMarioFace05) | 0x0A003F08 +[gTextureMarioFace03_end](@ref gTextureMarioFace03_end) | 0x0A0032BC [gTextureMarioFace04_end](@ref gTextureMarioFace04_end) | 0x0A003F08 -[gTextureMarioFace06](@ref gTextureMarioFace06) | 0x0A004B48 +[gTextureMarioFace05](@ref gTextureMarioFace05) | 0x0A003F08 [gTextureMarioFace05_end](@ref gTextureMarioFace05_end) | 0x0A004B48 +[gTextureMarioFace06](@ref gTextureMarioFace06) | 0x0A004B48 [gTextureMarioFace07](@ref gTextureMarioFace07) | 0x0A00585C [gTextureMarioFace06_end](@ref gTextureMarioFace06_end) | 0x0A00585C [gTextureMarioFace08](@ref gTextureMarioFace08) | 0x0A006568 [gTextureMarioFace07_end](@ref gTextureMarioFace07_end) | 0x0A006568 -[gTextureMarioFace08_end](@ref gTextureMarioFace08_end) | 0x0A00726C [gTextureMarioFace09](@ref gTextureMarioFace09) | 0x0A00726C -[gTextureMarioFace09_end](@ref gTextureMarioFace09_end) | 0x0A007F4C +[gTextureMarioFace08_end](@ref gTextureMarioFace08_end) | 0x0A00726C [gTextureMarioFace10](@ref gTextureMarioFace10) | 0x0A007F4C +[gTextureMarioFace09_end](@ref gTextureMarioFace09_end) | 0x0A007F4C [gTextureMarioFace11](@ref gTextureMarioFace11) | 0x0A008C48 [gTextureMarioFace10_end](@ref gTextureMarioFace10_end) | 0x0A008C48 -[gTextureMarioFace11_end](@ref gTextureMarioFace11_end) | 0x0A009944 [gTextureMarioFace12](@ref gTextureMarioFace12) | 0x0A009944 +[gTextureMarioFace11_end](@ref gTextureMarioFace11_end) | 0x0A009944 [gTextureMarioFace13](@ref gTextureMarioFace13) | 0x0A00A688 [gTextureMarioFace12_end](@ref gTextureMarioFace12_end) | 0x0A00A688 -[gTextureMarioFace14](@ref gTextureMarioFace14) | 0x0A00B3DC [gTextureMarioFace13_end](@ref gTextureMarioFace13_end) | 0x0A00B3DC -[gTextureMarioFace15](@ref gTextureMarioFace15) | 0x0A00C180 +[gTextureMarioFace14](@ref gTextureMarioFace14) | 0x0A00B3DC [gTextureMarioFace14_end](@ref gTextureMarioFace14_end) | 0x0A00C180 -[gTextureMarioFace16](@ref gTextureMarioFace16) | 0x0A00CF20 +[gTextureMarioFace15](@ref gTextureMarioFace15) | 0x0A00C180 [gTextureMarioFace15_end](@ref gTextureMarioFace15_end) | 0x0A00CF20 +[gTextureMarioFace16](@ref gTextureMarioFace16) | 0x0A00CF20 [gTextureLuigiFace00](@ref gTextureLuigiFace00) | 0x0A00DA64 [gTextureMarioFace16_end](@ref gTextureMarioFace16_end) | 0x0A00DA64 -[gTextureLuigiFace00_end](@ref gTextureLuigiFace00_end) | 0x0A00E680 [gTextureLuigiFace01](@ref gTextureLuigiFace01) | 0x0A00E680 +[gTextureLuigiFace00_end](@ref gTextureLuigiFace00_end) | 0x0A00E680 [gTextureLuigiFace01_end](@ref gTextureLuigiFace01_end) | 0x0A00F2A0 [gTextureLuigiFace02](@ref gTextureLuigiFace02) | 0x0A00F2A0 -[gTextureLuigiFace03](@ref gTextureLuigiFace03) | 0x0A00FEC0 [gTextureLuigiFace02_end](@ref gTextureLuigiFace02_end) | 0x0A00FEC0 +[gTextureLuigiFace03](@ref gTextureLuigiFace03) | 0x0A00FEC0 [gTextureLuigiFace03_end](@ref gTextureLuigiFace03_end) | 0x0A010AA8 [gTextureLuigiFace04](@ref gTextureLuigiFace04) | 0x0A010AA8 -[gTextureLuigiFace05](@ref gTextureLuigiFace05) | 0x0A011690 [gTextureLuigiFace04_end](@ref gTextureLuigiFace04_end) | 0x0A011690 +[gTextureLuigiFace05](@ref gTextureLuigiFace05) | 0x0A011690 [gTextureLuigiFace06](@ref gTextureLuigiFace06) | 0x0A01225C [gTextureLuigiFace05_end](@ref gTextureLuigiFace05_end) | 0x0A01225C [gTextureLuigiFace06_end](@ref gTextureLuigiFace06_end) | 0x0A012E84 [gTextureLuigiFace07](@ref gTextureLuigiFace07) | 0x0A012E84 -[gTextureLuigiFace07_end](@ref gTextureLuigiFace07_end) | 0x0A013AB8 [gTextureLuigiFace08](@ref gTextureLuigiFace08) | 0x0A013AB8 -[gTextureLuigiFace08_end](@ref gTextureLuigiFace08_end) | 0x0A014744 +[gTextureLuigiFace07_end](@ref gTextureLuigiFace07_end) | 0x0A013AB8 [gTextureLuigiFace09](@ref gTextureLuigiFace09) | 0x0A014744 -[gTextureLuigiFace09_end](@ref gTextureLuigiFace09_end) | 0x0A0153C4 +[gTextureLuigiFace08_end](@ref gTextureLuigiFace08_end) | 0x0A014744 [gTextureLuigiFace10](@ref gTextureLuigiFace10) | 0x0A0153C4 -[gTextureLuigiFace11](@ref gTextureLuigiFace11) | 0x0A016054 +[gTextureLuigiFace09_end](@ref gTextureLuigiFace09_end) | 0x0A0153C4 [gTextureLuigiFace10_end](@ref gTextureLuigiFace10_end) | 0x0A016054 +[gTextureLuigiFace11](@ref gTextureLuigiFace11) | 0x0A016054 [gTextureLuigiFace11_end](@ref gTextureLuigiFace11_end) | 0x0A016D14 [gTextureLuigiFace12](@ref gTextureLuigiFace12) | 0x0A016D14 -[gTextureLuigiFace13](@ref gTextureLuigiFace13) | 0x0A017A44 [gTextureLuigiFace12_end](@ref gTextureLuigiFace12_end) | 0x0A017A44 +[gTextureLuigiFace13](@ref gTextureLuigiFace13) | 0x0A017A44 [gTextureLuigiFace14](@ref gTextureLuigiFace14) | 0x0A018770 [gTextureLuigiFace13_end](@ref gTextureLuigiFace13_end) | 0x0A018770 [gTextureLuigiFace15](@ref gTextureLuigiFace15) | 0x0A0194B8 @@ -18758,68 +18758,68 @@ Variable Name | Memory Address [gTextureLuigiFace16](@ref gTextureLuigiFace16) | 0x0A01A20C [gTextureLuigiFace16_end](@ref gTextureLuigiFace16_end) | 0x0A01AC44 [gTexturePeachFace00](@ref gTexturePeachFace00) | 0x0A01AC44 -[gTexturePeachFace01](@ref gTexturePeachFace01) | 0x0A01BAFC [gTexturePeachFace00_end](@ref gTexturePeachFace00_end) | 0x0A01BAFC +[gTexturePeachFace01](@ref gTexturePeachFace01) | 0x0A01BAFC [gTexturePeachFace01_end](@ref gTexturePeachFace01_end) | 0x0A01C9A8 [gTexturePeachFace02](@ref gTexturePeachFace02) | 0x0A01C9A8 -[gTexturePeachFace03](@ref gTexturePeachFace03) | 0x0A01D864 [gTexturePeachFace02_end](@ref gTexturePeachFace02_end) | 0x0A01D864 +[gTexturePeachFace03](@ref gTexturePeachFace03) | 0x0A01D864 [gTexturePeachFace04](@ref gTexturePeachFace04) | 0x0A01E71C [gTexturePeachFace03_end](@ref gTexturePeachFace03_end) | 0x0A01E71C -[gTexturePeachFace04_end](@ref gTexturePeachFace04_end) | 0x0A01F5A4 [gTexturePeachFace05](@ref gTexturePeachFace05) | 0x0A01F5A4 -[gTexturePeachFace05_end](@ref gTexturePeachFace05_end) | 0x0A020444 +[gTexturePeachFace04_end](@ref gTexturePeachFace04_end) | 0x0A01F5A4 [gTexturePeachFace06](@ref gTexturePeachFace06) | 0x0A020444 -[gTexturePeachFace06_end](@ref gTexturePeachFace06_end) | 0x0A02130C +[gTexturePeachFace05_end](@ref gTexturePeachFace05_end) | 0x0A020444 [gTexturePeachFace07](@ref gTexturePeachFace07) | 0x0A02130C -[gTexturePeachFace08](@ref gTexturePeachFace08) | 0x0A0221FC +[gTexturePeachFace06_end](@ref gTexturePeachFace06_end) | 0x0A02130C [gTexturePeachFace07_end](@ref gTexturePeachFace07_end) | 0x0A0221FC +[gTexturePeachFace08](@ref gTexturePeachFace08) | 0x0A0221FC [gTexturePeachFace08_end](@ref gTexturePeachFace08_end) | 0x0A02310C [gTexturePeachFace09](@ref gTexturePeachFace09) | 0x0A02310C [gTexturePeachFace09_end](@ref gTexturePeachFace09_end) | 0x0A0240C0 [gTexturePeachFace10](@ref gTexturePeachFace10) | 0x0A0240C0 -[gTexturePeachFace11](@ref gTexturePeachFace11) | 0x0A0250A4 [gTexturePeachFace10_end](@ref gTexturePeachFace10_end) | 0x0A0250A4 +[gTexturePeachFace11](@ref gTexturePeachFace11) | 0x0A0250A4 [gTexturePeachFace11_end](@ref gTexturePeachFace11_end) | 0x0A0260F0 [gTexturePeachFace12](@ref gTexturePeachFace12) | 0x0A0260F0 [gTexturePeachFace13](@ref gTexturePeachFace13) | 0x0A027128 [gTexturePeachFace12_end](@ref gTexturePeachFace12_end) | 0x0A027128 -[gTexturePeachFace13_end](@ref gTexturePeachFace13_end) | 0x0A02810C [gTexturePeachFace14](@ref gTexturePeachFace14) | 0x0A02810C -[gTexturePeachFace14_end](@ref gTexturePeachFace14_end) | 0x0A0290A0 +[gTexturePeachFace13_end](@ref gTexturePeachFace13_end) | 0x0A02810C [gTexturePeachFace15](@ref gTexturePeachFace15) | 0x0A0290A0 -[gTexturePeachFace16](@ref gTexturePeachFace16) | 0x0A02A028 +[gTexturePeachFace14_end](@ref gTexturePeachFace14_end) | 0x0A0290A0 [gTexturePeachFace15_end](@ref gTexturePeachFace15_end) | 0x0A02A028 +[gTexturePeachFace16](@ref gTexturePeachFace16) | 0x0A02A028 [gTexturePeachFace16_end](@ref gTexturePeachFace16_end) | 0x0A02AED0 [gTextureToadFace00](@ref gTextureToadFace00) | 0x0A02AED0 -[gTextureToadFace01](@ref gTextureToadFace01) | 0x0A02B88C [gTextureToadFace00_end](@ref gTextureToadFace00_end) | 0x0A02B88C +[gTextureToadFace01](@ref gTextureToadFace01) | 0x0A02B88C [gTextureToadFace02](@ref gTextureToadFace02) | 0x0A02C240 [gTextureToadFace01_end](@ref gTextureToadFace01_end) | 0x0A02C240 [gTextureToadFace02_end](@ref gTextureToadFace02_end) | 0x0A02CBFC [gTextureToadFace03](@ref gTextureToadFace03) | 0x0A02CBFC -[gTextureToadFace04](@ref gTextureToadFace04) | 0x0A02D5B4 [gTextureToadFace03_end](@ref gTextureToadFace03_end) | 0x0A02D5B4 -[gTextureToadFace04_end](@ref gTextureToadFace04_end) | 0x0A02DF70 +[gTextureToadFace04](@ref gTextureToadFace04) | 0x0A02D5B4 [gTextureToadFace05](@ref gTextureToadFace05) | 0x0A02DF70 +[gTextureToadFace04_end](@ref gTextureToadFace04_end) | 0x0A02DF70 [gTextureToadFace06](@ref gTextureToadFace06) | 0x0A02E910 [gTextureToadFace05_end](@ref gTextureToadFace05_end) | 0x0A02E910 [gTextureToadFace06_end](@ref gTextureToadFace06_end) | 0x0A02F2A8 [gTextureToadFace07](@ref gTextureToadFace07) | 0x0A02F2A8 [gTextureToadFace07_end](@ref gTextureToadFace07_end) | 0x0A02FC74 [gTextureToadFace08](@ref gTextureToadFace08) | 0x0A02FC74 -[gTextureToadFace08_end](@ref gTextureToadFace08_end) | 0x0A030628 [gTextureToadFace09](@ref gTextureToadFace09) | 0x0A030628 -[gTextureToadFace09_end](@ref gTextureToadFace09_end) | 0x0A031010 +[gTextureToadFace08_end](@ref gTextureToadFace08_end) | 0x0A030628 [gTextureToadFace10](@ref gTextureToadFace10) | 0x0A031010 -[gTextureToadFace10_end](@ref gTextureToadFace10_end) | 0x0A031A24 +[gTextureToadFace09_end](@ref gTextureToadFace09_end) | 0x0A031010 [gTextureToadFace11](@ref gTextureToadFace11) | 0x0A031A24 +[gTextureToadFace10_end](@ref gTextureToadFace10_end) | 0x0A031A24 [gTextureToadFace12](@ref gTextureToadFace12) | 0x0A03247C [gTextureToadFace11_end](@ref gTextureToadFace11_end) | 0x0A03247C [gTextureToadFace13](@ref gTextureToadFace13) | 0x0A032EDC [gTextureToadFace12_end](@ref gTextureToadFace12_end) | 0x0A032EDC -[gTextureToadFace13_end](@ref gTextureToadFace13_end) | 0x0A03395C [gTextureToadFace14](@ref gTextureToadFace14) | 0x0A03395C +[gTextureToadFace13_end](@ref gTextureToadFace13_end) | 0x0A03395C [gTextureToadFace15](@ref gTextureToadFace15) | 0x0A0343D0 [gTextureToadFace14_end](@ref gTextureToadFace14_end) | 0x0A0343D0 [gTextureToadFace15_end](@ref gTextureToadFace15_end) | 0x0A034E30 @@ -18828,94 +18828,94 @@ Variable Name | Memory Address [gTextureToadFace16_end](@ref gTextureToadFace16_end) | 0x0A035794 [gTextureYoshiFace00_end](@ref gTextureYoshiFace00_end) | 0x0A036280 [gTextureYoshiFace01](@ref gTextureYoshiFace01) | 0x0A036280 -[gTextureYoshiFace02](@ref gTextureYoshiFace02) | 0x0A036D64 [gTextureYoshiFace01_end](@ref gTextureYoshiFace01_end) | 0x0A036D64 -[gTextureYoshiFace03](@ref gTextureYoshiFace03) | 0x0A037844 +[gTextureYoshiFace02](@ref gTextureYoshiFace02) | 0x0A036D64 [gTextureYoshiFace02_end](@ref gTextureYoshiFace02_end) | 0x0A037844 +[gTextureYoshiFace03](@ref gTextureYoshiFace03) | 0x0A037844 [gTextureYoshiFace04](@ref gTextureYoshiFace04) | 0x0A0382F8 [gTextureYoshiFace03_end](@ref gTextureYoshiFace03_end) | 0x0A0382F8 [gTextureYoshiFace04_end](@ref gTextureYoshiFace04_end) | 0x0A038D68 [gTextureYoshiFace05](@ref gTextureYoshiFace05) | 0x0A038D68 [gTextureYoshiFace05_end](@ref gTextureYoshiFace05_end) | 0x0A0397B0 [gTextureYoshiFace06](@ref gTextureYoshiFace06) | 0x0A0397B0 -[gTextureYoshiFace06_end](@ref gTextureYoshiFace06_end) | 0x0A03A2D4 [gTextureYoshiFace07](@ref gTextureYoshiFace07) | 0x0A03A2D4 -[gTextureYoshiFace07_end](@ref gTextureYoshiFace07_end) | 0x0A03AD00 +[gTextureYoshiFace06_end](@ref gTextureYoshiFace06_end) | 0x0A03A2D4 [gTextureYoshiFace08](@ref gTextureYoshiFace08) | 0x0A03AD00 -[gTextureYoshiFace09](@ref gTextureYoshiFace09) | 0x0A03B6BC +[gTextureYoshiFace07_end](@ref gTextureYoshiFace07_end) | 0x0A03AD00 [gTextureYoshiFace08_end](@ref gTextureYoshiFace08_end) | 0x0A03B6BC -[gTextureYoshiFace10](@ref gTextureYoshiFace10) | 0x0A03C068 +[gTextureYoshiFace09](@ref gTextureYoshiFace09) | 0x0A03B6BC [gTextureYoshiFace09_end](@ref gTextureYoshiFace09_end) | 0x0A03C068 -[gTextureYoshiFace11](@ref gTextureYoshiFace11) | 0x0A03CA28 +[gTextureYoshiFace10](@ref gTextureYoshiFace10) | 0x0A03C068 [gTextureYoshiFace10_end](@ref gTextureYoshiFace10_end) | 0x0A03CA28 -[gTextureYoshiFace11_end](@ref gTextureYoshiFace11_end) | 0x0A03D438 +[gTextureYoshiFace11](@ref gTextureYoshiFace11) | 0x0A03CA28 [gTextureYoshiFace12](@ref gTextureYoshiFace12) | 0x0A03D438 -[gTextureYoshiFace12_end](@ref gTextureYoshiFace12_end) | 0x0A03DE94 +[gTextureYoshiFace11_end](@ref gTextureYoshiFace11_end) | 0x0A03D438 [gTextureYoshiFace13](@ref gTextureYoshiFace13) | 0x0A03DE94 +[gTextureYoshiFace12_end](@ref gTextureYoshiFace12_end) | 0x0A03DE94 [gTextureYoshiFace14](@ref gTextureYoshiFace14) | 0x0A03E974 [gTextureYoshiFace13_end](@ref gTextureYoshiFace13_end) | 0x0A03E974 -[gTextureYoshiFace15](@ref gTextureYoshiFace15) | 0x0A03F47C [gTextureYoshiFace14_end](@ref gTextureYoshiFace14_end) | 0x0A03F47C +[gTextureYoshiFace15](@ref gTextureYoshiFace15) | 0x0A03F47C [gTextureYoshiFace15_end](@ref gTextureYoshiFace15_end) | 0x0A03FF94 [gTextureYoshiFace16](@ref gTextureYoshiFace16) | 0x0A03FF94 [gTextureYoshiFace16_end](@ref gTextureYoshiFace16_end) | 0x0A040ABC [gTextureDkFace00](@ref gTextureDkFace00) | 0x0A040ABC -[gTextureDkFace01](@ref gTextureDkFace01) | 0x0A0418A8 [gTextureDkFace00_end](@ref gTextureDkFace00_end) | 0x0A0418A8 -[gTextureDkFace01_end](@ref gTextureDkFace01_end) | 0x0A0426B0 +[gTextureDkFace01](@ref gTextureDkFace01) | 0x0A0418A8 [gTextureDkFace02](@ref gTextureDkFace02) | 0x0A0426B0 -[gTextureDkFace02_end](@ref gTextureDkFace02_end) | 0x0A043490 +[gTextureDkFace01_end](@ref gTextureDkFace01_end) | 0x0A0426B0 [gTextureDkFace03](@ref gTextureDkFace03) | 0x0A043490 -[gTextureDkFace03_end](@ref gTextureDkFace03_end) | 0x0A044240 +[gTextureDkFace02_end](@ref gTextureDkFace02_end) | 0x0A043490 [gTextureDkFace04](@ref gTextureDkFace04) | 0x0A044240 +[gTextureDkFace03_end](@ref gTextureDkFace03_end) | 0x0A044240 [gTextureDkFace05](@ref gTextureDkFace05) | 0x0A044FE8 [gTextureDkFace04_end](@ref gTextureDkFace04_end) | 0x0A044FE8 -[gTextureDkFace06](@ref gTextureDkFace06) | 0x0A045DCC [gTextureDkFace05_end](@ref gTextureDkFace05_end) | 0x0A045DCC +[gTextureDkFace06](@ref gTextureDkFace06) | 0x0A045DCC [gTextureDkFace06_end](@ref gTextureDkFace06_end) | 0x0A046BF8 [gTextureDkFace07](@ref gTextureDkFace07) | 0x0A046BF8 -[gTextureDkFace08](@ref gTextureDkFace08) | 0x0A047A8C [gTextureDkFace07_end](@ref gTextureDkFace07_end) | 0x0A047A8C -[gTextureDkFace09](@ref gTextureDkFace09) | 0x0A048968 +[gTextureDkFace08](@ref gTextureDkFace08) | 0x0A047A8C [gTextureDkFace08_end](@ref gTextureDkFace08_end) | 0x0A048968 +[gTextureDkFace09](@ref gTextureDkFace09) | 0x0A048968 [gTextureDkFace10](@ref gTextureDkFace10) | 0x0A0498B0 [gTextureDkFace09_end](@ref gTextureDkFace09_end) | 0x0A0498B0 [gTextureDkFace10_end](@ref gTextureDkFace10_end) | 0x0A04A7E8 [gTextureDkFace11](@ref gTextureDkFace11) | 0x0A04A7E8 -[gTextureDkFace12](@ref gTextureDkFace12) | 0x0A04B76C [gTextureDkFace11_end](@ref gTextureDkFace11_end) | 0x0A04B76C +[gTextureDkFace12](@ref gTextureDkFace12) | 0x0A04B76C [gTextureDkFace13](@ref gTextureDkFace13) | 0x0A04C770 [gTextureDkFace12_end](@ref gTextureDkFace12_end) | 0x0A04C770 [gTextureDkFace13_end](@ref gTextureDkFace13_end) | 0x0A04D730 [gTextureDkFace14](@ref gTextureDkFace14) | 0x0A04D730 -[gTextureDkFace15](@ref gTextureDkFace15) | 0x0A04E67C [gTextureDkFace14_end](@ref gTextureDkFace14_end) | 0x0A04E67C -[gTextureDkFace15_end](@ref gTextureDkFace15_end) | 0x0A04F57C +[gTextureDkFace15](@ref gTextureDkFace15) | 0x0A04E67C [gTextureDkFace16](@ref gTextureDkFace16) | 0x0A04F57C -[gTextureWarioFace00](@ref gTextureWarioFace00) | 0x0A0504D0 +[gTextureDkFace15_end](@ref gTextureDkFace15_end) | 0x0A04F57C [gTextureDkFace16_end](@ref gTextureDkFace16_end) | 0x0A0504D0 -[gTextureWarioFace00_end](@ref gTextureWarioFace00_end) | 0x0A051630 +[gTextureWarioFace00](@ref gTextureWarioFace00) | 0x0A0504D0 [gTextureWarioFace01](@ref gTextureWarioFace01) | 0x0A051630 +[gTextureWarioFace00_end](@ref gTextureWarioFace00_end) | 0x0A051630 [gTextureWarioFace01_end](@ref gTextureWarioFace01_end) | 0x0A052774 [gTextureWarioFace02](@ref gTextureWarioFace02) | 0x0A052774 [gTextureWarioFace03](@ref gTextureWarioFace03) | 0x0A0538C8 [gTextureWarioFace02_end](@ref gTextureWarioFace02_end) | 0x0A0538C8 -[gTextureWarioFace03_end](@ref gTextureWarioFace03_end) | 0x0A054A30 [gTextureWarioFace04](@ref gTextureWarioFace04) | 0x0A054A30 +[gTextureWarioFace03_end](@ref gTextureWarioFace03_end) | 0x0A054A30 [gTextureWarioFace05](@ref gTextureWarioFace05) | 0x0A055B84 [gTextureWarioFace04_end](@ref gTextureWarioFace04_end) | 0x0A055B84 [gTextureWarioFace05_end](@ref gTextureWarioFace05_end) | 0x0A056CE0 [gTextureWarioFace06](@ref gTextureWarioFace06) | 0x0A056CE0 -[gTextureWarioFace07](@ref gTextureWarioFace07) | 0x0A057E54 [gTextureWarioFace06_end](@ref gTextureWarioFace06_end) | 0x0A057E54 -[gTextureWarioFace08](@ref gTextureWarioFace08) | 0x0A05902C +[gTextureWarioFace07](@ref gTextureWarioFace07) | 0x0A057E54 [gTextureWarioFace07_end](@ref gTextureWarioFace07_end) | 0x0A05902C +[gTextureWarioFace08](@ref gTextureWarioFace08) | 0x0A05902C [gTextureWarioFace09](@ref gTextureWarioFace09) | 0x0A05A254 [gTextureWarioFace08_end](@ref gTextureWarioFace08_end) | 0x0A05A254 [gTextureWarioFace09_end](@ref gTextureWarioFace09_end) | 0x0A05B4C0 [gTextureWarioFace10](@ref gTextureWarioFace10) | 0x0A05B4C0 -[gTextureWarioFace10_end](@ref gTextureWarioFace10_end) | 0x0A05C7A0 [gTextureWarioFace11](@ref gTextureWarioFace11) | 0x0A05C7A0 +[gTextureWarioFace10_end](@ref gTextureWarioFace10_end) | 0x0A05C7A0 [gTextureWarioFace11_end](@ref gTextureWarioFace11_end) | 0x0A05DAA8 [gTextureWarioFace12](@ref gTextureWarioFace12) | 0x0A05DAA8 [gTextureWarioFace12_end](@ref gTextureWarioFace12_end) | 0x0A05ED8C @@ -18924,34 +18924,34 @@ Variable Name | Memory Address [gTextureWarioFace14](@ref gTextureWarioFace14) | 0x0A0600B0 [gTextureWarioFace14_end](@ref gTextureWarioFace14_end) | 0x0A06139C [gTextureWarioFace15](@ref gTextureWarioFace15) | 0x0A06139C -[gTextureWarioFace15_end](@ref gTextureWarioFace15_end) | 0x0A062668 [gTextureWarioFace16](@ref gTextureWarioFace16) | 0x0A062668 +[gTextureWarioFace15_end](@ref gTextureWarioFace15_end) | 0x0A062668 [gTextureWarioFace16_end](@ref gTextureWarioFace16_end) | 0x0A0637E0 [gTextureBowserFace00](@ref gTextureBowserFace00) | 0x0A0637E0 [gTextureBowserFace00_end](@ref gTextureBowserFace00_end) | 0x0A064AC8 [gTextureBowserFace01](@ref gTextureBowserFace01) | 0x0A064AC8 -[gTextureBowserFace02](@ref gTextureBowserFace02) | 0x0A065D7C [gTextureBowserFace01_end](@ref gTextureBowserFace01_end) | 0x0A065D7C -[gTextureBowserFace03](@ref gTextureBowserFace03) | 0x0A067044 +[gTextureBowserFace02](@ref gTextureBowserFace02) | 0x0A065D7C [gTextureBowserFace02_end](@ref gTextureBowserFace02_end) | 0x0A067044 +[gTextureBowserFace03](@ref gTextureBowserFace03) | 0x0A067044 [gTextureBowserFace03_end](@ref gTextureBowserFace03_end) | 0x0A068310 [gTextureBowserFace04](@ref gTextureBowserFace04) | 0x0A068310 -[gTextureBowserFace04_end](@ref gTextureBowserFace04_end) | 0x0A0695B4 [gTextureBowserFace05](@ref gTextureBowserFace05) | 0x0A0695B4 +[gTextureBowserFace04_end](@ref gTextureBowserFace04_end) | 0x0A0695B4 [gTextureBowserFace06](@ref gTextureBowserFace06) | 0x0A06A840 [gTextureBowserFace05_end](@ref gTextureBowserFace05_end) | 0x0A06A840 -[gTextureBowserFace06_end](@ref gTextureBowserFace06_end) | 0x0A06BB1C [gTextureBowserFace07](@ref gTextureBowserFace07) | 0x0A06BB1C +[gTextureBowserFace06_end](@ref gTextureBowserFace06_end) | 0x0A06BB1C [gTextureBowserFace08](@ref gTextureBowserFace08) | 0x0A06CE04 [gTextureBowserFace07_end](@ref gTextureBowserFace07_end) | 0x0A06CE04 -[gTextureBowserFace09](@ref gTextureBowserFace09) | 0x0A06E0F4 [gTextureBowserFace08_end](@ref gTextureBowserFace08_end) | 0x0A06E0F4 +[gTextureBowserFace09](@ref gTextureBowserFace09) | 0x0A06E0F4 [gTextureBowserFace09_end](@ref gTextureBowserFace09_end) | 0x0A06F410 [gTextureBowserFace10](@ref gTextureBowserFace10) | 0x0A06F410 [gTextureBowserFace10_end](@ref gTextureBowserFace10_end) | 0x0A0706DC [gTextureBowserFace11](@ref gTextureBowserFace11) | 0x0A0706DC -[gTextureBowserFace11_end](@ref gTextureBowserFace11_end) | 0x0A071A18 [gTextureBowserFace12](@ref gTextureBowserFace12) | 0x0A071A18 +[gTextureBowserFace11_end](@ref gTextureBowserFace11_end) | 0x0A071A18 [gTextureBowserFace13](@ref gTextureBowserFace13) | 0x0A072DBC [gTextureBowserFace12_end](@ref gTextureBowserFace12_end) | 0x0A072DBC [gTextureBowserFace14](@ref gTextureBowserFace14) | 0x0A074138 @@ -18986,12 +18986,12 @@ Variable Name | Memory Address [gTextureTrophySilver](@ref gTextureTrophySilver) | 0x0A0AEFEC [gTextureTrophySilver_end](@ref gTextureTrophySilver_end) | 0x0A0AF614 [gTextureTrophyBronze](@ref gTextureTrophyBronze) | 0x0A0AF614 -[gTextureCupGold](@ref gTextureCupGold) | 0x0A0AFC00 [gTextureTrophyBronze_end](@ref gTextureTrophyBronze_end) | 0x0A0AFC00 +[gTextureCupGold](@ref gTextureCupGold) | 0x0A0AFC00 [gTextureCupSilver](@ref gTextureCupSilver) | 0x0A0B058C [gTextureCupGold_end](@ref gTextureCupGold_end) | 0x0A0B058C -[gTextureCupBronze](@ref gTextureCupBronze) | 0x0A0B0F10 [gTextureCupSilver_end](@ref gTextureCupSilver_end) | 0x0A0B0F10 +[gTextureCupBronze](@ref gTextureCupBronze) | 0x0A0B0F10 [gTextureCupBronze_end](@ref gTextureCupBronze_end) | 0x0A0B17B4 [gTexturePushStartButton](@ref gTexturePushStartButton) | 0x0A0B17B4 [gTextureCopyright1996](@ref gTextureCopyright1996) | 0x0A0B2B94 @@ -19003,16 +19003,16 @@ Variable Name | Memory Address [gTexture7E56E4](@ref gTexture7E56E4) | 0x0A0BBCB4 [gTexture7E56E4_end](@ref gTexture7E56E4_end) | 0x0A0BCE1F [gTextureSmallFont0](@ref gTextureSmallFont0) | 0x0A0BCE20 -[gTextureSmallFont1](@ref gTextureSmallFont1) | 0x0A0BCEB0 [gTextureSmallFont0_end](@ref gTextureSmallFont0_end) | 0x0A0BCEB0 +[gTextureSmallFont1](@ref gTextureSmallFont1) | 0x0A0BCEB0 [gTextureSmallFont2](@ref gTextureSmallFont2) | 0x0A0BCF08 [gTextureSmallFont1_end](@ref gTextureSmallFont1_end) | 0x0A0BCF08 -[gTextureSmallFont2_end](@ref gTextureSmallFont2_end) | 0x0A0BCFA0 [gTextureSmallFont3](@ref gTextureSmallFont3) | 0x0A0BCFA0 +[gTextureSmallFont2_end](@ref gTextureSmallFont2_end) | 0x0A0BCFA0 [gTextureSmallFont3_end](@ref gTextureSmallFont3_end) | 0x0A0BD034 [gTextureSmallFont4](@ref gTextureSmallFont4) | 0x0A0BD034 -[gTextureSmallFont5](@ref gTextureSmallFont5) | 0x0A0BD0BC [gTextureSmallFont4_end](@ref gTextureSmallFont4_end) | 0x0A0BD0BC +[gTextureSmallFont5](@ref gTextureSmallFont5) | 0x0A0BD0BC [gTextureSmallFont6](@ref gTextureSmallFont6) | 0x0A0BD154 [gTextureSmallFont5_end](@ref gTextureSmallFont5_end) | 0x0A0BD154 [gTextureSmallFont6_end](@ref gTextureSmallFont6_end) | 0x0A0BD1F0 @@ -19021,52 +19021,52 @@ Variable Name | Memory Address [gTextureSmallFont7_end](@ref gTextureSmallFont7_end) | 0x0A0BD260 [gTextureSmallFont9](@ref gTextureSmallFont9) | 0x0A0BD2F0 [gTextureSmallFont8_end](@ref gTextureSmallFont8_end) | 0x0A0BD2F0 -[gTextureSmallFont9_end](@ref gTextureSmallFont9_end) | 0x0A0BD390 [gTextureN64ControllerPakDataSelect](@ref gTextureN64ControllerPakDataSelect) | 0x0A0BD390 -[gTextureN64ControllerPakDataSelect_end](@ref gTextureN64ControllerPakDataSelect_end) | 0x0A0BE4B8 +[gTextureSmallFont9_end](@ref gTextureSmallFont9_end) | 0x0A0BD390 [gTextureEraseDataRecordConfirmation](@ref gTextureEraseDataRecordConfirmation) | 0x0A0BE4B8 +[gTextureN64ControllerPakDataSelect_end](@ref gTextureN64ControllerPakDataSelect_end) | 0x0A0BE4B8 [gTextureEraseDataRecordConfirmation_end](@ref gTextureEraseDataRecordConfirmation_end) | 0x0A0BF4AC [gTextureRecordNotErased](@ref gTextureRecordNotErased) | 0x0A0BF4AC -[gTextureRecordNotErased_end](@ref gTextureRecordNotErased_end) | 0x0A0BFD7C [gTexturePlaceN64ControllerPakIntoController1](@ref gTexturePlaceN64ControllerPakIntoController1) | 0x0A0BFD7C -[gTexturePlaceN64ControllerPakIntoController1_end](@ref gTexturePlaceN64ControllerPakIntoController1_end) | 0x0A0C09C8 +[gTextureRecordNotErased_end](@ref gTextureRecordNotErased_end) | 0x0A0BFD7C [gTexturePleaseReinsertOriginalN64ControllerPak](@ref gTexturePleaseReinsertOriginalN64ControllerPak) | 0x0A0C09C8 -[gTextureErasingSelectedRecord](@ref gTextureErasingSelectedRecord) | 0x0A0C16A0 +[gTexturePlaceN64ControllerPakIntoController1_end](@ref gTexturePlaceN64ControllerPakIntoController1_end) | 0x0A0C09C8 [gTexturePleaseReinsertOriginalN64ControllerPak_end](@ref gTexturePleaseReinsertOriginalN64ControllerPak_end) | 0x0A0C16A0 +[gTextureErasingSelectedRecord](@ref gTextureErasingSelectedRecord) | 0x0A0C16A0 [gTextureSelectRecord](@ref gTextureSelectRecord) | 0x0A0C22A4 [gTextureErasingSelectedRecord_end](@ref gTextureErasingSelectedRecord_end) | 0x0A0C22A4 [gTextureTextEnd](@ref gTextureTextEnd) | 0x0A0C261C [gTextureSelectRecord_end](@ref gTextureSelectRecord_end) | 0x0A0C261C -[gTextureTableOfContents](@ref gTextureTableOfContents) | 0x0A0C274C [gTextureTextEnd_end](@ref gTextureTextEnd_end) | 0x0A0C274C -[gTextureTextHash](@ref gTextureTextHash) | 0x0A0C2B78 +[gTextureTableOfContents](@ref gTextureTableOfContents) | 0x0A0C274C [gTextureTableOfContents_end](@ref gTextureTableOfContents_end) | 0x0A0C2B78 +[gTextureTextHash](@ref gTextureTextHash) | 0x0A0C2B78 [gTextureTextHash_end](@ref gTextureTextHash_end) | 0x0A0C2BF8 [gTextureTextGameData](@ref gTextureTextGameData) | 0x0A0C2BF8 -[gTextureTextGameData_end](@ref gTextureTextGameData_end) | 0x0A0C2EBC [gTextureTextPages](@ref gTextureTextPages) | 0x0A0C2EBC -[gTextureTextPages_end](@ref gTextureTextPages_end) | 0x0A0C307C +[gTextureTextGameData_end](@ref gTextureTextGameData_end) | 0x0A0C2EBC [gTextureTextPagesFree](@ref gTextureTextPagesFree) | 0x0A0C307C +[gTextureTextPages_end](@ref gTextureTextPages_end) | 0x0A0C307C [gTextureTextPagesFree_end](@ref gTextureTextPagesFree_end) | 0x0A0C3340 [gTextureTextErase](@ref gTextureTextErase) | 0x0A0C3340 -[gTextureTextQuit](@ref gTextureTextQuit) | 0x0A0C34E0 [gTextureTextErase_end](@ref gTextureTextErase_end) | 0x0A0C34E0 +[gTextureTextQuit](@ref gTextureTextQuit) | 0x0A0C34E0 [gTextureTextQuit_end](@ref gTextureTextQuit_end) | 0x0A0C3628 [gTexture7ED058](@ref gTexture7ED058) | 0x0A0C3628 [gTexture7ED290](@ref gTexture7ED290) | 0x0A0C3860 [gTexture7ED058_end](@ref gTexture7ED058_end) | 0x0A0C3860 [gTexture7ED50C](@ref gTexture7ED50C) | 0x0A0C3ADC [gTexture7ED290_end](@ref gTexture7ED290_end) | 0x0A0C3ADC -[gTexture7ED50C_end](@ref gTexture7ED50C_end) | 0x0A0C3C74 [gTexture7ED6A4](@ref gTexture7ED6A4) | 0x0A0C3C74 -[gTexture7ED6A4_end](@ref gTexture7ED6A4_end) | 0x0A0C4004 +[gTexture7ED50C_end](@ref gTexture7ED50C_end) | 0x0A0C3C74 [gTextureTinyFont0](@ref gTextureTinyFont0) | 0x0A0C4004 +[gTexture7ED6A4_end](@ref gTexture7ED6A4_end) | 0x0A0C4004 [gTextureTinyFont0_end](@ref gTextureTinyFont0_end) | 0x0A0C4078 [gTextureTinyFont1](@ref gTextureTinyFont1) | 0x0A0C4078 [gTextureTinyFont1_end](@ref gTextureTinyFont1_end) | 0x0A0C40C0 [gTextureTinyFont2](@ref gTextureTinyFont2) | 0x0A0C40C0 -[gTextureTinyFont2_end](@ref gTextureTinyFont2_end) | 0x0A0C4134 [gTextureTinyFont3](@ref gTextureTinyFont3) | 0x0A0C4134 +[gTextureTinyFont2_end](@ref gTextureTinyFont2_end) | 0x0A0C4134 [gTextureTinyFont3_end](@ref gTextureTinyFont3_end) | 0x0A0C41A4 [gTextureTinyFont4](@ref gTextureTinyFont4) | 0x0A0C41A4 [gTextureTinyFont5](@ref gTextureTinyFont5) | 0x0A0C4200 @@ -19077,70 +19077,70 @@ Variable Name | Memory Address [gTextureTinyFont7](@ref gTextureTinyFont7) | 0x0A0C42E8 [gTextureTinyFont8](@ref gTextureTinyFont8) | 0x0A0C4348 [gTextureTinyFont7_end](@ref gTextureTinyFont7_end) | 0x0A0C4348 -[gTextureTinyFont8_end](@ref gTextureTinyFont8_end) | 0x0A0C43C0 [gTextureTinyFont9](@ref gTextureTinyFont9) | 0x0A0C43C0 -[gTextureTinyFontA](@ref gTextureTinyFontA) | 0x0A0C4434 +[gTextureTinyFont8_end](@ref gTextureTinyFont8_end) | 0x0A0C43C0 [gTextureTinyFont9_end](@ref gTextureTinyFont9_end) | 0x0A0C4434 +[gTextureTinyFontA](@ref gTextureTinyFontA) | 0x0A0C4434 [gTextureTinyFontA_end](@ref gTextureTinyFontA_end) | 0x0A0C44A0 [gTextureTinyFontB](@ref gTextureTinyFontB) | 0x0A0C44A0 [gTextureTinyFontC](@ref gTextureTinyFontC) | 0x0A0C451C [gTextureTinyFontB_end](@ref gTextureTinyFontB_end) | 0x0A0C451C [gTextureTinyFontD](@ref gTextureTinyFontD) | 0x0A0C4590 [gTextureTinyFontC_end](@ref gTextureTinyFontC_end) | 0x0A0C4590 -[gTextureTinyFontD_end](@ref gTextureTinyFontD_end) | 0x0A0C4600 [gTextureTinyFontE](@ref gTextureTinyFontE) | 0x0A0C4600 -[gTextureTinyFontE_end](@ref gTextureTinyFontE_end) | 0x0A0C4674 +[gTextureTinyFontD_end](@ref gTextureTinyFontD_end) | 0x0A0C4600 [gTextureTinyFontF](@ref gTextureTinyFontF) | 0x0A0C4674 -[gTextureTinyFontF_end](@ref gTextureTinyFontF_end) | 0x0A0C46D8 +[gTextureTinyFontE_end](@ref gTextureTinyFontE_end) | 0x0A0C4674 [gTextureTinyFontG](@ref gTextureTinyFontG) | 0x0A0C46D8 -[gTextureTinyFontG_end](@ref gTextureTinyFontG_end) | 0x0A0C474C +[gTextureTinyFontF_end](@ref gTextureTinyFontF_end) | 0x0A0C46D8 [gTextureTinyFontH](@ref gTextureTinyFontH) | 0x0A0C474C -[gTextureTinyFontI](@ref gTextureTinyFontI) | 0x0A0C47C4 +[gTextureTinyFontG_end](@ref gTextureTinyFontG_end) | 0x0A0C474C [gTextureTinyFontH_end](@ref gTextureTinyFontH_end) | 0x0A0C47C4 -[gTextureTinyFontJ](@ref gTextureTinyFontJ) | 0x0A0C480C +[gTextureTinyFontI](@ref gTextureTinyFontI) | 0x0A0C47C4 [gTextureTinyFontI_end](@ref gTextureTinyFontI_end) | 0x0A0C480C +[gTextureTinyFontJ](@ref gTextureTinyFontJ) | 0x0A0C480C [gTextureTinyFontK](@ref gTextureTinyFontK) | 0x0A0C4860 [gTextureTinyFontJ_end](@ref gTextureTinyFontJ_end) | 0x0A0C4860 -[gTextureTinyFontK_end](@ref gTextureTinyFontK_end) | 0x0A0C48D0 [gTextureTinyFontL](@ref gTextureTinyFontL) | 0x0A0C48D0 -[gTextureTinyFontL_end](@ref gTextureTinyFontL_end) | 0x0A0C491C +[gTextureTinyFontK_end](@ref gTextureTinyFontK_end) | 0x0A0C48D0 [gTextureTinyFontM](@ref gTextureTinyFontM) | 0x0A0C491C -[gTextureTinyFontM_end](@ref gTextureTinyFontM_end) | 0x0A0C4998 +[gTextureTinyFontL_end](@ref gTextureTinyFontL_end) | 0x0A0C491C [gTextureTinyFontN](@ref gTextureTinyFontN) | 0x0A0C4998 -[gTextureTinyFontO](@ref gTextureTinyFontO) | 0x0A0C4A14 +[gTextureTinyFontM_end](@ref gTextureTinyFontM_end) | 0x0A0C4998 [gTextureTinyFontN_end](@ref gTextureTinyFontN_end) | 0x0A0C4A14 -[gTextureTinyFontO_end](@ref gTextureTinyFontO_end) | 0x0A0C4A8C +[gTextureTinyFontO](@ref gTextureTinyFontO) | 0x0A0C4A14 [gTextureTinyFontP](@ref gTextureTinyFontP) | 0x0A0C4A8C -[gTextureTinyFontQ](@ref gTextureTinyFontQ) | 0x0A0C4AF8 +[gTextureTinyFontO_end](@ref gTextureTinyFontO_end) | 0x0A0C4A8C [gTextureTinyFontP_end](@ref gTextureTinyFontP_end) | 0x0A0C4AF8 +[gTextureTinyFontQ](@ref gTextureTinyFontQ) | 0x0A0C4AF8 [gTextureTinyFontQ_end](@ref gTextureTinyFontQ_end) | 0x0A0C4B70 [gTextureTinyFontR](@ref gTextureTinyFontR) | 0x0A0C4B70 [gTextureTinyFontR_end](@ref gTextureTinyFontR_end) | 0x0A0C4BE4 [gTextureTinyFontS](@ref gTextureTinyFontS) | 0x0A0C4BE4 -[gTextureTinyFontT](@ref gTextureTinyFontT) | 0x0A0C4C54 [gTextureTinyFontS_end](@ref gTextureTinyFontS_end) | 0x0A0C4C54 +[gTextureTinyFontT](@ref gTextureTinyFontT) | 0x0A0C4C54 [gTextureTinyFontU](@ref gTextureTinyFontU) | 0x0A0C4CA8 [gTextureTinyFontT_end](@ref gTextureTinyFontT_end) | 0x0A0C4CA8 -[gTextureTinyFontU_end](@ref gTextureTinyFontU_end) | 0x0A0C4D0C [gTextureTinyFontV](@ref gTextureTinyFontV) | 0x0A0C4D0C +[gTextureTinyFontU_end](@ref gTextureTinyFontU_end) | 0x0A0C4D0C [gTextureTinyFontW](@ref gTextureTinyFontW) | 0x0A0C4D6C [gTextureTinyFontV_end](@ref gTextureTinyFontV_end) | 0x0A0C4D6C -[gTextureTinyFontW_end](@ref gTextureTinyFontW_end) | 0x0A0C4DE8 [gTextureTinyFontX](@ref gTextureTinyFontX) | 0x0A0C4DE8 +[gTextureTinyFontW_end](@ref gTextureTinyFontW_end) | 0x0A0C4DE8 [gTextureTinyFontX_end](@ref gTextureTinyFontX_end) | 0x0A0C4E54 [gTextureTinyFontY](@ref gTextureTinyFontY) | 0x0A0C4E54 [gTextureTinyFontY_end](@ref gTextureTinyFontY_end) | 0x0A0C4EA4 [gTextureTinyFontZ](@ref gTextureTinyFontZ) | 0x0A0C4EA4 -[gTextureTinyFontZ_end](@ref gTextureTinyFontZ_end) | 0x0A0C4F0C [gTextureTinyFontExclamationMark](@ref gTextureTinyFontExclamationMark) | 0x0A0C4F0C +[gTextureTinyFontZ_end](@ref gTextureTinyFontZ_end) | 0x0A0C4F0C [gTextureTinyFontDoubleQuote](@ref gTextureTinyFontDoubleQuote) | 0x0A0C4F54 [gTextureTinyFontExclamationMark_end](@ref gTextureTinyFontExclamationMark_end) | 0x0A0C4F54 -[gTextureTinyFontHash](@ref gTextureTinyFontHash) | 0x0A0C4F8C [gTextureTinyFontDoubleQuote_end](@ref gTextureTinyFontDoubleQuote_end) | 0x0A0C4F8C +[gTextureTinyFontHash](@ref gTextureTinyFontHash) | 0x0A0C4F8C [gTextureTinyFontHash_end](@ref gTextureTinyFontHash_end) | 0x0A0C4FFC [gTextureTinyFontSingleQuote](@ref gTextureTinyFontSingleQuote) | 0x0A0C4FFC -[gTextureTinyFontSingleQuote_end](@ref gTextureTinyFontSingleQuote_end) | 0x0A0C502C [gTextureTinyFontAsterisk](@ref gTextureTinyFontAsterisk) | 0x0A0C502C +[gTextureTinyFontSingleQuote_end](@ref gTextureTinyFontSingleQuote_end) | 0x0A0C502C [gTextureTinyFontPlus](@ref gTextureTinyFontPlus) | 0x0A0C5098 [gTextureTinyFontAsterisk_end](@ref gTextureTinyFontAsterisk_end) | 0x0A0C5098 [gTextureTinyFontPlus_end](@ref gTextureTinyFontPlus_end) | 0x0A0C50E8 @@ -19151,60 +19151,60 @@ Variable Name | Memory Address [gTextureTinyFontMinus_end](@ref gTextureTinyFontMinus_end) | 0x0A0C514C [gTextureTinyFontForwardSlash](@ref gTextureTinyFontForwardSlash) | 0x0A0C517C [gTextureTinyFontComma_end](@ref gTextureTinyFontComma_end) | 0x0A0C517C -[gTextureTinyFontColon](@ref gTextureTinyFontColon) | 0x0A0C51CC [gTextureTinyFontForwardSlash_end](@ref gTextureTinyFontForwardSlash_end) | 0x0A0C51CC -[gTexture7EEC34](@ref gTexture7EEC34) | 0x0A0C5204 +[gTextureTinyFontColon](@ref gTextureTinyFontColon) | 0x0A0C51CC [gTextureTinyFontColon_end](@ref gTextureTinyFontColon_end) | 0x0A0C5204 -[gTexture7EEC34_end](@ref gTexture7EEC34_end) | 0x0A0C5254 +[gTexture7EEC34](@ref gTexture7EEC34) | 0x0A0C5204 [gTextureTinyFontQuestion](@ref gTextureTinyFontQuestion) | 0x0A0C5254 -[gTextureTinyFontQuestion_end](@ref gTextureTinyFontQuestion_end) | 0x0A0C52B4 +[gTexture7EEC34_end](@ref gTexture7EEC34_end) | 0x0A0C5254 [gTexture7EECE4](@ref gTexture7EECE4) | 0x0A0C52B4 +[gTextureTinyFontQuestion_end](@ref gTextureTinyFontQuestion_end) | 0x0A0C52B4 [gTexture7EECE4_end](@ref gTexture7EECE4_end) | 0x0A0C5344 [gTexture7EED74](@ref gTexture7EED74) | 0x0A0C5344 -[gTexture7EEDB0](@ref gTexture7EEDB0) | 0x0A0C5380 [gTexture7EED74_end](@ref gTexture7EED74_end) | 0x0A0C5380 -[gTexture7EEDE8](@ref gTexture7EEDE8) | 0x0A0C53B8 +[gTexture7EEDB0](@ref gTexture7EEDB0) | 0x0A0C5380 [gTexture7EEDB0_end](@ref gTexture7EEDB0_end) | 0x0A0C53B8 -[gTexture7EEDE8_end](@ref gTexture7EEDE8_end) | 0x0A0C53F0 +[gTexture7EEDE8](@ref gTexture7EEDE8) | 0x0A0C53B8 [gTexture7EEE20](@ref gTexture7EEE20) | 0x0A0C53F0 +[gTexture7EEDE8_end](@ref gTexture7EEDE8_end) | 0x0A0C53F0 [gTexture7EEE7C](@ref gTexture7EEE7C) | 0x0A0C544C [gTexture7EEE20_end](@ref gTexture7EEE20_end) | 0x0A0C544C -[gTexture7EEED0](@ref gTexture7EEED0) | 0x0A0C54A0 [gTexture7EEE7C_end](@ref gTexture7EEE7C_end) | 0x0A0C54A0 -[gTexture7EEF3C](@ref gTexture7EEF3C) | 0x0A0C550C +[gTexture7EEED0](@ref gTexture7EEED0) | 0x0A0C54A0 [gTexture7EEED0_end](@ref gTexture7EEED0_end) | 0x0A0C550C -[gTexture7EEF3C_end](@ref gTexture7EEF3C_end) | 0x0A0C5560 +[gTexture7EEF3C](@ref gTexture7EEF3C) | 0x0A0C550C [gTexture7EEF90](@ref gTexture7EEF90) | 0x0A0C5560 -[gTexture7EEF90_end](@ref gTexture7EEF90_end) | 0x0A0C55C4 +[gTexture7EEF3C_end](@ref gTexture7EEF3C_end) | 0x0A0C5560 [gTexture7EEFF4](@ref gTexture7EEFF4) | 0x0A0C55C4 -[gTexture7EF058](@ref gTexture7EF058) | 0x0A0C5628 +[gTexture7EEF90_end](@ref gTexture7EEF90_end) | 0x0A0C55C4 [gTexture7EEFF4_end](@ref gTexture7EEFF4_end) | 0x0A0C5628 -[gTexture7EF058_end](@ref gTexture7EF058_end) | 0x0A0C5684 +[gTexture7EF058](@ref gTexture7EF058) | 0x0A0C5628 [gTexture7EF0B4](@ref gTexture7EF0B4) | 0x0A0C5684 -[gTexture7EF0B4_end](@ref gTexture7EF0B4_end) | 0x0A0C56E0 +[gTexture7EF058_end](@ref gTexture7EF058_end) | 0x0A0C5684 [gTexture7EF110](@ref gTexture7EF110) | 0x0A0C56E0 +[gTexture7EF0B4_end](@ref gTexture7EF0B4_end) | 0x0A0C56E0 [gTexture7EF17C](@ref gTexture7EF17C) | 0x0A0C574C [gTexture7EF110_end](@ref gTexture7EF110_end) | 0x0A0C574C -[gTexture7EF17C_end](@ref gTexture7EF17C_end) | 0x0A0C57C0 [gTexture7EF1F0](@ref gTexture7EF1F0) | 0x0A0C57C0 -[gTexture7EF1F0_end](@ref gTexture7EF1F0_end) | 0x0A0C5820 +[gTexture7EF17C_end](@ref gTexture7EF17C_end) | 0x0A0C57C0 [gTexture7EF250](@ref gTexture7EF250) | 0x0A0C5820 -[gTexture7EF2B8](@ref gTexture7EF2B8) | 0x0A0C5888 +[gTexture7EF1F0_end](@ref gTexture7EF1F0_end) | 0x0A0C5820 [gTexture7EF250_end](@ref gTexture7EF250_end) | 0x0A0C5888 +[gTexture7EF2B8](@ref gTexture7EF2B8) | 0x0A0C5888 [gTexture7EF314](@ref gTexture7EF314) | 0x0A0C58E4 [gTexture7EF2B8_end](@ref gTexture7EF2B8_end) | 0x0A0C58E4 [gTexture7EF388](@ref gTexture7EF388) | 0x0A0C5958 [gTexture7EF314_end](@ref gTexture7EF314_end) | 0x0A0C5958 [gTexture7EF388_end](@ref gTexture7EF388_end) | 0x0A0C59C8 [gTexture7EF3F8](@ref gTexture7EF3F8) | 0x0A0C59C8 -[gTexture7EF470](@ref gTexture7EF470) | 0x0A0C5A40 [gTexture7EF3F8_end](@ref gTexture7EF3F8_end) | 0x0A0C5A40 -[gTexture7EF470_end](@ref gTexture7EF470_end) | 0x0A0C5AB4 +[gTexture7EF470](@ref gTexture7EF470) | 0x0A0C5A40 [gTexture7EF4E4](@ref gTexture7EF4E4) | 0x0A0C5AB4 +[gTexture7EF470_end](@ref gTexture7EF470_end) | 0x0A0C5AB4 [gTexture7EF554](@ref gTexture7EF554) | 0x0A0C5B24 [gTexture7EF4E4_end](@ref gTexture7EF4E4_end) | 0x0A0C5B24 -[gTexture7EF5C0](@ref gTexture7EF5C0) | 0x0A0C5B90 [gTexture7EF554_end](@ref gTexture7EF554_end) | 0x0A0C5B90 +[gTexture7EF5C0](@ref gTexture7EF5C0) | 0x0A0C5B90 [gTexture7EF620](@ref gTexture7EF620) | 0x0A0C5BF0 [gTexture7EF5C0_end](@ref gTexture7EF5C0_end) | 0x0A0C5BF0 [gTexture7EF620_end](@ref gTexture7EF620_end) | 0x0A0C5C64 @@ -19215,20 +19215,20 @@ Variable Name | Memory Address [gTexture7EF77C](@ref gTexture7EF77C) | 0x0A0C5D4C [gTexture7EF7E8](@ref gTexture7EF7E8) | 0x0A0C5DB8 [gTexture7EF77C_end](@ref gTexture7EF77C_end) | 0x0A0C5DB8 -[gTexture7EF85C](@ref gTexture7EF85C) | 0x0A0C5E2C [gTexture7EF7E8_end](@ref gTexture7EF7E8_end) | 0x0A0C5E2C +[gTexture7EF85C](@ref gTexture7EF85C) | 0x0A0C5E2C [gTexture7EF8C8](@ref gTexture7EF8C8) | 0x0A0C5E98 [gTexture7EF85C_end](@ref gTexture7EF85C_end) | 0x0A0C5E98 [gTexture7EF93C](@ref gTexture7EF93C) | 0x0A0C5F0C [gTexture7EF8C8_end](@ref gTexture7EF8C8_end) | 0x0A0C5F0C -[gTexture7EF9B4](@ref gTexture7EF9B4) | 0x0A0C5F84 [gTexture7EF93C_end](@ref gTexture7EF93C_end) | 0x0A0C5F84 -[gTexture7EFA2C](@ref gTexture7EFA2C) | 0x0A0C5FFC +[gTexture7EF9B4](@ref gTexture7EF9B4) | 0x0A0C5F84 [gTexture7EF9B4_end](@ref gTexture7EF9B4_end) | 0x0A0C5FFC +[gTexture7EFA2C](@ref gTexture7EFA2C) | 0x0A0C5FFC [gTexture7EFA2C_end](@ref gTexture7EFA2C_end) | 0x0A0C6078 [gTexture7EFAA8](@ref gTexture7EFAA8) | 0x0A0C6078 -[gTexture7EFAA8_end](@ref gTexture7EFAA8_end) | 0x0A0C60D0 [gTexture7EFB00](@ref gTexture7EFB00) | 0x0A0C60D0 +[gTexture7EFAA8_end](@ref gTexture7EFAA8_end) | 0x0A0C60D0 [gTexture7EFB00_end](@ref gTexture7EFB00_end) | 0x0A0C6134 [gTexture7EFB64](@ref gTexture7EFB64) | 0x0A0C6134 [gTexture7EFB64_end](@ref gTexture7EFB64_end) | 0x0A0C618C @@ -19239,68 +19239,68 @@ Variable Name | Memory Address [gTexture7EFCAC](@ref gTexture7EFCAC) | 0x0A0C627C [gTexture7EFD00](@ref gTexture7EFD00) | 0x0A0C62D0 [gTexture7EFCAC_end](@ref gTexture7EFCAC_end) | 0x0A0C62D0 -[gTexture7EFD60](@ref gTexture7EFD60) | 0x0A0C6330 [gTexture7EFD00_end](@ref gTexture7EFD00_end) | 0x0A0C6330 +[gTexture7EFD60](@ref gTexture7EFD60) | 0x0A0C6330 [gTexture7EFDD4](@ref gTexture7EFDD4) | 0x0A0C63A4 [gTexture7EFD60_end](@ref gTexture7EFD60_end) | 0x0A0C63A4 [gTexture7EFE48](@ref gTexture7EFE48) | 0x0A0C6418 [gTexture7EFDD4_end](@ref gTexture7EFDD4_end) | 0x0A0C6418 [gTexture7EFE48_end](@ref gTexture7EFE48_end) | 0x0A0C6470 [gTexture7EFEA0](@ref gTexture7EFEA0) | 0x0A0C6470 -[gTexture7EFEA0_end](@ref gTexture7EFEA0_end) | 0x0A0C64FC [gTexture7EFF2C](@ref gTexture7EFF2C) | 0x0A0C64FC -[gTexture7EFF2C_end](@ref gTexture7EFF2C_end) | 0x0A0C6560 +[gTexture7EFEA0_end](@ref gTexture7EFEA0_end) | 0x0A0C64FC [gTexture7EFF90](@ref gTexture7EFF90) | 0x0A0C6560 -[gTexture7EFF90_end](@ref gTexture7EFF90_end) | 0x0A0C65D0 +[gTexture7EFF2C_end](@ref gTexture7EFF2C_end) | 0x0A0C6560 [gTexture7F0000](@ref gTexture7F0000) | 0x0A0C65D0 -[gTexture7F006C](@ref gTexture7F006C) | 0x0A0C663C +[gTexture7EFF90_end](@ref gTexture7EFF90_end) | 0x0A0C65D0 [gTexture7F0000_end](@ref gTexture7F0000_end) | 0x0A0C663C +[gTexture7F006C](@ref gTexture7F006C) | 0x0A0C663C [gTexture7F00D8](@ref gTexture7F00D8) | 0x0A0C66A8 [gTexture7F006C_end](@ref gTexture7F006C_end) | 0x0A0C66A8 [gTexture7F00D8_end](@ref gTexture7F00D8_end) | 0x0A0C6728 [gTexture7F0158](@ref gTexture7F0158) | 0x0A0C6728 [gTexture7F01D0](@ref gTexture7F01D0) | 0x0A0C67A0 [gTexture7F0158_end](@ref gTexture7F0158_end) | 0x0A0C67A0 -[gTexture7F01D0_end](@ref gTexture7F01D0_end) | 0x0A0C680C [gTexture7F023C](@ref gTexture7F023C) | 0x0A0C680C -[gTexture7F023C_end](@ref gTexture7F023C_end) | 0x0A0C6884 +[gTexture7F01D0_end](@ref gTexture7F01D0_end) | 0x0A0C680C [gTexture7F02B4](@ref gTexture7F02B4) | 0x0A0C6884 +[gTexture7F023C_end](@ref gTexture7F023C_end) | 0x0A0C6884 [gTexture7F02B4_end](@ref gTexture7F02B4_end) | 0x0A0C68FC [gTexture7F032C](@ref gTexture7F032C) | 0x0A0C68FC -[gTexture7F032C_end](@ref gTexture7F032C_end) | 0x0A0C6960 [gTexture7F0390](@ref gTexture7F0390) | 0x0A0C6960 +[gTexture7F032C_end](@ref gTexture7F032C_end) | 0x0A0C6960 [gTexture7F0404](@ref gTexture7F0404) | 0x0A0C69D4 [gTexture7F0390_end](@ref gTexture7F0390_end) | 0x0A0C69D4 [gTexture7F0470](@ref gTexture7F0470) | 0x0A0C6A40 [gTexture7F0404_end](@ref gTexture7F0404_end) | 0x0A0C6A40 -[gTexture7F0470_end](@ref gTexture7F0470_end) | 0x0A0C6ABC [gTexture7F04EC](@ref gTexture7F04EC) | 0x0A0C6ABC -[gTexture7F04EC_end](@ref gTexture7F04EC_end) | 0x0A0C6B2C +[gTexture7F0470_end](@ref gTexture7F0470_end) | 0x0A0C6ABC [gTexture7F055C](@ref gTexture7F055C) | 0x0A0C6B2C -[gTexture7F05F0](@ref gTexture7F05F0) | 0x0A0C6BC0 +[gTexture7F04EC_end](@ref gTexture7F04EC_end) | 0x0A0C6B2C [gTexture7F055C_end](@ref gTexture7F055C_end) | 0x0A0C6BC0 +[gTexture7F05F0](@ref gTexture7F05F0) | 0x0A0C6BC0 [gTexture7F0670](@ref gTexture7F0670) | 0x0A0C6C40 [gTexture7F05F0_end](@ref gTexture7F05F0_end) | 0x0A0C6C40 -[gTexture7F06EC](@ref gTexture7F06EC) | 0x0A0C6CBC [gTexture7F0670_end](@ref gTexture7F0670_end) | 0x0A0C6CBC +[gTexture7F06EC](@ref gTexture7F06EC) | 0x0A0C6CBC [gTexture7F06EC_end](@ref gTexture7F06EC_end) | 0x0A0C6D38 [gTexture7F0768](@ref gTexture7F0768) | 0x0A0C6D38 -[gTexture7F07E0](@ref gTexture7F07E0) | 0x0A0C6DB0 [gTexture7F0768_end](@ref gTexture7F0768_end) | 0x0A0C6DB0 +[gTexture7F07E0](@ref gTexture7F07E0) | 0x0A0C6DB0 [gTexture7F07E0_end](@ref gTexture7F07E0_end) | 0x0A0C6E28 [gTexture7F0858](@ref gTexture7F0858) | 0x0A0C6E28 -[gTexture7F08D8](@ref gTexture7F08D8) | 0x0A0C6EA8 [gTexture7F0858_end](@ref gTexture7F0858_end) | 0x0A0C6EA8 +[gTexture7F08D8](@ref gTexture7F08D8) | 0x0A0C6EA8 [gTexture7F0948](@ref gTexture7F0948) | 0x0A0C6F18 [gTexture7F08D8_end](@ref gTexture7F08D8_end) | 0x0A0C6F18 -[gTexture7F0948_end](@ref gTexture7F0948_end) | 0x0A0C6FA0 [gTexture7F09D0](@ref gTexture7F09D0) | 0x0A0C6FA0 +[gTexture7F0948_end](@ref gTexture7F0948_end) | 0x0A0C6FA0 [gTexture7F09D0_end](@ref gTexture7F09D0_end) | 0x0A0C700C [gTexture7F0A3C](@ref gTexture7F0A3C) | 0x0A0C700C [gTexture7F0A3C_end](@ref gTexture7F0A3C_end) | 0x0A0C708C [gTexture7F0ABC](@ref gTexture7F0ABC) | 0x0A0C708C -[gTexture7F0B34](@ref gTexture7F0B34) | 0x0A0C7104 [gTexture7F0ABC_end](@ref gTexture7F0ABC_end) | 0x0A0C7104 +[gTexture7F0B34](@ref gTexture7F0B34) | 0x0A0C7104 [gTexture7F0B34_end](@ref gTexture7F0B34_end) | 0x0A0C7180 [gTexture7F0BB0](@ref gTexture7F0BB0) | 0x0A0C7180 [gTexture7F0BB0_end](@ref gTexture7F0BB0_end) | 0x0A0C71F4 @@ -19309,24 +19309,24 @@ Variable Name | Memory Address [gTexture7F0C24_end](@ref gTexture7F0C24_end) | 0x0A0C7264 [gTexture7F0C94_end](@ref gTexture7F0C94_end) | 0x0A0C72DC [gTexture7F0D0C](@ref gTexture7F0D0C) | 0x0A0C72DC -[gTexture7F0D8C](@ref gTexture7F0D8C) | 0x0A0C735C [gTexture7F0D0C_end](@ref gTexture7F0D0C_end) | 0x0A0C735C -[gTexture7F0D8C_end](@ref gTexture7F0D8C_end) | 0x0A0C73BC +[gTexture7F0D8C](@ref gTexture7F0D8C) | 0x0A0C735C [gTexture7F0DEC](@ref gTexture7F0DEC) | 0x0A0C73BC +[gTexture7F0D8C_end](@ref gTexture7F0D8C_end) | 0x0A0C73BC [gTexture7F0E5C](@ref gTexture7F0E5C) | 0x0A0C742C [gTexture7F0DEC_end](@ref gTexture7F0DEC_end) | 0x0A0C742C -[gTexture7F0EE4](@ref gTexture7F0EE4) | 0x0A0C74B4 [gTexture7F0E5C_end](@ref gTexture7F0E5C_end) | 0x0A0C74B4 -[gTexture7F0EE4_end](@ref gTexture7F0EE4_end) | 0x0A0C752C +[gTexture7F0EE4](@ref gTexture7F0EE4) | 0x0A0C74B4 [gTexture7F0F5C](@ref gTexture7F0F5C) | 0x0A0C752C -[gTexture7F0FD8](@ref gTexture7F0FD8) | 0x0A0C75A8 +[gTexture7F0EE4_end](@ref gTexture7F0EE4_end) | 0x0A0C752C [gTexture7F0F5C_end](@ref gTexture7F0F5C_end) | 0x0A0C75A8 +[gTexture7F0FD8](@ref gTexture7F0FD8) | 0x0A0C75A8 [gTexture7F0FD8_end](@ref gTexture7F0FD8_end) | 0x0A0C7608 [gTexture7F1038](@ref gTexture7F1038) | 0x0A0C7608 -[gTexture7F1038_end](@ref gTexture7F1038_end) | 0x0A0C766C [gTexture7F109C](@ref gTexture7F109C) | 0x0A0C766C -[gTexture7F1124](@ref gTexture7F1124) | 0x0A0C76F4 +[gTexture7F1038_end](@ref gTexture7F1038_end) | 0x0A0C766C [gTexture7F109C_end](@ref gTexture7F109C_end) | 0x0A0C76F4 +[gTexture7F1124](@ref gTexture7F1124) | 0x0A0C76F4 [gTexture7F11F4](@ref gTexture7F11F4) | 0x0A0C77C4 [gTexture7F12C4](@ref gTexture7F12C4) | 0x0A0C7894 [gTexture7F1394](@ref gTexture7F1394) | 0x0A0C7964 @@ -19564,54 +19564,54 @@ Variable Name | Memory Address [gTexturePlayerSelect](@ref gTexturePlayerSelect) | 0x0B000000 [gTexturePlayerSelect_end](@ref gTexturePlayerSelect_end) | 0x0B000C00 [gTextureOption](@ref gTextureOption) | 0x0B000C00 -[gTextureOption_end](@ref gTextureOption_end) | 0x0B001500 [gTextureNameDK](@ref gTextureNameDK) | 0x0B001500 -[gTextureNameToad](@ref gTextureNameToad) | 0x0B001700 +[gTextureOption_end](@ref gTextureOption_end) | 0x0B001500 [gTextureNameDK_end](@ref gTextureNameDK_end) | 0x0B001700 +[gTextureNameToad](@ref gTextureNameToad) | 0x0B001700 [gTextureNameToad_end](@ref gTextureNameToad_end) | 0x0B001900 [gTextureNameBowser](@ref gTextureNameBowser) | 0x0B001900 -[gTextureNameLuigi](@ref gTextureNameLuigi) | 0x0B001B00 [gTextureNameBowser_end](@ref gTextureNameBowser_end) | 0x0B001B00 -[gTextureNameLuigi_end](@ref gTextureNameLuigi_end) | 0x0B001D00 +[gTextureNameLuigi](@ref gTextureNameLuigi) | 0x0B001B00 [gTextureNameMario](@ref gTextureNameMario) | 0x0B001D00 -[gTextureNameMario_end](@ref gTextureNameMario_end) | 0x0B001F00 +[gTextureNameLuigi_end](@ref gTextureNameLuigi_end) | 0x0B001D00 [gTextureNamePeach](@ref gTextureNamePeach) | 0x0B001F00 -[gTextureNamePeach_end](@ref gTextureNamePeach_end) | 0x0B002100 +[gTextureNameMario_end](@ref gTextureNameMario_end) | 0x0B001F00 [gTextureNameWario](@ref gTextureNameWario) | 0x0B002100 +[gTextureNamePeach_end](@ref gTextureNamePeach_end) | 0x0B002100 [gTextureNameYoshi](@ref gTextureNameYoshi) | 0x0B002300 [gTextureNameWario_end](@ref gTextureNameWario_end) | 0x0B002300 -[gTextureTitleMarioRaceway](@ref gTextureTitleMarioRaceway) | 0x0B002500 [gTextureNameYoshi_end](@ref gTextureNameYoshi_end) | 0x0B002500 +[gTextureTitleMarioRaceway](@ref gTextureTitleMarioRaceway) | 0x0B002500 [gTextureTitleChocoMountain](@ref gTextureTitleChocoMountain) | 0x0B002A00 [gTextureTitleMarioRaceway_end](@ref gTextureTitleMarioRaceway_end) | 0x0B002A00 -[gTextureTitleBowsersCastle](@ref gTextureTitleBowsersCastle) | 0x0B002F00 [gTextureTitleChocoMountain_end](@ref gTextureTitleChocoMountain_end) | 0x0B002F00 +[gTextureTitleBowsersCastle](@ref gTextureTitleBowsersCastle) | 0x0B002F00 [gTextureTitleBowsersCastle_end](@ref gTextureTitleBowsersCastle_end) | 0x0B003400 [gTextureTitleBansheeBoardwalk](@ref gTextureTitleBansheeBoardwalk) | 0x0B003400 -[gTextureTitleYoshiValley](@ref gTextureTitleYoshiValley) | 0x0B003A00 [gTextureTitleBansheeBoardwalk_end](@ref gTextureTitleBansheeBoardwalk_end) | 0x0B003A00 +[gTextureTitleYoshiValley](@ref gTextureTitleYoshiValley) | 0x0B003A00 [gTextureTitleYoshiValley_end](@ref gTextureTitleYoshiValley_end) | 0x0B003E00 [gTextureTitleFrappeSnowland](@ref gTextureTitleFrappeSnowland) | 0x0B003E00 -[gTextureTitleFrappeSnowland_end](@ref gTextureTitleFrappeSnowland_end) | 0x0B004300 [gTextureTitleKoopaTroopaBeach](@ref gTextureTitleKoopaTroopaBeach) | 0x0B004300 +[gTextureTitleFrappeSnowland_end](@ref gTextureTitleFrappeSnowland_end) | 0x0B004300 [gTextureTitleKoopaTroopaBeach_end](@ref gTextureTitleKoopaTroopaBeach_end) | 0x0B004800 [gTextureTitleRoyalRaceway](@ref gTextureTitleRoyalRaceway) | 0x0B004800 [gTextureTitleRoyalRaceway_end](@ref gTextureTitleRoyalRaceway_end) | 0x0B004C00 [gTextureTitleLuigiRaceway](@ref gTextureTitleLuigiRaceway) | 0x0B004C00 [gTextureTitleMooMooFarm](@ref gTextureTitleMooMooFarm) | 0x0B005000 [gTextureTitleLuigiRaceway_end](@ref gTextureTitleLuigiRaceway_end) | 0x0B005000 -[gTextureTitleToadsTurnpike](@ref gTextureTitleToadsTurnpike) | 0x0B005400 [gTextureTitleMooMooFarm_end](@ref gTextureTitleMooMooFarm_end) | 0x0B005400 -[gTextureTitleToadsTurnpike_end](@ref gTextureTitleToadsTurnpike_end) | 0x0B005900 +[gTextureTitleToadsTurnpike](@ref gTextureTitleToadsTurnpike) | 0x0B005400 [gTextureTitleKalimariDesert](@ref gTextureTitleKalimariDesert) | 0x0B005900 -[gTextureTitleSherbetLand](@ref gTextureTitleSherbetLand) | 0x0B005D00 +[gTextureTitleToadsTurnpike_end](@ref gTextureTitleToadsTurnpike_end) | 0x0B005900 [gTextureTitleKalimariDesert_end](@ref gTextureTitleKalimariDesert_end) | 0x0B005D00 -[gTextureTitleRainbowRoad](@ref gTextureTitleRainbowRoad) | 0x0B006100 +[gTextureTitleSherbetLand](@ref gTextureTitleSherbetLand) | 0x0B005D00 [gTextureTitleSherbetLand_end](@ref gTextureTitleSherbetLand_end) | 0x0B006100 +[gTextureTitleRainbowRoad](@ref gTextureTitleRainbowRoad) | 0x0B006100 [gTextureTitleWarioStadium](@ref gTextureTitleWarioStadium) | 0x0B006500 [gTextureTitleRainbowRoad_end](@ref gTextureTitleRainbowRoad_end) | 0x0B006500 -[gTextureTitleBlockFort](@ref gTextureTitleBlockFort) | 0x0B006A00 [gTextureTitleWarioStadium_end](@ref gTextureTitleWarioStadium_end) | 0x0B006A00 +[gTextureTitleBlockFort](@ref gTextureTitleBlockFort) | 0x0B006A00 [gTextureTitleBlockFort_end](@ref gTextureTitleBlockFort_end) | 0x0B006D00 [gTextureTitleSkyscraper](@ref gTextureTitleSkyscraper) | 0x0B006D00 [gTextureTitleDoubleDeck](@ref gTextureTitleDoubleDeck) | 0x0B007100 @@ -19626,22 +19626,22 @@ Variable Name | Memory Address [gTextureMapSelect_end](@ref gTextureMapSelect_end) | 0x0B008A00 [gTextureMenuMushroomCup](@ref gTextureMenuMushroomCup) | 0x0B008E00 [gTextureMenuFlowerCup_end](@ref gTextureMenuFlowerCup_end) | 0x0B008E00 -[gTextureMenuStarCup](@ref gTextureMenuStarCup) | 0x0B009200 [gTextureMenuMushroomCup_end](@ref gTextureMenuMushroomCup_end) | 0x0B009200 +[gTextureMenuStarCup](@ref gTextureMenuStarCup) | 0x0B009200 [gTextureMenuSpecialCup](@ref gTextureMenuSpecialCup) | 0x0B009600 [gTextureMenuStarCup_end](@ref gTextureMenuStarCup_end) | 0x0B009600 [gTextureGameSelect](@ref gTextureGameSelect) | 0x0B009A00 [gTextureMenuSpecialCup_end](@ref gTextureMenuSpecialCup_end) | 0x0B009A00 -[gTextureGameSelect_end](@ref gTextureGameSelect_end) | 0x0B00A600 [gTextureMenu1PGame](@ref gTextureMenu1PGame) | 0x0B00A600 -[gTextureMenu2PGame](@ref gTextureMenu2PGame) | 0x0B00AB00 +[gTextureGameSelect_end](@ref gTextureGameSelect_end) | 0x0B00A600 [gTextureMenu1PGame_end](@ref gTextureMenu1PGame_end) | 0x0B00AB00 -[gTextureMenu2PGame_end](@ref gTextureMenu2PGame_end) | 0x0B00B200 +[gTextureMenu2PGame](@ref gTextureMenu2PGame) | 0x0B00AB00 [gTextureMenu3PGame](@ref gTextureMenu3PGame) | 0x0B00B200 -[gTextureMenu3PGame_end](@ref gTextureMenu3PGame_end) | 0x0B00BC00 +[gTextureMenu2PGame_end](@ref gTextureMenu2PGame_end) | 0x0B00B200 [gTextureMenu4PGame](@ref gTextureMenu4PGame) | 0x0B00BC00 -[gTextureMenuModeBattle](@ref gTextureMenuModeBattle) | 0x0B00C700 +[gTextureMenu3PGame_end](@ref gTextureMenu3PGame_end) | 0x0B00BC00 [gTextureMenu4PGame_end](@ref gTextureMenu4PGame_end) | 0x0B00C700 +[gTextureMenuModeBattle](@ref gTextureMenuModeBattle) | 0x0B00C700 [gTextureMenuModeTimeTrials](@ref gTextureMenuModeTimeTrials) | 0x0B00CA00 [gTextureMenuModeBattle_end](@ref gTextureMenuModeBattle_end) | 0x0B00CA00 [gTextureMenuModeMarioGP](@ref gTextureMenuModeMarioGP) | 0x0B00CE00 @@ -19652,36 +19652,36 @@ Variable Name | Memory Address [gTextureMenuModeVS_end](@ref gTextureMenuModeVS_end) | 0x0B00D500 [gTextureMenuLOption_end](@ref gTextureMenuLOption_end) | 0x0B00D800 [gTextureMenuRData](@ref gTextureMenuRData) | 0x0B00D800 -[gTextureMenu50cc](@ref gTextureMenu50cc) | 0x0B00DB00 [gTextureMenuRData_end](@ref gTextureMenuRData_end) | 0x0B00DB00 -[gTextureMenu100cc](@ref gTextureMenu100cc) | 0x0B00DD00 +[gTextureMenu50cc](@ref gTextureMenu50cc) | 0x0B00DB00 [gTextureMenu50cc_end](@ref gTextureMenu50cc_end) | 0x0B00DD00 -[gTextureMenu100cc_end](@ref gTextureMenu100cc_end) | 0x0B00DF00 +[gTextureMenu100cc](@ref gTextureMenu100cc) | 0x0B00DD00 [gTextureMenu150cc](@ref gTextureMenu150cc) | 0x0B00DF00 +[gTextureMenu100cc_end](@ref gTextureMenu100cc_end) | 0x0B00DF00 [gTextureMenuExtra](@ref gTextureMenuExtra) | 0x0B00E100 [gTextureMenu150cc_end](@ref gTextureMenu150cc_end) | 0x0B00E100 [gTextureMenuWithoutItem](@ref gTextureMenuWithoutItem) | 0x0B00E300 [gTextureMenuExtra_end](@ref gTextureMenuExtra_end) | 0x0B00E300 [gTextureMenuWithoutItem_end](@ref gTextureMenuWithoutItem_end) | 0x0B00E600 [gTextureMenuWithItem](@ref gTextureMenuWithItem) | 0x0B00E600 -[gTextureMenuBegin](@ref gTextureMenuBegin) | 0x0B00E900 [gTextureMenuWithItem_end](@ref gTextureMenuWithItem_end) | 0x0B00E900 +[gTextureMenuBegin](@ref gTextureMenuBegin) | 0x0B00E900 [gTextureMenuGhost](@ref gTextureMenuGhost) | 0x0B00EB00 [gTextureMenuBegin_end](@ref gTextureMenuBegin_end) | 0x0B00EB00 [gTextureMenuData](@ref gTextureMenuData) | 0x0B00ED00 [gTextureMenuGhost_end](@ref gTextureMenuGhost_end) | 0x0B00ED00 [gTextureMenuData_end](@ref gTextureMenuData_end) | 0x0B00EF00 [gTextureMenuOK](@ref gTextureMenuOK) | 0x0B00EF00 -[gTextureMenuOK_end](@ref gTextureMenuOK_end) | 0x0B00F100 [gTextureBackgroundBlueSky](@ref gTextureBackgroundBlueSky) | 0x0B00F100 +[gTextureMenuOK_end](@ref gTextureMenuOK_end) | 0x0B00F100 [gTextureBackgroundBlueSky_end](@ref gTextureBackgroundBlueSky_end) | 0x0B01BF00 [gTextureBackgroundSunset](@ref gTextureBackgroundSunset) | 0x0B01BF00 -[gTextureBackgroundSunset_end](@ref gTextureBackgroundSunset_end) | 0x0B025300 [gTextureGreenGoldStripe](@ref gTextureGreenGoldStripe) | 0x0B025300 -[gTextureGreenGoldStripe_end](@ref gTextureGreenGoldStripe_end) | 0x0B025F00 +[gTextureBackgroundSunset_end](@ref gTextureBackgroundSunset_end) | 0x0B025300 [gTextureGoldStripe](@ref gTextureGoldStripe) | 0x0B025F00 -[gTextureGoldStripe_end](@ref gTextureGoldStripe_end) | 0x0B026600 +[gTextureGreenGoldStripe_end](@ref gTextureGreenGoldStripe_end) | 0x0B025F00 [gTextureWhiteStripe](@ref gTextureWhiteStripe) | 0x0B026600 +[gTextureGoldStripe_end](@ref gTextureGoldStripe_end) | 0x0B026600 [gTexturePinkBar](@ref gTexturePinkBar) | 0x0B026700 [gTextureWhiteStripe_end](@ref gTextureWhiteStripe_end) | 0x0B026700 [gTexturePinkBar_end](@ref gTexturePinkBar_end) | 0x0B026C00 @@ -19776,64 +19776,64 @@ Variable Name | Memory Address [d_course_big_donut_packed](@ref d_course_big_donut_packed) | 0x0F001B84 [music_sequence_table_header](@ref music_sequence_table_header) | 0x0025FD00 [music_sequence_table](@ref music_sequence_table) | 0x0025FD04 -[seq_00](@ref seq_00) | 0x0025FE00 [music_sequence_table_end](@ref music_sequence_table_end) | 0x0025FE00 +[seq_00](@ref seq_00) | 0x0025FE00 [seq_01](@ref seq_01) | 0x00262630 [seq_00_end](@ref seq_00_end) | 0x00262630 -[seq_01_end](@ref seq_01_end) | 0x00264160 [seq_02](@ref seq_02) | 0x00264160 +[seq_01_end](@ref seq_01_end) | 0x00264160 [seq_02_end](@ref seq_02_end) | 0x00264EC0 [seq_03](@ref seq_03) | 0x00264EC0 [seq_03_end](@ref seq_03_end) | 0x002668D0 [seq_04](@ref seq_04) | 0x002668D0 -[seq_05](@ref seq_05) | 0x00268570 [seq_04_end](@ref seq_04_end) | 0x00268570 +[seq_05](@ref seq_05) | 0x00268570 [seq_05_end](@ref seq_05_end) | 0x0026A4E0 [seq_06](@ref seq_06) | 0x0026A4E0 -[seq_07](@ref seq_07) | 0x0026C3C0 [seq_06_end](@ref seq_06_end) | 0x0026C3C0 +[seq_07](@ref seq_07) | 0x0026C3C0 [seq_07_end](@ref seq_07_end) | 0x0026DA90 [seq_08](@ref seq_08) | 0x0026DA90 -[seq_09](@ref seq_09) | 0x0026FE60 [seq_08_end](@ref seq_08_end) | 0x0026FE60 +[seq_09](@ref seq_09) | 0x0026FE60 [seq_09_end](@ref seq_09_end) | 0x00271660 [seq_0A](@ref seq_0A) | 0x00271660 [seq_0B](@ref seq_0B) | 0x00273140 [seq_0A_end](@ref seq_0A_end) | 0x00273140 [seq_0C](@ref seq_0C) | 0x00273730 [seq_0B_end](@ref seq_0B_end) | 0x00273730 -[seq_0C_end](@ref seq_0C_end) | 0x00273B00 [seq_0D](@ref seq_0D) | 0x00273B00 -[seq_0E](@ref seq_0E) | 0x00273E60 +[seq_0C_end](@ref seq_0C_end) | 0x00273B00 [seq_0D_end](@ref seq_0D_end) | 0x00273E60 +[seq_0E](@ref seq_0E) | 0x00273E60 [seq_0E_end](@ref seq_0E_end) | 0x00274140 [seq_0F](@ref seq_0F) | 0x00274140 [seq_0F_end](@ref seq_0F_end) | 0x00274600 [seq_10](@ref seq_10) | 0x00274600 [seq_10_end](@ref seq_10_end) | 0x00275A10 [seq_11](@ref seq_11) | 0x00275A10 -[seq_12](@ref seq_12) | 0x002760F0 [seq_11_end](@ref seq_11_end) | 0x002760F0 -[seq_12_end](@ref seq_12_end) | 0x002793E0 +[seq_12](@ref seq_12) | 0x002760F0 [seq_13](@ref seq_13) | 0x002793E0 +[seq_12_end](@ref seq_12_end) | 0x002793E0 [seq_14](@ref seq_14) | 0x00279AA0 [seq_13_end](@ref seq_13_end) | 0x00279AA0 [seq_15](@ref seq_15) | 0x00279F50 [seq_14_end](@ref seq_14_end) | 0x00279F50 -[seq_16](@ref seq_16) | 0x0027B0B0 [seq_15_end](@ref seq_15_end) | 0x0027B0B0 -[seq_16_end](@ref seq_16_end) | 0x0027B3C0 +[seq_16](@ref seq_16) | 0x0027B0B0 [seq_17](@ref seq_17) | 0x0027B3C0 +[seq_16_end](@ref seq_16_end) | 0x0027B3C0 [seq_17_end](@ref seq_17_end) | 0x0027C670 [seq_18](@ref seq_18) | 0x0027C670 [seq_19](@ref seq_19) | 0x0027CC70 [seq_18_end](@ref seq_18_end) | 0x0027CC70 -[seq_19_end](@ref seq_19_end) | 0x0027E350 [seq_1A](@ref seq_1A) | 0x0027E350 -[seq_1B](@ref seq_1B) | 0x0027EE20 +[seq_19_end](@ref seq_19_end) | 0x0027E350 [seq_1A_end](@ref seq_1A_end) | 0x0027EE20 -[seq_1C](@ref seq_1C) | 0x0027FAA0 +[seq_1B](@ref seq_1B) | 0x0027EE20 [seq_1B_end](@ref seq_1B_end) | 0x0027FAA0 +[seq_1C](@ref seq_1C) | 0x0027FAA0 [seq_1D](@ref seq_1D) | 0x002821F0 [seq_1C_end](@ref seq_1C_end) | 0x002821F0 [seq_1D_end](@ref seq_1D_end) | 0x00282E70