diff --git a/include/common_structs.h b/include/common_structs.h index 81500e708a..9a7b58226e 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -27,6 +27,11 @@ typedef struct Vec2bu { /* 0x01 */ u8 y; } Vec2bu; // size = 0x02 +typedef struct Vec2f { + /* 0x00 */ f32 x; + /* 0x04 */ f32 y; +} Vec2f; // size = 0x08 + typedef struct Vec3b { /* 0x00 */ s8 x; /* 0x01 */ s8 y; @@ -50,6 +55,11 @@ typedef struct Vec2s { /* 0x02 */ s16 y; } Vec2s; // size = 0x04 +typedef struct Vec2su { + /* 0x00 */ u16 x; + /* 0x02 */ u16 y; +} Vec2su; // size = 0x04 + typedef struct Vec3s { /* 0x00 */ s16 x; /* 0x02 */ s16 y; @@ -1113,12 +1123,12 @@ typedef struct MessagePrintState { /* 0x502 */ char unk_502[0x2]; /* 0x504 */ s32* closedWritebackBool; // if not null, writes 1 here when message closes /* 0x508 */ s8 style; - /* 0x509 */ s8 fadeInCounter; + /* 0x509 */ u8 fadeInCounter; /* 0x50A */ Vec2s initOpenPos; // where the message originates from, in screen-space coords /* 0x50E */ Vec2s openStartPos; - /* 0x512 */ s8 fadeOutCounter; + /* 0x512 */ u8 fadeOutCounter; /* 0x513 */ char unk_513[0x1]; - /* 0x514 */ Vec2s windowSize; + /* 0x514 */ Vec2su windowSize; /* 0x518 */ s8 speechSoundType; /* 0x519 */ u8 volume; /* 0x51A */ s8 speechPan; // just pan? @@ -1150,6 +1160,71 @@ typedef struct MessagePrintState { /* 0x554 */ char unk_554[0x4]; } MessagePrintState; // size = 0x558 +typedef struct MessageDrawState { + /* 0x00 */ s32 clipX[2]; // characters beyond this pos get skipped + /* 0x08 */ s32 clipY[2]; // characters beyond this pos get skipped + /* 0x10 */ Vec2f stringScale; + /* 0x18 */ Vec2f charScale; + /* 0x20 */ s32 drawBufferPos; // string gets printed here and read for display + /* 0x24 */ s16 savedPos[2]; + /* 0x28 */ s8 savedColor; + /* 0x29 */ u8 unk_29; + /* 0x2A */ char unk_2A[0x1]; + /* 0x2B */ s8 framePalette; + /* 0x2C */ s8 unk_2C; + /* 0x2D */ char unk_2D[0x1]; + /* 0x2E */ s8 centerPos; + /* 0x2F */ char unk_2F[0x1]; + /* 0x30 */ s32 visiblePrintedCount; + /* 0x34 */ s16 printModeFlags; // C0 = center, 10 = drawing image + /* 0x36 */ char unk_36[0x2]; + /* 0x38 */ s32 effectFlags; + /* 0x3C */ s16 font; // 0 or 1 + /* 0x3E */ s16 fontVariant; + /* 0x40 */ s16 currentPosX; + /* 0x42 */ s16 nextPos[2]; + /* 0x46 */ s16 textStartPos[2]; // relative to textbox + /* 0x4A */ s16 textColor; + /* 0x4C */ s8* printBuffer; + /* 0x50 */ s8 nextCounter; // related to closing mssages and cmd FA + /* 0x51 */ char unk_51[0x3]; +} MessageDrawState; // size = 0x54 + +typedef struct MessageCharData { + /* 0x0 */ s8* raster; + /* 0x4 */ u8* charWidthTable; + /* 0x8 */ u8 monospaceWidth; + /* 0x9 */ s8 baseHeightOffset; + /* 0xA */ char unk_0A[0x2]; +} MessageCharData; // size = 0xC + +typedef struct MessageCharset { + /* 0x0 */ Vec2b texSize; + /* 0x2 */ s8 unk_02; + /* 0x3 */ s8 newLineY; + /* 0x4 */ s16 charRasterSize; // in bytes + /* 0x6 */ char unk_06[0x2]; + /* 0x8 */ MessageCharData* rasters; +} MessageCharset; // size = 0xA; + +typedef struct MesasgeFontGlyphData { + /* 0x0 */ s8* raster; + /* 0x4 */ s16* palette; + /* 0x8 */ Vec2b texSize; + /* 0xA */ s8 charWidth; + /* 0xB */ s8 charHeight; +} MesasgeFontGlyphData; // size = 0xC + +typedef struct MessageNumber { + /* 0x00 */ s32* rasters; + /* 0x04 */ s8 texSize; + /* 0x05 */ u8 texWidth; + /* 0x06 */ u8 texHeight; + /* 0x07 */ s8 digitWidth[10]; + /* 0x11 */ s8 fixedWidth; + /* 0x12 */ char unk_12[0x2]; +} MessageNumber; // size = 0x14 + typedef struct ShopItemEntity { /* 0x00 */ s32 index; /* 0x04 */ Vec3f pos; diff --git a/include/functions.h b/include/functions.h index 96b927ce13..6855faf67b 100644 --- a/include/functions.h +++ b/include/functions.h @@ -70,6 +70,9 @@ f32 player_check_collision_below(f32, s32* colliderID); s32 can_trigger_loading_zone(void); void func_802667F0(s32, Actor*, f32, f32, f32); +void* general_heap_malloc(s32 size); +s32 general_heap_free(s32 size); + void entity_Shadow_init(Shadow* entity); void entity_SaveBlock_idle(Entity* entity); void entity_SaveBlock_pause_game(void); @@ -99,6 +102,9 @@ s32 entity_block_handle_collision(Entity* entity); void entity_BlueSwitch_init(Entity* entity); void entity_HugeBlueSwitch_init(Entity* entity); +// todo remove once we have libultra's def +extern void guOrtho(Mtx *m, float l, float r, float b, float t, + float n, float f, float scale); // Text MessagePrintState* msg_get_printer_for_string(s32 stringID, s32* a1); @@ -115,6 +121,10 @@ s32 collision_main_above(void); s32 player_test_lateral_overlap(s32, PlayerStatus*, f32*, f32*, f32*, f32, f32); Npc* peach_make_disguise_npc(s32 peachDisguise); +void draw_box(s32 flags, s32 windowStyle, s16 posX, s16 posY, s32 posZ, s32 width, s32 height, s32 opacity, + s32 darkening, f32 scaleX, f32 scaleY, f32 rotX, f32 rotY, f32 rotZ, void (*fpDrawContents)(s32), + s32 drawContentsArg0, Matrix4f rotScaleMtx, s32 translateX, s32 translateY, Matrix4f* outMtx); + s32 partner_player_can_pause(void); s32 disable_player_static_collisions(void); s32 disable_player_input(void); diff --git a/include/macros.h b/include/macros.h index dbcd75781b..16f226fe33 100644 --- a/include/macros.h +++ b/include/macros.h @@ -4,6 +4,8 @@ #include "common.h" #include "include_asm.h" +#define BSS __attribute__ ((section (".bss"))) + #define ALIGN16(val) (((val) + 0xF) & ~0xF) #define N(sym) NS(NAMESPACE, sym) diff --git a/include/variables.h b/include/variables.h index 58f2da1b35..16e326e9d1 100644 --- a/include/variables.h +++ b/include/variables.h @@ -306,7 +306,6 @@ extern s32 D_8009A678; extern u8 D_800779B0; extern u32 D_80078174; -extern s32 timeFreezeMode; extern u8 D_800A0963; extern s32 D_8009A5D0; diff --git a/src/8e790_len_2850.c b/src/8e790_len_2850.c index 2ca526203d..5420de8fa9 100644 --- a/src/8e790_len_2850.c +++ b/src/8e790_len_2850.c @@ -1,3 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "8e790_len_2850", draw_box); +INCLUDE_ASM(void, "8e790_len_2850", draw_box, s32 flags, s32 windowStyle, s16 posX, s16 posY, s32 posZ, s32 width, + s32 height, s32 opacity, s32 darkening, f32 scaleX, f32 scaleY, f32 rotX, f32 rotY, f32 rotZ, + void (*fpDrawContents)(s32),s32 drawContentsArg0, Matrix4f rotScaleMtx, s32 translateX, s32 translateY, + Matrix4f* outMtx); diff --git a/src/B4580.c b/src/B4580.c index ec1ee93c9d..b516cc891e 100644 --- a/src/B4580.c +++ b/src/B4580.c @@ -1,5 +1,7 @@ #include "common.h" +s32 D_8014C250[] = {0x0001003C, 0x00000000, 0x00000000, 0x00000000}; + INCLUDE_ASM(s32, "B4580", animator_copy_vertices_to_buffer); INCLUDE_ASM(s32, "B4580", animator_make_mirrorZ); diff --git a/src/C50A0.c b/src/C50A0.c index bd30c66343..ec5771fa56 100644 --- a/src/C50A0.c +++ b/src/C50A0.c @@ -5,7 +5,7 @@ extern s32 D_80155D84; extern s32 D_80155D88; extern ItemEntity* D_80155DA0; extern ItemEntity* D_801561A0; -ItemEntity** D_801565A0; // item entity list +extern ItemEntity** D_801565A0; // item entity list extern s16 D_801565A4; extern s16 D_801565A8; diff --git a/src/battle/item/insecticide_herb.c b/src/battle/item/insecticide_herb.c index ce17147942..ad15a31ef4 100644 --- a/src/battle/item/insecticide_herb.c +++ b/src/battle/item/insecticide_herb.c @@ -76,7 +76,7 @@ ApiStatus N(func_802A1280_72A9D0)(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -struct N(temp) { +typedef struct N(temp) { char unk_00[0xC]; EffectInstanceDataThing* unk_0C; } N(temp); diff --git a/src/battle/item/mystery.h b/src/battle/item/mystery.h index 57cc4e275a..0af64a8743 100644 --- a/src/battle/item/mystery.h +++ b/src/battle/item/mystery.h @@ -10,7 +10,7 @@ ApiStatus N(func_802A13E4_72C994)(ScriptInstance *script, s32 isInitialCall); ApiStatus N(func_802A188C_72CE3C)(ScriptInstance *script, s32 isInitialCall); -struct N(tempStc) { +typedef struct N(tempStc) { s32 iconId; s32 unk_04; } N(tempStc); diff --git a/src/entity.c b/src/entity.c index 63eb4db481..e37c6cbbea 100644 --- a/src/entity.c +++ b/src/entity.c @@ -1,5 +1,9 @@ #include "common.h" +s32 D_8014C260[] = { 0x00000000, 0x00000000, 0xFFFFFF00, 0xFFFFFF00 }; + +s32 D_8014C270[] = { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }; + extern EntityModelList gWorldEntityModelList; extern EntityModelList gBattleEntityModelList; extern EntityModelList* gCurrentEntityModelList; diff --git a/src/main_loop.c b/src/main_loop.c index c4fa741b82..20512a0a40 100644 --- a/src/main_loop.c +++ b/src/main_loop.c @@ -2,8 +2,6 @@ #include "nu/nusys.h" #include "ld_addrs.h" -// TODO: timeFreezeMode is probably bss here - s8 D_80074020 = 1; s8 D_80074021 = 5; @@ -39,6 +37,9 @@ Gfx D_80074230[] = { gsSPEndDisplayList(), }; +// BSS +extern s32 timeFreezeMode BSS; + extern s16 D_8009A690; void gfx_init_state(void); diff --git a/src/msg.c b/src/msg.c index 756c1325f4..67969dc6e9 100644 --- a/src/msg.c +++ b/src/msg.c @@ -1,27 +1,130 @@ #include "common.h" #include "ld_addrs.h" -// TODO consider symbol +// todo consider symbol #define MSG_ROM_START 0x1B83000 -extern s16 gNextMessageBuffer; -extern Gfx D_8014C500[]; +extern s32 D_802EF0D0; + +s32 D_8014C280[] = { 0x028001E0, 0x01FF0000, 0x028001E0, 0x01FF0000, }; + +s32 MessagePlural = 0x53FD0000; + +s16 MessageSingular = 0xF0FD; + +s16 gNextMessageBuffer = 0; + +s32 D_8014C298[] = { 0xFFF00009, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00100009, 0x00000000, 0x04000000, 0xFFFFFFFF, 0xFFF0FFF7, 0x00000000, 0x00000240, 0xFFFFFFFF, 0x0010FFF7, 0x00000000, 0x04000240, 0xFFFFFFFF, }; + +Gfx D_8014C2D8[] = { + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_CULL_BOTH | G_LIGHTING), + gsSPSetGeometryMode(G_SHADE | G_SHADING_SMOOTH), + gsDPSetColorDither(G_CD_DISABLE), + gsDPSetAlphaDither(G_AD_DISABLE), + gsDPSetAlphaCompare(G_AC_NONE), + gsSPTexture(-1, -1, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureLUT(G_TT_NONE), + gsDPSetTextureFilter(G_TF_AVERAGE), + gsDPSetRenderMode(IM_RD | CVG_DST_SAVE | ZMODE_XLU | FORCE_BL | G_RM_PASS, IM_RD | CVG_DST_SAVE | ZMODE_XLU | + FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + gsSPEndDisplayList(), +}; + +MessageNumber gMsgNumbers[] = { + { + .rasters = &D_802EF0D0, + .texSize = 128, + .texWidth = 16, + .texHeight = 16, + .digitWidth = {11, 8, 11, 11, 11, 11, 11, 11, 11, 11}, + .fixedWidth = 11 + },{ + .rasters = &D_802EF0D0, + .texSize = 128, + .texWidth = 16, + .texHeight = 16, + .digitWidth = {9, 8, 9, 9, 9, 9, 9, 9, 9, 9}, + .fixedWidth = 9 + } +}; + +Gfx D_8014C368[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetTextureFilter(G_TF_POINT), + gsDPSetTexturePersp(G_TP_NONE), + gsDPSetColorDither(G_CD_DISABLE), + gsDPSetAlphaDither(G_AD_DISABLE), + gsDPSetCombineKey(G_CK_NONE), + gsDPSetAlphaCompare(G_AC_NONE), + gsDPSetTextureLUT(G_TT_RGBA16), + gsSPTexture(-1, -1, 0, G_TX_RENDERTILE, G_ON), + gsSPEndDisplayList(), +}; + +s32 D_8014C3C0[] = { 0x00010000, 0x00000000, 0x00000000, 0xFFFFF8FF, 0x00200000, 0x00000000, 0x04000000, 0xFFFFF8FF, 0x0001FFC0, 0x00000000, 0x00000800, 0xBFB8B0FF, 0x0020FFC0, 0x00000000, 0x04000800, 0xBFB8B0FF, }; + +s32 D_8014C400[] = { 0x00200000, 0x00000000, 0x00000000, 0xFFFFF8FF, 0x00E10000, 0x00000000, 0x01000000, 0xFFFFF8FF, 0x0020FFC0, 0x00000000, 0x00000800, 0xBFB8B0FF, 0x00E1FFC0, 0x00000000, 0x01000800, 0xBFB8B0FF, }; + +s32 D_8014C440[] = { 0x00E10000, 0x00000000, 0x00000000, 0xFFFFF8FF, 0x01000000, 0x00000000, 0x04000000, 0xFFFFF8FF, 0x00E1FFC0, 0x00000000, 0x00000800, 0xBFB8B0FF, 0x0100FFC0, 0x00000000, 0x04000800, 0xBFB8B0FF, }; + +s32 D_8014C480[] = { 0xFFF1001E, 0x00000000, 0x00000000, 0xBFB8B0FF, 0x000F001E, 0x00000000, 0x01E00000, 0xBFB8B0FF, 0xFFFF0000, 0x00000000, 0x000001E0, 0xBFB8B0FF, 0x00010000, 0x00000000, 0x01E001E0, 0xBFB8B0FF, }; + +s32 D_8014C4C0[] = { 0xFFF1001E, 0x00000000, 0x00000000, 0xBFB8B0FF, 0x000F001E, 0x00000000, 0x01E00000, 0xBFB8B0FF, 0xFFFF0000, 0x00000000, 0x000001E0, 0xBFB8B0FF, 0x00010000, 0x00000000, 0x01E001E0, 0xBFB8B0FF, }; + +Gfx D_8014C500[] = { + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_TEX_EDGE, G_RM_TEX_EDGE2), + gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), + gsDPSetTextureFilter(G_TF_AVERAGE), + gsSPTexture(-1, -1, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTexturePersp(G_TP_NONE), + gsDPSetColorDither(G_CD_DISABLE), + gsDPSetAlphaDither(G_AD_DISABLE), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureConvert(G_TC_FILT), + gsDPSetCombineKey(G_CK_NONE), + gsDPSetAlphaCompare(G_AC_NONE), + gsDPNoOp(), + gsSPEndDisplayList(), +}; + +u8 D_8014C580[] = { 50, 80, 100, 105, 100, 0, 0, 0 }; +u8 D_8014C588[] = { 105, 100, 77, 57, 40, 27, 16, 8, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; + +// BSS extern s32 gMsgBGScrollAmtX; extern u16 gMsgGlobalWaveCounter; extern s32 gMsgVarImages; // message images? extern s32 gMsgBGScrollAmtY; extern s32 D_80151338; -extern char gMessageBufferA[1024]; -extern char gMessageStringVars[3][32]; +extern char gMessageBuffers[][1024]; +extern u8 gMessageStringVars[3][32]; extern s16 D_80155C98; +extern Matrix4s gMessageWindowProjMatrix[2]; +extern MessageDrawState* gMessageDrawStatePtr; +// another file? +extern s32 D_802ED550; +extern s32 D_802ED670; extern s32 D_802ED970; extern s32 D_802EE8D0; +extern MessageCharset* gMsgCharsets[5]; extern s32 D_802F39D0; -extern s32 D_802F4560; +extern s32* D_802F4560; void load_font(s32 font); -s32 _update_message(MessagePrintState* printer); +s32 _update_message(MessagePrintState*); +void appendGfx_message(MessagePrintState*, s16, s16, u16, u16, u16, u8); +void appendGfx_msg_prim_rect(u8 r, u8 g, u8 b, u8 a, u16 ulX, u16 ulY, u16 lrX, u16 lrY); +void get_string_properties(s32 stringID, s32* height, s32* width, s32* maxLineChars, s32* numLines, + s32* maxLinesPerPage, s32* arg6, s32 charset); + void clear_character_set(void) { D_80155C98 = -1; @@ -95,7 +198,6 @@ s32 _update_message(MessagePrintState* printer) { f32 temp_f4; s32 temp_a1_3; s32 temp_v0_2; - u32 temp_v1; u8 temp_v1_2; s32 phi_a3; s32 phi_a0; @@ -439,7 +541,41 @@ block_65: INCLUDE_ASM(s32, "msg", _update_message, MessagePrintState* msgPrintState); #endif -INCLUDE_ASM(s32, "msg", render_messages); +void render_messages(void) { + Matrix4s* matrix = &gMessageWindowProjMatrix[gCurrentDisplayContextIndex]; + s32 i; + + for (i = 0; i < ARRAY_COUNT(gMessagePrinters); i++) { + if (gMessagePrinters[i].stateFlags & 0x2) { + gSPViewport(gMasterGfxPos++, D_8014C280); + guOrtho(matrix, 0.0f, 319.0f, -240.0f, 0.0f, -500.0f, 500.0f, 1.0f); + gSPMatrix(gMasterGfxPos++, OS_K0_TO_PHYSICAL(matrix), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gDPPipeSync(gMasterGfxPos++); + gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); + gSPClearGeometryMode(gMasterGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | + G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); + gSPSetGeometryMode(gMasterGfxPos++, G_SHADE | G_SHADING_SMOOTH); + break; + } + } + + for (i = 0; i < ARRAY_COUNT(gMessagePrinters); i++) { + if (gMessagePrinters[i].stateFlags & 0x2) { + draw_message_window(&gMessagePrinters[i]); + + if (gMessagePrinters[i].windowState == 5) { + if (!(gMessagePrinters[i].stateFlags & 0x8000) && !(gMessagePrinters[i].stateFlags & 0x40)) { + msg_update_rewind_arrow(i); + } + } else if (gMessagePrinters[i].windowState == 0xC) { + msg_draw_rewind_arrow(i); + } else if (gMessagePrinters[i].windowState == 7 || gMessagePrinters[i].windowState == 8 || + gMessagePrinters[i].stateFlags & 0x10000 || gMessagePrinters[i].stateFlags & 0x20000) { + msg_draw_choice_pointer(&gMessagePrinters[i]); + } + } + } +} void msg_play_speech_sound(MessagePrintState* printer, u8 character) { f32 volTemp; @@ -555,8 +691,19 @@ void dma_load_string(u32 msgID, void* dest) { dma_copy(MSG_ROM_START + offset[0], MSG_ROM_START + offset[1], dest); } -s32 load_message_to_buffer(s32 stringID); -INCLUDE_ASM(s32, "msg", load_message_to_buffer, s32 stringID); +s32* load_message_to_buffer(s32 stringID) { + s32* prevBufferPos; + + dma_load_string(stringID, &gMessageBuffers[gNextMessageBuffer]); + prevBufferPos = gMessageBuffers[gNextMessageBuffer]; + + gNextMessageBuffer++; + if (gNextMessageBuffer >= 2) { + gNextMessageBuffer = 0; + } + + return prevBufferPos; +} MessagePrintState* msg_get_printer_for_string(s32 stringID, s32* donePrintingWriteback) { return _msg_get_printer_for_string(stringID, donePrintingWriteback, 0); @@ -608,7 +755,20 @@ MessagePrintState* _msg_get_printer_for_string(s32 stringID, s32* donePrintingWr INCLUDE_ASM(MessagePrintState*, "msg", _msg_get_printer_for_string, s32 stringID, s32* donePrintingWriteback, s32 arg2); #endif -INCLUDE_ASM(s32, "msg", msg_printer_load_string); +s32 msg_printer_load_string(s32 stringID, MessagePrintState* printer) { + s32* buffer; + + if (stringID >= 0) { + buffer = load_message_to_buffer(stringID); + } else { + buffer = (s32*) stringID; + } + + printer->srcBuffer = buffer; + printer->srcBufferPos = 0; + printer->stateFlags &= ~0x40; + return 1; +} void msg_printer_set_origin_pos(MessagePrintState* msgPrintState, s16 x, s16 y) { msgPrintState->initOpenPos.x = x; @@ -641,40 +801,215 @@ void set_message_images(s32* images) { gMsgVarImages = images; } -INCLUDE_ASM(s32, "msg", set_message_string); +// loop crap +#ifdef NON_MATCHING +void set_message_string(s32 stringID, s32 index) { + u8* buffer = stringID; + u8* mallocSpace = NULL; + u8* it; + s32 i; + s32 new_var; -INCLUDE_ASM(s32, "msg", set_message_value); + if (stringID >= 0) { + buffer = general_heap_malloc(0x400); + dma_load_string(stringID, buffer); + mallocSpace = buffer; + } + + for (i = 0; i < ARRAY_COUNT(gMessageStringVars[index]); i++) { + gMessageStringVars[index][i] = buffer[i]; + if (buffer[i] == 0xFD) { + break; + } + } + + if (mallocSpace != NULL) { + general_heap_free(mallocSpace); + } +} +#else +INCLUDE_ASM(s32, "msg", set_message_string); +#endif + +void set_message_value(s32 value, s32 index) { + s8 strBuffer[ARRAY_COUNT(gMessageStringVars[index])]; + s8* bufferIt; + s32 i; + + int_to_string(value, &strBuffer, 10); + + for (i = 0, bufferIt = strBuffer; i < ARRAY_COUNT(gMessageStringVars[index]) - 1; i++) { + s8 thisChar = bufferIt[i]; + + if (thisChar == 0) { + break; + } + gMessageStringVars[index][i] = thisChar - 0x20; + } + gMessageStringVars[index][i] = 0xFD; +} void close_message(MessagePrintState* msgPrintState) { msgPrintState->stateFlags &= ~0x40; } -INCLUDE_ASM(s32, "msg", msg_get_print_char_width); +// so close, just some dumb control flow thing at the beginning +s32 msg_get_print_char_width(s32 character, s32 charset, s32 variation, f32 stringScale, s32 overrideCharWidth, u8 flags); +#ifdef NON_MATCHING +s32 msg_get_print_char_width(s32 character, s32 charset, s32 variation, f32 stringScale, s32 overrideCharWidth, u8 flags) { + u8* charWidthTable; + f32 baseWidth; + f64 charWidth; + f64 modifier; -INCLUDE_ASM(s32, "msg", msg_get_draw_char_width); + if (character < 0xF0 || (character == 0xF7 || character == 0xF8 || character == 0xF9)) { + if (overrideCharWidth != 0) { + baseWidth = overrideCharWidth; + } else if (flags != 0 && gMsgCharsets[charset]->rasters[variation].charWidthTable != NULL && + character != 0xF7 && character != 0xF8 && character != 0xF9) { + baseWidth = gMsgCharsets[charset]->rasters[variation].charWidthTable[character]; + } else { + baseWidth = gMsgCharsets[charset]->rasters[variation].monospaceWidth; + } -INCLUDE_ASM(void, "msg", get_string_properties); + if (character == 0xF7) { + charWidth = baseWidth * stringScale; + modifier = 0.6; + return charWidth * modifier; + } + if (character == 0xF8) { + charWidth = baseWidth * stringScale; + return charWidth; + } + if (character == 0xF9) { + charWidth = baseWidth * stringScale; + modifier = 0.5; + return charWidth * modifier; + } + if (character < 0xF0) { + return baseWidth * stringScale; + } + } + return 0; +} +#else +INCLUDE_ASM(s32, "msg", msg_get_print_char_width, s32 character, s32 charset, s32 variation, f32 stringScale, s32 overrideCharWidth, u8 flags); +#endif + +s32 msg_get_draw_char_width(s32 character, s32 charset, s32 varaition, f32 stringScale, s32 overrideCharWidth, s32 flags); +INCLUDE_ASM(s32, "msg", msg_get_draw_char_width, s32 character, s32 charset, s32 varaition, f32 stringScale, s32 overrideCharWidth, s32 flags); + +INCLUDE_ASM(void, "msg", get_string_properties, s32 stringID, s32* height, s32* width, s32* maxLineChars, s32* numLines, + s32* maxLinesPerPage, s32* arg6, s32 charset); s32 get_string_width(s32 stringID, u16 charset) { s32 width; - get_string_properties(stringID, 0, &width, 0, 0, 0, 0, charset); + get_string_properties(stringID, NULL, &width, NULL, NULL, NULL, NULL, charset); return width; } s32 get_string_lines(s32 stringID) { s32 numLines; - get_string_properties(stringID, 0, 0, 0, &numLines, 0, 0, 0); + get_string_properties(stringID, NULL, NULL, NULL, &numLines, NULL, NULL, 0); return numLines; } -void draw_string(s32 stringID, s32 posX, s32 posY, s32 opacity, s32 palette, s32 style); +// some weird stacky stringIDy stuff +#ifdef NON_MATCHING +void draw_string(s32 stringID, s32 posX, s32 posY, s32 opacity, s32 palette, u8 style) { + s32 width; + MessagePrintState stackPrinter; + MessagePrintState* printer; + u16 bufferPos; + s32* mallocSpace; + s32 charset; + s32 flags; + + flags = 0; + bufferPos = 0; + mallocSpace = NULL; + charset = 0; + + if (stringID != 0) { + if (style & 1) { + flags = 2; + charset = 1; + } + + if (opacity < 0xFF) { + flags |= 1; + } + + printer = &stackPrinter; + initialize_printer(printer, 1, 0); + + if (stringID < 0) { + printer = (MessagePrintState*)stringID; + } else { + mallocSpace = general_heap_malloc(0x400); + dma_load_string(stringID, mallocSpace); + printer->srcBuffer = mallocSpace; + get_string_properties(stringID, 0, &width, 0, 0, 0, 0, charset); + printer->stringWidth = width; + } + + if (palette >= 0) { + printer->printBuffer[bufferPos++] = 0xFF; + printer->printBuffer[bufferPos++] = 4; + printer->printBuffer[bufferPos++] = palette; + printer->printBufferPos += 3; + } + + if (style & 2) { + printer->printBuffer[bufferPos++] = 0xFF; + printer->printBuffer[bufferPos++] = 0x1C; + printer->printBuffer[bufferPos++] = 8; + printer->printBufferPos += 3; + } + + if (style & 4) { + printer->printBuffer[bufferPos++] = 0xFF; + printer->printBuffer[bufferPos++] = 0x1C; + printer->printBuffer[bufferPos++] = 9; + printer->printBufferPos += 3; + } + + if (style & 8) { + printer->printBuffer[bufferPos++] = 0xFF; + printer->printBuffer[bufferPos++] = 0x1C; + printer->printBuffer[bufferPos++] = 0xE; + printer->printBufferPos += 3; + } + + msg_copy_to_print_buffer(printer, 10000, 1); + appendGfx_message(printer, posX, posY, 0, 0, flags, opacity); + + if (mallocSpace != NULL) { + general_heap_free(mallocSpace); + } + } +} +#else INCLUDE_ASM(void, "msg", draw_string, s32 stringID, s32 posX, s32 posY, s32 opacity, s32 palette, s32 style); +#endif INCLUDE_ASM(s32, "msg", msg_update_rewind_arrow); -INCLUDE_ASM(s32, "msg", msg_draw_rewind_arrow); +void msg_draw_rewind_arrow(s32 printerIndex) { + MessagePrintState* printer = &gMessagePrinters[printerIndex]; + + if (printer->rewindArrowBlinkCounter < 6) { + draw_ci_image_with_clipping(&D_802ED550, 0x18, 0x18, 2, 0, &D_802ED670, printer->rewindArrowPos.x, + printer->rewindArrowPos.y, 0xA, 0xA, 0x12C, 0xDC, 0xFF); + } + + printer->rewindArrowBlinkCounter++; + if (printer->rewindArrowBlinkCounter >= 12) { + printer->rewindArrowBlinkCounter = 0; + } +} INCLUDE_ASM(s32, "msg", msg_draw_choice_pointer); @@ -682,14 +1017,49 @@ INCLUDE_ASM(s32, "msg", draw_digit); INCLUDE_ASM(void, "msg", draw_number, s32 value, s32 x, s32 y, s32 arg3, s32 palette, s32 opacity, s32 style); -void drawbox_message_delegate(s32 arg0) { - appendGfx_message(arg0, 0, 0, 0, 0, 4, 0); +void drawbox_message_delegate(MessagePrintState* printer) { + appendGfx_message(printer, 0, 0, 0, 0, 4, 0); } -INCLUDE_ASM(s32, "msg", draw_message_window); +void draw_message_window(MessagePrintState* printer) { + f32 scale = 1.0f; + s32 rotZ = 0; -INCLUDE_ASM(s32, "msg", appendGfx_message); + switch (printer->windowState) { + case 0xD: + scale = (f32)D_8014C580[printer->fadeInCounter] / 100.0; + rotZ = (4 - printer->fadeInCounter) * 3; + printer->fadeInCounter++; + if (D_8014C580[printer->fadeInCounter] == 0) { + printer->windowState = 4; + } + break; + case 0xE: + scale = (f32)D_8014C588[printer->fadeOutCounter] / 100.0; + rotZ = -printer->fadeOutCounter; + printer->fadeOutCounter++; + if (D_8014C588[printer->fadeOutCounter] == 0) { + printer->stateFlags |= 1; + } + break; + } + switch (printer->windowState) { + case 0xD: + case 0xE: + printer->windowBasePos.x = 160 - (printer->windowSize.x / 2); + printer->windowBasePos.y = 56; + draw_box(1, 0, printer->windowBasePos.x, 56, 0, printer->windowSize.x, printer->windowSize.y, 255, 0, + scale, scale, 0.0f, 0.0f, rotZ, drawbox_message_delegate, printer, NULL, 320, 240, NULL); + break; + default: + appendGfx_message(printer, printer->windowOffsetPos.x, printer->windowOffsetPos.y, printer->unk_46C, + printer->curLinePos, 4, 0); + break; + } +} + +INCLUDE_ASM(void, "msg", appendGfx_message, MessagePrintState* printer, s16 arg1, s16 arg2, u16 arg3, u16 arg4, u16 arg5, u8 arg6); void msg_reset_gfx_state(void) { gDPPipeSync(gMasterGfxPos++); @@ -698,9 +1068,40 @@ void msg_reset_gfx_state(void) { INCLUDE_ASM(s32, "msg", msg_draw_char); -INCLUDE_ASM(s32, "msg", msg_draw_prim_rect); +void msg_draw_prim_rect(u8 r, u8 g, u8 b, u8 a, s32 posX, s32 posY, s32 sizeX, s32 sizeY) { + u16 lrX = posX + sizeX; + u16 lrY = posY + sizeY; -INCLUDE_ASM(s32, "msg", appendGfx_msg_prim_rect); + appendGfx_msg_prim_rect(r, g, b, a, posX, posY, lrX, lrY); +} + +void appendGfx_msg_prim_rect(u8 r, u8 g, u8 b, u8 a, u16 ulX, u16 ulY, u16 lrX, u16 lrY) { + gDPPipeSync(gMasterGfxPos++); + + if (a == 255) { + gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1); + } else { + gDPSetRenderMode(gMasterGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); + gDPSetCombineMode(gMasterGfxPos++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); + } + + gDPSetPrimColor(gMasterGfxPos++, 0, 0, r, g, b, a); + gDPFillRectangle(gMasterGfxPos++, ulX, ulY, lrX, lrY); + gDPPipeSync(gMasterGfxPos++); + gDPSetRenderMode(gMasterGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2); + + switch (gMessageDrawStatePtr->unk_29) { + case 0: + gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); + break; + case 1: + gDPSetCombineMode(gMasterGfxPos++, G_CC_MODULATEIDECALA_PRIM, G_CC_MODULATEIDECALA_PRIM); + break; + default: + gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); + break; + } +} INCLUDE_ASM(s32, "msg", msg_draw_speech_bubble); @@ -708,4 +1109,5 @@ INCLUDE_ASM(s32, "msg", msg_draw_speech_arrow); INCLUDE_ASM(s32, "msg", msg_draw_frame); -INCLUDE_ASM(s32, "msg", msg_get_glyph); +void msg_get_glyph(s32 font, s32 variation, s32 charIndex, s32 palette, MesasgeFontGlyphData* out); +INCLUDE_ASM(void, "msg", msg_get_glyph, s32 font, s32 variation, s32 charIndex, s32 palette, MesasgeFontGlyphData* out); diff --git a/src/world/area_arn/arn.h b/src/world/area_arn/arn.h index 43722d86d7..04caf9e553 100644 --- a/src/world/area_arn/arn.h +++ b/src/world/area_arn/arn.h @@ -3,16 +3,16 @@ #include "si.h" -MapConfig arn_02_config; -MapConfig arn_03_config; -MapConfig arn_04_config; -MapConfig arn_05_config; -MapConfig arn_07_config; -MapConfig arn_08_config; -MapConfig arn_09_config; -MapConfig arn_10_config; -MapConfig arn_11_config; -MapConfig arn_12_config; -MapConfig arn_13_config; +extern MapConfig arn_02_config; +extern MapConfig arn_03_config; +extern MapConfig arn_04_config; +extern MapConfig arn_05_config; +extern MapConfig arn_07_config; +extern MapConfig arn_08_config; +extern MapConfig arn_09_config; +extern MapConfig arn_10_config; +extern MapConfig arn_11_config; +extern MapConfig arn_12_config; +extern MapConfig arn_13_config; #endif diff --git a/src/world/area_arn/arn_04/arn_04.h b/src/world/area_arn/arn_04/arn_04.h index 5a2b8709c1..8a7730c480 100644 --- a/src/world/area_arn/arn_04/arn_04.h +++ b/src/world/area_arn/arn_04/arn_04.h @@ -9,9 +9,9 @@ ApiStatus N(func_80240B94_BE4344)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(func_8024219C_BE594C)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(func_80243018_BE67C8)(ScriptInstance* script, s32 isInitialCall); -Script N(main); -Script N(802433D0); -NpcGroupList N(npcGroupList_80244000); -Script N(makeEntities); +extern Script N(main); +extern Script N(802433D0); +extern NpcGroupList N(npcGroupList_80244000); +extern Script N(makeEntities); extern s16 gCurrentCamID; diff --git a/src/world/area_arn/arn_07/BECDF0.c b/src/world/area_arn/arn_07/BECDF0.c index af0ed38e2e..958b6ebf96 100644 --- a/src/world/area_arn/arn_07/BECDF0.c +++ b/src/world/area_arn/arn_07/BECDF0.c @@ -2,7 +2,7 @@ #include "sprite/npc/world_tubba.h" #include "sprite/npc/tubbas_heart.h" -struct N(temp) { +typedef struct N(temp) { char unk_00[0xC]; EffectInstanceDataThing* unk_0C; } N(temp); diff --git a/src/world/area_dgb/dgb_15/dgb_15.h b/src/world/area_dgb/dgb_15/dgb_15.h index c6c29412df..0ad63cce6f 100644 --- a/src/world/area_dgb/dgb_15/dgb_15.h +++ b/src/world/area_dgb/dgb_15/dgb_15.h @@ -10,9 +10,9 @@ ApiStatus N(func_8024061C_C4FB2C)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(func_80241464_C50974)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(UnkFunc7)(ScriptInstance* script, s32 isInitialCall); -NpcGroupList N(npcGroupList_80242AB0); -Script N(80242AD0); -Script N(main); -Script N(makeEntities); -Script N(npcAI_8024274C); -Script N(unk_80241F8C); +extern NpcGroupList N(npcGroupList_80242AB0); +extern Script N(80242AD0); +extern Script N(main); +extern Script N(makeEntities); +extern Script N(npcAI_8024274C); +extern Script N(unk_80241F8C); diff --git a/src/world/area_flo/flo_14/CCBE20.c b/src/world/area_flo/flo_14/CCBE20.c index 45833814e5..b23d4fadaa 100644 --- a/src/world/area_flo/flo_14/CCBE20.c +++ b/src/world/area_flo/flo_14/CCBE20.c @@ -7,7 +7,7 @@ enum { NPC_BZZAP, }; -static s32 N(D_802453B0_EF79C0)[91]; +s32 N(D_802453B0_EF79C0)[91] BSS; f32 N(D_802444C0_CCF7D0)[] = { 4.5f, 3.5f, 2.6f, 2.0f, @@ -573,8 +573,6 @@ ApiStatus N(func_80242288_CCD598)(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -extern s32 N(D_802453B0_EF79C0)[91]; - ApiStatus N(func_802422C0_CCD5D0)(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32* ptr = get_variable(script, *args); diff --git a/src/world/area_flo/flo_21/CE6700.c b/src/world/area_flo/flo_21/CE6700.c index 1af1369527..5d0e0cbe34 100644 --- a/src/world/area_flo/flo_21/CE6700.c +++ b/src/world/area_flo/flo_21/CE6700.c @@ -26,7 +26,7 @@ typedef struct { s32 unk_74; } N(EffectStruct); -struct N(temp) { +typedef struct N(temp) { char unk_00[0xC]; N(EffectStruct)* unk_0C; } N(temp); diff --git a/src/world/area_hos/hos_00/A0BD40.c b/src/world/area_hos/hos_00/A0BD40.c index 48ff4a13c2..b5b53d0c91 100644 --- a/src/world/area_hos/hos_00/A0BD40.c +++ b/src/world/area_hos/hos_00/A0BD40.c @@ -12,3 +12,4 @@ static char* N(exit_str_0) = "osr_00"; static char* N(exit_str_1) = "osr_01"; static char* N(exit_str_2) = "hos_01"; static char* N(exit_str_3) = "hos_06"; +static char* N(exit_str_4) = "\0\0\0\0"; diff --git a/src/world/area_kmr/kmr.h b/src/world/area_kmr/kmr.h index 80fd66c4d8..7e2b698db7 100644 --- a/src/world/area_kmr/kmr.h +++ b/src/world/area_kmr/kmr.h @@ -77,22 +77,22 @@ #define KMR20_ChasedOffShyGuy SI_SAVE_FLAG(0x06D) #define KMR10_KnockedSpringOutOfTree SI_SAVE_FLAG(0x06E) -MapConfig kmr_00_config; -MapConfig kmr_02_config; -MapConfig kmr_03_config; -MapConfig kmr_04_config; -MapConfig kmr_05_config; -MapConfig kmr_06_config; -MapConfig kmr_07_config; -MapConfig kmr_09_config; -MapConfig kmr_10_config; -MapConfig kmr_11_config; -MapConfig kmr_12_config; -MapConfig kmr_20_config; -MapConfig kmr_21_config; -MapConfig kmr_22_config; -MapConfig kmr_23_config; -MapConfig kmr_24_config; -MapConfig kmr_30_config; +extern MapConfig kmr_00_config; +extern MapConfig kmr_02_config; +extern MapConfig kmr_03_config; +extern MapConfig kmr_04_config; +extern MapConfig kmr_05_config; +extern MapConfig kmr_06_config; +extern MapConfig kmr_07_config; +extern MapConfig kmr_09_config; +extern MapConfig kmr_10_config; +extern MapConfig kmr_11_config; +extern MapConfig kmr_12_config; +extern MapConfig kmr_20_config; +extern MapConfig kmr_21_config; +extern MapConfig kmr_22_config; +extern MapConfig kmr_23_config; +extern MapConfig kmr_24_config; +extern MapConfig kmr_30_config; #endif diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index e4b1a14d49..f96c2b9a7d 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -307,6 +307,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241C18_8B1C88); static char* N(exit_str_4) = "nok_02"; static char* N(exit_str_5) = "kmr_03"; +static char* N(exit_str_6) = "\0\0\0\0"; #include "world/common/UnkFunc41.inc.c" diff --git a/src/world/area_kmr/kmr_03/kmr_03.h b/src/world/area_kmr/kmr_03/kmr_03.h index 27fdc6ca79..0dfcb3513c 100644 --- a/src/world/area_kmr/kmr_03/kmr_03.h +++ b/src/world/area_kmr/kmr_03/kmr_03.h @@ -8,9 +8,9 @@ ApiStatus N(UnkPositionFunc)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(UnkFunc41)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(func_802401B0_8C8140)(ScriptInstance* script, s32 isInitialCall); -NpcGroupList N(npcGroupList_80241450); -Script N(802422B8); -Script N(80242340); -Script N(802406C0); -Script N(main); -Script N(makeEntities); \ No newline at end of file +extern NpcGroupList N(npcGroupList_80241450); +extern Script N(802422B8); +extern Script N(80242340); +extern Script N(802406C0); +extern Script N(main); +extern Script N(makeEntities); diff --git a/src/world/area_mac/mac_00/7EAD10.c b/src/world/area_mac/mac_00/7EAD10.c index f50cf9326f..ee316d0f24 100644 --- a/src/world/area_mac/mac_00/7EAD10.c +++ b/src/world/area_mac/mac_00/7EAD10.c @@ -5,6 +5,7 @@ static char* N(exit_str_1) = "mac_01"; static char* N(exit_str_2) = "tik_19"; static char* N(exit_str_3) = "kmr_20"; static char* N(exit_str_4) = "mac_00"; +static char* N(exit_str_5) = "\0\0\0\0"; #include "world/common/SetPlayerStatusAnimFlags100000.inc.c" diff --git a/src/world/area_sbk/sbk_00/929270.c b/src/world/area_sbk/sbk_00/929270.c index 61446b67bd..eba429ee5e 100644 --- a/src/world/area_sbk/sbk_00/929270.c +++ b/src/world/area_sbk/sbk_00/929270.c @@ -3,9 +3,6 @@ #include "world/common/SpawnSunEffect.inc.c" -Script N(main); -s32 N(npcGroupList_80240768)[]; - EntryList N(entryList) = { { -475.0f, 0.0f, 0.0f, 90.0f }, { 475.0f, 0.0f, 0.0f, 270.0f }, diff --git a/src/world/area_sbk/sbk_00/sbk_00.h b/src/world/area_sbk/sbk_00/sbk_00.h index d783b8fee3..16020fa269 100644 --- a/src/world/area_sbk/sbk_00/sbk_00.h +++ b/src/world/area_sbk/sbk_00/sbk_00.h @@ -3,4 +3,6 @@ #define NAMESPACE sbk_00 -Script N(makeEntities); +extern Script N(main); +extern NpcGroupList N(npcGroupList_80240768); +extern Script N(makeEntities); diff --git a/src/world/partner/goombaria.h b/src/world/partner/goombaria.h index aefd8be80e..d72015fb26 100644 --- a/src/world/partner/goombaria.h +++ b/src/world/partner/goombaria.h @@ -6,9 +6,9 @@ void world_goombaria_init(Npc* partner); -Script world_goombaria_take_out; -Script world_goombaria_update; -Script world_goombaria_use_ability; -Script world_goombaria_put_away; +extern Script world_goombaria_take_out; +extern Script world_goombaria_update; +extern Script world_goombaria_use_ability; +extern Script world_goombaria_put_away; #endif diff --git a/src/world/partner/goombario.h b/src/world/partner/goombario.h index da8b6be25d..d002503e08 100644 --- a/src/world/partner/goombario.h +++ b/src/world/partner/goombario.h @@ -9,9 +9,9 @@ s32 world_goombario_can_pause(Npc* partner); ApiStatus func_802BDB84(ScriptInstance* script, s32 isInitialCall); void world_goombario_pre_battle(Npc* partner); -Script world_goombario_take_out; -Script world_goombario_update; -Script world_goombario_use_ability; -Script world_goombario_put_away; +extern Script world_goombario_take_out; +extern Script world_goombario_update; +extern Script world_goombario_use_ability; +extern Script world_goombario_put_away; #endif diff --git a/src/world/partner/goompa.h b/src/world/partner/goompa.h index 01562cbda4..4f3c07304a 100644 --- a/src/world/partner/goompa.h +++ b/src/world/partner/goompa.h @@ -6,9 +6,9 @@ void world_goompa_init(Npc* partner); -Script world_goompa_take_out; -Script world_goompa_update; -Script world_goompa_use_ability; -Script world_goompa_put_away; +extern Script world_goompa_take_out; +extern Script world_goompa_update; +extern Script world_goompa_use_ability; +extern Script world_goompa_put_away; #endif diff --git a/src/world/partner/twink.h b/src/world/partner/twink.h index da1c43833b..98ca996021 100644 --- a/src/world/partner/twink.h +++ b/src/world/partner/twink.h @@ -6,9 +6,9 @@ void world_twink_init(Npc* partner); -Script world_twink_take_out; -Script world_twink_update; -Script world_twink_use_ability; -Script world_twink_put_away; +extern Script world_twink_take_out; +extern Script world_twink_update; +extern Script world_twink_use_ability; +extern Script world_twink_put_away; #endif diff --git a/src/world/partners.c b/src/world/partners.c index 36d86c8e42..fb4b713586 100644 --- a/src/world/partners.c +++ b/src/world/partners.c @@ -30,8 +30,15 @@ #include "partner/twink.h" #include "sprite/npc/twink.h" +extern f32 D_8010CFC0; +extern s16 D_8010CFC8; +extern s16 D_8010CFCA; +extern s16 D_8010CFCE; +extern s32 D_802C0000; + s32 partner_is_idle(Npc* partner); s32 world_partner_can_player_pause_default(Npc* partner); +NpcID _create_npc_basic(NpcBlueprint* blueprint); // Partner icons s32 D_800F7F00[] = { @@ -64,11 +71,6 @@ f32 D_800F8030 = 0.0f; s8 D_800F8034[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; s16 D_800F803A = 0; -extern f32 D_8010CFC0; -extern s16 D_8010CFC8; -extern s16 D_8010CFCA; -extern s16 D_8010CFCE; - WorldPartner wPartners[12] = { {}, // None { @@ -254,9 +256,22 @@ f32 D_800F833C = 0; f32 D_800F8340 = 0; f32 D_800F8344 = 0; -NpcID _create_npc_basic(NpcBlueprint* blueprint); +PartnerAnimations gPartnerAnimations[] = { + {0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000}, + {0x00010000, 0x00010002, 0x00010004, 0x00010005, 0x00010001, 0x00010001, 0x00010003, 0x00010008, 0x00010007}, + {0x00020000, 0x00020004, 0x00020006, 0x00020007, 0x00020000, 0x00020003, 0x00020005, 0x0002000D, 0x0002000C}, + {0x00030000, 0x00030005, 0x00030009, 0x0003000A, 0x00030000, 0x00030003, 0x00030007, 0x0003000E, 0x0003000D}, + {0x00040000, 0x00040002, 0x00040008, 0x00040002, 0x00040002, 0x00040001, 0x00040003, 0x00040006, 0x00040005}, + {0x009D0000, 0x009D0002, 0x009D0004, 0x009D0005, 0x009D0001, 0x009D0001, 0x009D0003, 0x009D0008, 0x009D0001}, + {0x00060000, 0x00060002, 0x00060002, 0x00060002, 0x00060000, 0x00060001, 0x00060003, 0x00060004, 0x00060007}, + {0x00070000, 0x00070002, 0x00070002, 0x00070002, 0x00070000, 0x00070001, 0x00070003, 0x00070004, 0x00070008}, + {0x00080000, 0x00080005, 0x00080005, 0x00080005, 0x00080000, 0x00080001, 0x00080007, 0x00080009, 0x0008000A}, + {0x00050000, 0x00050002, 0x00050002, 0x00050002, 0x00050000, 0x00050001, 0x00050003, 0x00050004, 0x0005000C}, + {0x009E0000, 0x009E0005, 0x009E0012, 0x009E0013, 0x009E0001, 0x009E0001, 0x009E0007, 0x009E000B, 0x009E0001}, + {0x00200000, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200009, 0x00200020}, +}; -extern s32 D_802C0000; +s32 D_800F84F8 = { 0x00000000, 0x00000000, }; s32 use_consumable(s32 arg0) { ScriptInstance* script; diff --git a/tools/build/configure.py b/tools/build/configure.py index 46a7aabe8c..97e1df6571 100755 --- a/tools/build/configure.py +++ b/tools/build/configure.py @@ -13,9 +13,9 @@ DO_SHA1_CHECK = True CPPFLAGS = "-w -Iver/$version/build/include -Iinclude -Isrc -D _LANGUAGE_C -D _FINALROM -D VERSION=$version " \ "-ffreestanding -DF3DEX_GBI_2 -D_MIPS_SZLONG=32 -MD -MF $out.d" -CFLAGS = "-O2 -quiet -G0 -mcpu=vr4300 -mfix4300 -mips3 -mgp32 -mfp32 -Wuninitialized -Wshadow -Wmissing-braces -fforce-addr" -CFLAGS_NUSYS = "-O2 -quiet -G0 -mcpu=vr4300 -mfix4300 -mips3 -mgp32 -mfp32 -Wuninitialized -Wshadow -Wmissing-braces" -CFLAGS_LIBULTRA = "-O2 -quiet -G0 -mcpu=vr4300 -mfix4300 -mips3 -mgp32 -mfp32 -Wuninitialized -Wshadow -Wmissing-braces" +CFLAGS = "-O2 -quiet -fno-common -G0 -mcpu=vr4300 -mfix4300 -mips3 -mgp32 -mfp32 -Wuninitialized -Wshadow -Wmissing-braces -fforce-addr" +CFLAGS_NUSYS = "-O2 -quiet -fno-common -G0 -mcpu=vr4300 -mfix4300 -mips3 -mgp32 -mfp32 -Wuninitialized -Wshadow -Wmissing-braces" +CFLAGS_LIBULTRA = "-O2 -quiet -fno-common -G0 -mcpu=vr4300 -mfix4300 -mips3 -mgp32 -mfp32 -Wuninitialized -Wshadow -Wmissing-braces" ASFLAGS = "-EB -G 0" diff --git a/tools/build/linux/cc1 b/tools/build/linux/cc1 index 4c8924b8f3..f5d40e8157 100755 Binary files a/tools/build/linux/cc1 and b/tools/build/linux/cc1 differ diff --git a/ver/us/asm/data/10CC10.data.s b/ver/us/asm/data/10CC10.data.s index 9efcb1444f..ffe164e3e0 100644 --- a/ver/us/asm/data/10CC10.data.s +++ b/ver/us/asm/data/10CC10.data.s @@ -35,7 +35,7 @@ glabel D_802EB590 glabel D_802EB59C .word 0x0C0C0A0A, 0x00480000, D_802EB578 -glabel D_802EB5A8 +glabel gMsgCharsets .word D_802EB4F0, D_802EB4FC, D_802EB4FC, D_802EB590, D_802EB59C, 0x00000000 glabel D_802EB5C0 diff --git a/ver/us/asm/data/917F8.data.s b/ver/us/asm/data/917F8.data.s deleted file mode 100644 index e3497d3553..0000000000 --- a/ver/us/asm/data/917F8.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -glabel gPartnerAnimations -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00010002, 0x00010004, 0x00010005, 0x00010001, 0x00010001, 0x00010003, 0x00010008, 0x00010007, 0x00020000, 0x00020004, 0x00020006, 0x00020007, 0x00020000, 0x00020003, 0x00020005, 0x0002000D, 0x0002000C, 0x00030000, 0x00030005, 0x00030009, 0x0003000A, 0x00030000, 0x00030003, 0x00030007, 0x0003000E, 0x0003000D, 0x00040000, 0x00040002, 0x00040008, 0x00040002, 0x00040002, 0x00040001, 0x00040003, 0x00040006, 0x00040005, 0x009D0000, 0x009D0002, 0x009D0004, 0x009D0005, 0x009D0001, 0x009D0001, 0x009D0003, 0x009D0008, 0x009D0001, 0x00060000, 0x00060002, 0x00060002, 0x00060002, 0x00060000, 0x00060001, 0x00060003, 0x00060004, 0x00060007, 0x00070000, 0x00070002, 0x00070002, 0x00070002, 0x00070000, 0x00070001, 0x00070003, 0x00070004, 0x00070008, 0x00080000, 0x00080005, 0x00080005, 0x00080005, 0x00080000, 0x00080001, 0x00080007, 0x00080009, 0x0008000A, 0x00050000, 0x00050002, 0x00050002, 0x00050002, 0x00050000, 0x00050001, 0x00050003, 0x00050004, 0x0005000C, 0x009E0000, 0x009E0005, 0x009E0012, 0x009E0013, 0x009E0001, 0x009E0001, 0x009E0007, 0x009E000B, 0x009E0001, 0x00200000, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200009, 0x00200020 - -glabel D_800F84F8 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00FFFFFF, 0xFFFFF000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFF0, 0x00000000, 0x00000000, 0x00000000, 0x000000FF, 0xFFFAA888, 0x888AAFFF, 0xF0000000, 0x00000000, 0x00000000, 0x00000FFF, 0xA9888888, 0x888889AF, 0xFF000000, 0x00000000, 0x00000000, 0x0000FFF8, 0x88888888, 0x88888888, 0xFFF00000, 0x00000000, 0x00000000, 0x000FFF78, 0x88EEE688, 0x88888888, 0x7FFF0000, 0x00000000, 0x00000000, 0x00FFF788, 0x88EEE788, 0x88888888, 0x87FFF000, 0x00000000, 0x00000000, 0x0FFF7888, 0x8EEEEE78, 0x88888888, 0x888FFF00, 0x00000000, 0x00000000, 0xFFFA8888, 0x8EEEEE68, 0x88888888, 0x888AFFF0, 0x00000000, 0x0000000F, 0xFFF88888, 0x8EE7EE78, 0x88888888, 0x8888FFFF, 0x00000000, 0x000000FF, 0xF2E88888, 0xEEE7EEE7, 0x88888888, 0x8888E2FF, 0xF0000000, 0x00000FFF, 0x2CE88888, 0xEEE8EEE6, 0x88888888, 0x8888EC2F, 0xFF000000, 0x00000FF2, 0xCDE88888, 0xEEEEEEE7, 0x88888888, 0x8888EDC2, 0xFF000000, 0x0000FFFC, 0xCDE7888E, 0xEEAAAAEE, 0x88888888, 0x8888EDCC, 0xFFF00000, 0x0000FF2C, 0xCDE7788E, 0xEE577EAE, 0x78888888, 0x8887EDCC, 0x2FF00000, 0x000FFFDC, 0xCDE8678E, 0xEE888EEE, 0x68888888, 0x8877EDCC, 0xDFFF0000, 0x000FFFCC, 0xCDEA8567, 0x77888877, 0x68888888, 0x8658EDCC, 0xCFFF0000, 0x000FFFCC, 0xCDEAA755, 0x78888888, 0x88888886, 0x345AEDCC, 0xCFFF0000, 0x000FFFCC, 0xCD2AAA65, 0x55788888, 0x88888741, 0x149A2DCC, 0xCFFF0000, 0x000FFFCC, 0xCDDEAAA8, 0x55557888, 0x88743111, 0x59AEDDCC, 0xCFFF0000, 0x000FFFDC, 0xCCD2AAAA, 0x87555444, 0x33111137, 0x9AA2DCCC, 0xDFFF0000, 0x000FFFDC, 0xCBDDEAAA, 0xAA876654, 0x443348AA, 0xAAEDDBCC, 0xDFFF0000, 0x0000FF2C, 0xBBCDDEAA, 0xAAAAA888, 0x888AAAAA, 0xAEDDCBBC, 0x2FF00000, 0x0000FFFD, 0xBBBCDDEA, 0xAAAAAAAA, 0xAAAAAAAA, 0xEDDCBBBD, 0xFFF00000, 0x00000FFF, 0xDBBBCDD2, 0xAAAAAAAA, 0xAAAAAAA2, 0xDDCBBBCF, 0xFF000000, 0x00000FFF, 0xFCBBBCDD, 0xD2EAAAAA, 0xAAAAE2DD, 0xDCBBBCFF, 0xFF000000, 0x000000FF, 0xFFCBBBBC, 0xDDD22EEE, 0xEE22DDDC, 0xBBBBCFFF, 0xF0000000, 0x0000000F, 0xFFFCBBBB, 0xBCCDDDDD, 0xDDDDCCBB, 0xBBBCFFFF, 0x00000000, 0x00000000, 0xFFFFDCBB, 0xBBBBCCCC, 0xCCCBBBBB, 0xBBCFFFF0, 0x00000000, 0x00000000, 0x0FFFF2CB, 0xBBBBBBBB, 0xBBBBBBBB, 0xC2FFFF00, 0x00000000, 0x00000000, 0x00FFFFF2, 0xDDCCBBBB, 0xBBBCCDD2, 0xFFFFF000, 0x00000000, 0x00000000, 0x0000FFFF, 0xFF2DDDDD, 0xDDDD2FFF, 0xFFF00000, 0x00000000, 0x00000000, 0x000000FF, 0xFFFFFFFF, 0xFFFFFFFF, 0xF0000000, 0x00000000, 0x00000000, 0x00000000, 0x0FFFFFFF, 0xFFFFFF00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x7BDEB5AD, 0x42118437, 0x6B7B52BF, 0x4A7D39F9, 0x31AB2963, 0x21199CE7, 0x84216B5B, 0x10971085, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0FFFFFFF, 0xFFFFFF00, 0x00000000, 0x00000000, 0x00000000, 0x000000FF, 0xFFFFFFFF, 0xFFFFFFFF, 0xF0000000, 0x00000000, 0x00000000, 0x0000FFFF, 0xF2DDCCCC, 0xCCCDD2FF, 0xFFF00000, 0x00000000, 0x00000000, 0x00FFFFFD, 0xCCCAA888, 0x888AACCD, 0xFFFFF000, 0x00000000, 0x00000000, 0x0FFFFDCC, 0xA9888888, 0x888889AC, 0xCDFFFF00, 0x00000000, 0x00000000, 0xFFF2CCD8, 0x88888888, 0x88888888, 0xDCC2FFF0, 0x00000000, 0x0000000F, 0xFF2CDD78, 0x88EEE688, 0x88888888, 0x7DDC2FFF, 0x00000000, 0x000000FF, 0xF2CDD788, 0x88EEE788, 0x88888888, 0x87DDC2FF, 0xF0000000, 0x00000FFF, 0x2CDD7888, 0x8EEEEE78, 0x88888888, 0x888DDC2F, 0xFF000000, 0x00000FF2, 0xCDDA8888, 0x8EEEEE68, 0x88888888, 0x888ADDC2, 0xFF000000, 0x0000FFFC, 0xCDD88888, 0x8EE7EE78, 0x88888888, 0x8888DDCC, 0xFFF00000, 0x0000FF2C, 0xCDA88888, 0xEEE7EEE7, 0x88888888, 0x8888ADCC, 0x2FF00000, 0x000FFFDC, 0xCDA88888, 0xEEE8EEE6, 0x88888888, 0x8888ADCC, 0xDFFF0000, 0x000FFFCC, 0xCDA88888, 0xEEEEEEE7, 0x88888888, 0x8888ADCC, 0xCFFF0000, 0x000FFFCC, 0xCDA7888E, 0xEEAAAAEE, 0x88888888, 0x8888ADCC, 0xCFFF0000, 0x000FFFCC, 0xCDA7788E, 0xEE577EAE, 0x78888888, 0x8887ADCC, 0xCFFF0000, 0x000FFFCC, 0xCD28678E, 0xEE888EEE, 0x68888888, 0x88772DCC, 0xCFFF0000, 0x000FFFDC, 0xCCDE8567, 0x77888877, 0x68888888, 0x865EDCCC, 0xDFFF0000, 0x000FFFDC, 0xCBDDE755, 0x78888888, 0x88888886, 0x44EDDBCC, 0xDFFF0000, 0x0000FF2C, 0xBBCDDE65, 0x55788888, 0x88888743, 0x4EDDCBBC, 0x2FF00000, 0x0000FFFD, 0xBBBCDDE8, 0x55557888, 0x88754335, 0xEDDCBBBD, 0xFFF00000, 0x00000FFF, 0xDBBBCDDE, 0xA7555555, 0x443335EE, 0xDDCBBBCF, 0xFF000000, 0x00000FFF, 0xFCBBBCDD, 0xDEE76655, 0x5545EEDD, 0xDCBBBCFF, 0xFF000000, 0x000000FF, 0xFFCBBBBC, 0xDDDEEEEE, 0xEEEEDDDC, 0xBBBBCFFF, 0xF0000000, 0x0000000F, 0xFFFCBBBB, 0xBCCDDDDD, 0xDDDDCCBB, 0xBBBCFFFF, 0x00000000, 0x00000000, 0xFFFFDCBB, 0xBBBBCCCC, 0xCCCBBBBB, 0xBBCFFFF0, 0x00000000, 0x00000000, 0x0FFFF2CB, 0xBBBBBBBB, 0xBBBBBBBB, 0xC2FFFF00, 0x00000000, 0x00000000, 0x00FFFFF2, 0xDDCCBBBB, 0xBBBCCDD2, 0xFFFFF000, 0x00000000, 0x00000000, 0x0000FFFF, 0xFF2DDDDD, 0xDDDD2FFF, 0xFFF00000, 0x00000000, 0x00000000, 0x000000FF, 0xFFFFFFFF, 0xFFFFFFFF, 0xF0000000, 0x00000000, 0x00000000, 0x00000000, 0x0FFFFFFF, 0xFFFFFF00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x7BDEB5AD, 0x42118437, 0x6B7B52BF, 0x4A7D39F9, 0x31AB2963, 0x21199CE7, 0x84216B5B, 0x10971085, 0x00000000, 0x0000FFFF, 0xFFFFF000, 0x00000000, 0x00000000, 0x0FFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0000000F, 0xFFFFFFFF, 0xFFFFFFFF, 0xFF000000, 0x00000FFF, 0xFFF88655, 0x555688FF, 0xFFFF0000, 0x0000FFFF, 0xF4435448, 0x98445344, 0xFFFFF000, 0x000FFFF6, 0x36423555, 0x55553246, 0x36FFFF00, 0x00FFFF43, 0x46543222, 0x22223456, 0x434FFFF0, 0x00FFF644, 0x14565544, 0x44455654, 0x1446FFF0, 0x00FFF444, 0x42145666, 0x66665412, 0x4444FFF0, 0x00FFF543, 0x34422211, 0x11122244, 0x3345FFF0, 0x00FFFF43, 0x22334444, 0x44444332, 0x2349FFF0, 0x000FFFF7, 0x42222222, 0x22222222, 0x479FFF00, 0x0000FFFF, 0x98543211, 0x11122458, 0x99FFF000, 0x00000FFF, 0xFF987766, 0x66677899, 0xFFFF0000, 0x0000000F, 0xFFFF9988, 0x88899FFF, 0xFF000000, 0x00000000, 0x00FFF766, 0x6667FFF0, 0x00000000, 0x00000000, 0x00FFF654, 0x4456FFF0, 0x00000000, 0x0000000F, 0xFFFFF844, 0x3448FFFF, 0xFF000000, 0x00000FFF, 0xFFFFA944, 0x3449FFFF, 0xFFFF0000, 0x000FFFFF, 0x9988AA44, 0x344AA889, 0x9FFFFF00, 0x00FFF998, 0x8888AA64, 0x346AA888, 0x8899FFF0, 0x00FFF888, 0x8888AA84, 0x348AA888, 0x8888FFF0, 0x00FFF888, 0x8888AAA4, 0x34AAA888, 0x8888FFF0, 0x00FFF998, 0x88888AA4, 0x44AA8888, 0x8899FFF0, 0x00FFFFFF, 0x99888AA6, 0x46AA8889, 0x9FFFFFF0, 0x0000FFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFF000, 0x0000000F, 0xFFFFFFFF, 0xFFFFFFFF, 0xFF000000, 0x00000000, 0x000FFFFF, 0xFFFFFF00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x7BDED6B5, 0xC635B5B1, 0x9CEB8C69, 0x7BE56B61, 0x5299318F, 0x210B003F, 0x003F003F, 0x003F1085, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000000FF, 0xFFF00000, 0x00000000, 0x00000000, 0x00000000, 0x0000FFFF, 0xFFFFF000, 0x00000000, 0x00000000, 0x00000000, 0x00FFFFFF, 0xFFFFFF00, 0x00000000, 0x00000000, 0x00000000, 0xFFFFF863, 0x446FFFF0, 0x00000000, 0x00000000, 0x0000000F, 0xFFF84464, 0x3446FFF0, 0x00000000, 0x00000000, 0x000000FF, 0xFF853464, 0x14349FF0, 0x00000000, 0x00000000, 0x00000FFF, 0xF5453454, 0x24339FF0, 0x00000000, 0x00000000, 0x0000FFFF, 0x58453363, 0x24239FF0, 0x00000000, 0x00000000, 0x000FFFF5, 0x98522541, 0x42249FF0, 0x00000000, 0x00000000, 0x000FFF58, 0x85224613, 0x4228FF00, 0x00000000, 0x00000000, 0x00FFF644, 0x52246124, 0x2259FF00, 0x00000000, 0x00000000, 0x00FF8545, 0x22461142, 0x228FF000, 0x00000000, 0x00000000, 0x0FFF3332, 0x24611422, 0x279FF000, 0x00000000, 0x00000000, 0x0FF84243, 0x56114211, 0x699FF000, 0x00000000, 0x00000000, 0xFFF66666, 0x41242116, 0x887FFFFF, 0xFFFFFFF0, 0x00000000, 0xFFF34443, 0x13422168, 0x8656FFFF, 0xFFFFFFFF, 0xFF000000, 0xFFF42122, 0x44221688, 0x64549FAF, 0xFFFFFFFF, 0xFFFF0000, 0xFFF44444, 0x22237986, 0x44444AAA, 0x88888889, 0x9FFFFF00, 0xFFF44332, 0x22489975, 0x433449AA, 0x88888888, 0x8899FFF0, 0x0FF64434, 0x479FFFA6, 0x443346AA, 0xA8888888, 0x8888FFF0, 0x0FFF6447, 0x9FFFFFA9, 0x844334AA, 0xA8888888, 0x8888FFF0, 0x00FFFFFF, 0xFFFFFFAA, 0x9A64334A, 0xAA888888, 0x8899FFF0, 0x000FFFFF, 0xF0FFFFFF, 0xAAA8444A, 0xAA888889, 0x9FFFFFF0, 0x00000000, 0x0000FFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFF000, 0x00000000, 0x0000000F, 0xFFFFFFFF, 0xFFFFFFFF, 0xFF000000, 0x00000000, 0x00000000, 0x000FFFFF, 0xFFFFFF00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x7BDED6B5, 0xC635B5B1, 0x9CEB8C69, 0x7BE56B61, 0x5299318F, 0x210B003F, 0x003F003F, 0x003F1085, 0x00000000, 0x00000FFF, 0xFFFFFF00, 0x00000000, 0x00000000, 0x00FFFFFF, 0xFFFFFFFF, 0xF0000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFF00000, 0x000000FF, 0xFFFF8865, 0x5555688F, 0xFFFFF000, 0x00000FFF, 0xFF443544, 0x89844534, 0x4FFFFF00, 0x0000FFFF, 0x63642355, 0x55555324, 0x636FFFF0, 0x000FFFF4, 0x34654322, 0x22222345, 0x6434FFFF, 0x000FFF64, 0x41456554, 0x44445565, 0x41446FFF, 0x000FFF44, 0x44214566, 0x66666541, 0x24444FFF, 0x000FFF54, 0x33442221, 0x11112224, 0x43345FFF, 0x000FFFF4, 0x32233444, 0x44444433, 0x22349FFF, 0x0000FFFF, 0x74222222, 0x22222222, 0x2479FFF0, 0x00000FFF, 0xF9854321, 0x11112245, 0x899FFF00, 0x000000FF, 0xFFF98776, 0x66667789, 0x9FFFF000, 0x00000000, 0xFFFFF998, 0x888899FF, 0xFFF00000, 0x00000000, 0x00FFF966, 0x66677FF0, 0x00000000, 0x00000000, 0x00FFF964, 0x44568FF0, 0x00000000, 0x0000000F, 0xFFFFF974, 0x43449FFF, 0xFF000000, 0x00000FFF, 0xFFFFA974, 0x4346FFFF, 0xFFFF0000, 0x000FFFFF, 0x9988AA74, 0x4348AF89, 0x9FFFFF00, 0x00FFF998, 0x8888AA84, 0x344AAF88, 0x8899FFF0, 0x00FFF888, 0x8888AA84, 0x346AA888, 0x8888FFF0, 0x00FFF888, 0x88888AA4, 0x348AA888, 0x8888FFF0, 0x00FFF998, 0x88888AA4, 0x44AA8888, 0x8899FFF0, 0x00FFFFFF, 0x99888AA6, 0x46AA8889, 0x9FFFFFF0, 0x0000FFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFF000, 0x0000000F, 0xFFFFFFFF, 0xFFFFFFFF, 0xFF000000, 0x00000000, 0x000FFFFF, 0xFFFFFF00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x7BDED6B5, 0xC635B5B1, 0x9CEB8C69, 0x7BE56B61, 0x5299318F, 0x210B003F, 0x003F003F, 0x003F1085, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000FFF, 0xFF000000, 0x00000000, 0x00000000, 0x00000000, 0x000FFFFF, 0xFFFF0000, 0x00000000, 0x00000000, 0x00000000, 0x00FFFFFF, 0xFFFFFF00, 0x00000000, 0x00000000, 0x00000000, 0x0FFFF644, 0x368FFFFF, 0x00000000, 0x00000000, 0x00000000, 0x0FFF6443, 0x46448FFF, 0xF0000000, 0x00000000, 0x00000000, 0x0FF94341, 0x464358FF, 0xFF000000, 0x00000000, 0x00000000, 0x0FF93342, 0x4543545F, 0xFFF00000, 0x00000000, 0x00000000, 0x0FF93242, 0x36335485, 0xFFFF0000, 0x00000000, 0x00000000, 0x0FF94224, 0x14522589, 0x5FFFF000, 0x00000000, 0x00000000, 0x00FF8224, 0x31642258, 0x85FFF000, 0x00000000, 0x00000000, 0x00FF9522, 0x42164225, 0x446FFF00, 0x00000000, 0x00000000, 0x000FF822, 0x24116422, 0x5458FF00, 0x00000000, 0x00000000, 0x000FF972, 0x22411642, 0x2333FFF0, 0x00000000, 0x00000000, 0x000FF996, 0x11241165, 0x34248FF0, 0x00000000, 0x0FFFFFFF, 0xFFFFF788, 0x61124214, 0x66666FFF, 0x000000FF, 0xFFFFFFFF, 0xFFFF6568, 0x86122431, 0x34443FFF, 0x0000FFFF, 0xFFFFFFFF, 0xFAF94546, 0x88612244, 0x22124FFF, 0x00FFFFF9, 0x98888888, 0xAAA44444, 0x68973222, 0x44444FFF, 0x0FFF9988, 0x88888888, 0xAA944334, 0x57998422, 0x23344FFF, 0x0FFF8888, 0x8888888A, 0xAA643344, 0x6AFFF974, 0x43446FF0, 0x0FFF8888, 0x8888888A, 0xAA433448, 0x9AFFFFF9, 0x7446FFF0, 0x0FFF9988, 0x888888AA, 0xA43346A9, 0xAAFFFFFF, 0xFFFFFF00, 0x0FFFFFF9, 0x988888AA, 0xA4448AAA, 0xFFFFFF0F, 0xFFFFF000, 0x000FFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFF0000, 0x00000000, 0x000000FF, 0xFFFFFFFF, 0xFFFFFFFF, 0xF0000000, 0x00000000, 0x00000000, 0x00FFFFFF, 0xFFFFF000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x7BDED6B5, 0xC635B5B1, 0x9CEB8C69, 0x7BE56B61, 0x5299318F, 0x210B003F, 0x003F003F, 0x003F1085, 0x00000000, 0x000FFFFF, 0xFFFF0000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFF0, 0x00000000, 0x000000FF, 0xFFFFFFFF, 0xFFFFFFFF, 0xF0000000, 0x0000FFFF, 0xFF886555, 0x55688FFF, 0xFFF00000, 0x000FFFFF, 0x44354489, 0x8445344F, 0xFFFF0000, 0x00FFFF63, 0x64235555, 0x55532463, 0x6FFFF000, 0x0FFFF434, 0x65432222, 0x22234564, 0x34FFFF00, 0x0FFF6441, 0x45655444, 0x44556541, 0x446FFF00, 0x0FFF4444, 0x21456666, 0x66654124, 0x444FFF00, 0x0FFF5433, 0x44222111, 0x11222443, 0x345FFF00, 0x0FFF9432, 0x23344444, 0x44443322, 0x34FFFF00, 0x00FFF974, 0x22222222, 0x22222224, 0x7FFFF000, 0x000FFF99, 0x85422111, 0x11234589, 0xFFFF0000, 0x0000FFFF, 0x99877666, 0x667789FF, 0xFFF00000, 0x000000FF, 0xFFF99888, 0x8899FFFF, 0xF0000000, 0x00000000, 0x00FF7766, 0x6669FFF0, 0x00000000, 0x00000000, 0x00FF8654, 0x4469FFF0, 0x00000000, 0x0000000F, 0xFFFF9443, 0x4479FFFF, 0xFF000000, 0x00000FFF, 0xFFFFF643, 0x4479AFFF, 0xFFFF0000, 0x000FFFFF, 0x998FA843, 0x447AA889, 0x9FFFFF00, 0x00FFF998, 0x888FAA44, 0x348AA888, 0x8899FFF0, 0x00FFF888, 0x8888AA64, 0x348AA888, 0x8888FFF0, 0x00FFF888, 0x8888AA84, 0x34AA8888, 0x8888FFF0, 0x00FFF998, 0x88888AA4, 0x44AA8888, 0x8899FFF0, 0x00FFFFFF, 0x99888AA6, 0x46AA8889, 0x9FFFFFF0, 0x0000FFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFF000, 0x0000000F, 0xFFFFFFFF, 0xFFFFFFFF, 0xFF000000, 0x00000000, 0x000FFFFF, 0xFFFFFF00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x7BDED6B5, 0xC635B5B1, 0x9CEB8C69, 0x7BE56B61, 0x5299318F, 0x210B003F, 0x003F003F, 0x003F1085, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000000FF, 0xFFF00000, 0x00000000, 0x00000000, 0x000FFFFF, 0xFFFFFF00, 0x00000000, 0x00000000, 0x0FFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00000000, 0xFFFFF876, 0x6678FFFF, 0xF0000000, 0x0000000F, 0xFFF85555, 0x555558FF, 0xFF000000, 0x000000FF, 0xF9655433, 0x33345569, 0xFFF00000, 0x00000FFF, 0x85543355, 0x55533455, 0x8FFF0000, 0x0000FFF8, 0x54435543, 0x33455344, 0x58FFF000, 0x0000FF95, 0x44354333, 0x33334534, 0x459FF000, 0x000FFF74, 0x43443355, 0x55533443, 0x447FFF00, 0x000FF954, 0x23443443, 0x33443443, 0x2459FF00, 0x00FFF734, 0x24435524, 0x64255344, 0x2437FFF0, 0x00FFF534, 0x24435526, 0x96255344, 0x2435FFF0, 0x00FFF334, 0x24435524, 0x64255344, 0x2433FFF0, 0x00FFF334, 0x24535543, 0x33455354, 0x2433FFF0, 0x00FFF534, 0x33533554, 0x34553353, 0x3435FFF0, 0x00FFF734, 0x42453255, 0x55523542, 0x4437FFF0, 0x00FFF944, 0x43255422, 0x22245523, 0x4449FFF0, 0x00FFFF73, 0x44323555, 0x55553234, 0x437FFFF0, 0x00FFFFF4, 0x34442233, 0x33322444, 0x34FFFFF0, 0x00FFFFF9, 0x43445533, 0x23355443, 0x49FFFFF0, 0x0000FFFF, 0x94344555, 0x55554434, 0x9FFFF000, 0x000000FF, 0xFF722333, 0x3333227F, 0xFFF00000, 0x0000000F, 0xFFF97311, 0x111379FF, 0xFF000000, 0x00000000, 0xFFFFFF87, 0x778FFFFF, 0xF0000000, 0x00000000, 0x00FFFFFF, 0xFFFFFFF0, 0x00000000, 0x00000000, 0x0000FFFF, 0xFFFFF000, 0x00000000, 0x00000000, 0x0000000F, 0xFF000000, 0x00000000, 0x7BDED6B5, 0xC635B5B1, 0x9CEB8C69, 0x7BE56B61, 0x5299318F, 0x210B003F, 0x003F003F, 0x003F1085, 0x00000000, 0x0000FFFF, 0xFFFFF000, 0x00000000, 0x00000000, 0x0FFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0000000F, 0xFFFFF999, 0x9999FFFF, 0xFF000000, 0x000000FF, 0xFF986544, 0x3445689F, 0xFFF00000, 0x00000FFF, 0xF9633332, 0x32333369, 0xFFFF0000, 0x0000FFFF, 0x63444445, 0x55444443, 0x6FFFF000, 0x000FFFF4, 0x44455666, 0x66665544, 0x44FFFF00, 0x000FFF64, 0x55666666, 0x66666665, 0x546FFF00, 0x00FFF845, 0x66666666, 0x66666666, 0x6548FFF0, 0x00FFF555, 0x66666666, 0x66666666, 0x6555FFF0, 0x00FFF556, 0x66666677, 0x77766666, 0x6655FFF0, 0x00FFF556, 0x66666754, 0x44576666, 0x6655FFF0, 0x00FFF856, 0x66666443, 0x33446666, 0x6658FFF0, 0x000FFF85, 0x66666443, 0x33446666, 0x658FFF00, 0x000FFFF6, 0x66666443, 0x33446666, 0x66FFFF00, 0x0000FFFF, 0x86666743, 0x33476666, 0x8FFFF000, 0x00000FFF, 0xFF866743, 0x3347668F, 0xFFFF0000, 0x0000000F, 0xFFFFA943, 0x3349AFFF, 0xFF000000, 0x00000FFF, 0xFFFFAA44, 0x344AAFFF, 0xFFFF0000, 0x000FFFFF, 0x9988AA64, 0x346AA889, 0x9FFFFF00, 0x00FFF998, 0x8888AA84, 0x348AA888, 0x8899FFF0, 0x00FFF888, 0x8888AAA4, 0x34AAA888, 0x8888FFF0, 0x00FFF888, 0x8888AAA4, 0x24AAA888, 0x8888FFF0, 0x00FFF998, 0x88888AA4, 0x24AA8888, 0x8899FFF0, 0x00FFFFFF, 0x99888AA4, 0x34AA8889, 0x9FFFFFF0, 0x0000FFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFF000, 0x0000000F, 0xFFFFFFFF, 0xFFFFFFFF, 0xFF000000, 0x00000000, 0x000FFFFF, 0xFFFFFF00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x7BDED6B5, 0xC635B5B1, 0x9CEB8C69, 0x7BE56B61, 0x5299318F, 0x210B003F, 0x003F003F, 0x003F1085, 0x000000FF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFF00, 0x00000FFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFF0, 0x0000FFF1, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222FFF, 0x0000FF11, 0x11111111, 0x11111111, 0x11111111, 0x11111111, 0x11111111, 0x11111111, 0x11111111, 0x111234FF, 0x0000FF21, 0x88888888, 0x88888888, 0x88888888, 0x88888888, 0x88888888, 0x88888888, 0x88888888, 0x888834FF, 0x0000FF21, 0x88888888, 0x88888888, 0x88888888, 0x88888888, 0x88888888, 0x88888888, 0x88888888, 0x888834FF, 0x0000FF21, 0x88888888, 0x88888888, 0x88888888, 0x88888888, 0x88888888, 0x88888888, 0x88888888, 0x888834FF, 0x0000FF21, 0x88888888, 0x88888888, 0x88888888, 0x88888888, 0x88888888, 0x88888888, 0x88888888, 0x888834FF, 0x0000FF21, 0x88888888, 0x88888888, 0x88888888, 0x88888888, 0x88888888, 0x88888888, 0x88888888, 0x888834FF, 0x0000FF33, 0x13333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x333344FF, 0x0000FFF3, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444FFF, 0x00000FFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFF0, 0x000000FF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFF00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x7BDEA2CB, 0x92817181, 0x59015083, 0x58B10171, 0x0025C111, 0x80A5A88D, 0x11F56935, 0x91291885, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007777, 0x77777777, 0x77770000, 0x00077EEE, 0xEEEEEEEE, 0xEEE77000, 0x0007EECC, 0xFFF9CF9C, 0xF9CC7000, 0x0007ECCF, 0x999F9F9F, 0x9CCC7000, 0x0007ECCF, 0x9CCF9FF9, 0xCCCC7000, 0x0007ECCF, 0x9CCF9F9F, 0x9CCC7000, 0x0007ECC9, 0xFFF9AF99, 0xF9CC7000, 0x00077CCC, 0x999AC99C, 0x99C77000, 0x00007777, 0x76666666, 0x77770000, 0x00000000, 0x5BBBBBBB, 0x50000000, 0x00000000, 0x05888885, 0x00000000, 0x00000000, 0x00588850, 0x00000000, 0x00000000, 0x00058500, 0x00000000, 0x00000000, 0x00005000, 0x00000000, 0x84200001, 0x00010001, 0x000103CB, 0x03D9039D, 0x0FC9257F, 0x263FA7DD, 0x46BFCE73, 0x977FFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00FFFFFF, 0xFFFFF000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFF0, 0x00000000, 0x00000000, 0x00000000, 0x000000FF, 0xFFFAA888, 0x888AAFFF, 0xF0000000, 0x00000000, 0x00000000, 0x00000FFF, 0xA9888888, 0x888889AF, 0xFF000000, 0x00000000, 0x00000000, 0x0000FFF8, 0x88888888, 0x88888888, 0xFFF00000, 0x00000000, 0x00000000, 0x000FFF78, 0x88888888, 0x88888888, 0x7FFF0000, 0x00000000, 0x00000000, 0x00FFF788, 0x88888888, 0x88888888, 0x87FFF000, 0x00000000, 0x00000000, 0x0FFF7888, 0x88888888, 0x88888888, 0x888FFF00, 0x00000000, 0x00000000, 0xFFFA8888, 0x88888888, 0x88888888, 0x888AFFF0, 0x00000000, 0x0000000F, 0xFFF88888, 0x88888888, 0x88888888, 0x8888FFFF, 0x00000000, 0x000000FF, 0xF2E88888, 0x88888888, 0x88888888, 0x8888E2FF, 0xF0000000, 0x00000FFF, 0x2CE88888, 0x88888888, 0x88888888, 0x8888EC2F, 0xFF000000, 0x00000FF2, 0xCDE88888, 0x88888888, 0x88888888, 0x8888EDC2, 0xFF000000, 0x0000FFFC, 0xCDE78888, 0x88888888, 0x88888888, 0x8888EDCC, 0xFFF00000, 0x0000FF2C, 0xCDE77888, 0x88888888, 0x88888888, 0x8887EDCC, 0x2FF00000, 0x000FFFDC, 0xCDE86788, 0x88888888, 0x88888888, 0x8877EDCC, 0xDFFF0000, 0x000FFFCC, 0xCDEA8567, 0x88888888, 0x88888888, 0x8658EDCC, 0xCFFF0000, 0x000FFFCC, 0xCDEAA755, 0x78888888, 0x88888886, 0x345AEDCC, 0xCFFF0000, 0x000FFFCC, 0xCD2AAA65, 0x55788888, 0x88888741, 0x149A2DCC, 0xCFFF0000, 0x000FFFCC, 0xCDDEAAA8, 0x55557888, 0x88743111, 0x59AEDDCC, 0xCFFF0000, 0x000FFFDC, 0xCCD2AAAA, 0x87555444, 0x33111137, 0x9AA2DCCC, 0xDFFF0000, 0x000FFFDC, 0xCBDDEAAA, 0xAA876654, 0x443348AA, 0xAAEDDBCC, 0xDFFF0000, 0x0000FF2C, 0xBBCDDEAA, 0xAAAAA888, 0x888AAAAA, 0xAEDDCBBC, 0x2FF00000, 0x0000FFFD, 0xBBBCDDEA, 0xAAAAAAAA, 0xAAAAAAAA, 0xEDDCBBBD, 0xFFF00000, 0x00000FFF, 0xDBBBCDD2, 0xAAAAAAAA, 0xAAAAAAA2, 0xDDCBBBCF, 0xFF000000, 0x00000FFF, 0xFCBBBCDD, 0xD2EAAAAA, 0xAAAAE2DD, 0xDCBBBCFF, 0xFF000000, 0x000000FF, 0xFFCBBBBC, 0xDDD22EEE, 0xEE22DDDC, 0xBBBBCFFF, 0xF0000000, 0x0000000F, 0xFFFCBBBB, 0xBCCDDDDD, 0xDDDDCCBB, 0xBBBCFFFF, 0x00000000, 0x00000000, 0xFFFFDCBB, 0xBBBBCCCC, 0xCCCBBBBB, 0xBBCFFFF0, 0x00000000, 0x00000000, 0x0FFFF2CB, 0xBBBBBBBB, 0xBBBBBBBB, 0xC2FFFF00, 0x00000000, 0x00000000, 0x00FFFFF2, 0xDDCCBBBB, 0xBBBCCDD2, 0xFFFFF000, 0x00000000, 0x00000000, 0x0000FFFF, 0xFF2DDDDD, 0xDDDD2FFF, 0xFFF00000, 0x00000000, 0x00000000, 0x000000FF, 0xFFFFFFFF, 0xFFFFFFFF, 0xF0000000, 0x00000000, 0x00000000, 0x00000000, 0x0FFFFFFF, 0xFFFFFF00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x7BDEB5AD, 0x4211CAD7, 0xBA11A94B, 0xA1099885, 0x88436843, 0x48439CE7, 0x84216B5B, 0x30011085, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00FFFFFF, 0xFFFFF000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFF0, 0x00000000, 0x00000000, 0x00000000, 0x000000FF, 0xFFFAA888, 0x888AAFFF, 0xF0000000, 0x00000000, 0x00000000, 0x00000FFF, 0xA9888888, 0x888889AF, 0xFF000000, 0x00000000, 0x00000000, 0x0000FFF8, 0x88888888, 0x88888888, 0xFFF00000, 0x00000000, 0x00000000, 0x000FFF78, 0x88888888, 0x88888888, 0x7FFF0000, 0x00000000, 0x00000000, 0x00FFF788, 0x88888888, 0x88888888, 0x87FFF000, 0x00000000, 0x00000000, 0x0FFF7888, 0x88888888, 0x88888888, 0x888FFF00, 0x00000000, 0x00000000, 0xFFFA8888, 0x88888888, 0x88888888, 0x888AFFF0, 0x00000000, 0x0000000F, 0xFFF88888, 0x88888888, 0x88888888, 0x8888FFFF, 0x00000000, 0x000000FF, 0xF2E88888, 0x88888888, 0x88888888, 0x8888E2FF, 0xF0000000, 0x00000FFF, 0x2CE88888, 0x88888888, 0x88888888, 0x8888EC2F, 0xFF000000, 0x00000FF2, 0xCDE88888, 0x88888888, 0x88888888, 0x8888EDC2, 0xFF000000, 0x0000FFFC, 0xCDE78888, 0x88888888, 0x88888888, 0x8888EDCC, 0xFFF00000, 0x0000FF2C, 0xCDE77888, 0x88888888, 0x88888888, 0x8887EDCC, 0x2FF00000, 0x000FFFDC, 0xCDE86788, 0x88888888, 0x88888888, 0x8877EDCC, 0xDFFF0000, 0x000FFFCC, 0xCDEA8567, 0x88888888, 0x88888888, 0x8658EDCC, 0xCFFF0000, 0x000FFFCC, 0xCDEAA755, 0x78888888, 0x88888886, 0x345AEDCC, 0xCFFF0000, 0x000FFFCC, 0xCD2AAA65, 0x55788888, 0x88888741, 0x149A2DCC, 0xCFFF0000, 0x000FFFCC, 0xCDDEAAA8, 0x55557888, 0x88743111, 0x59AEDDCC, 0xCFFF0000, 0x000FFFDC, 0xCCD2AAAA, 0x87555444, 0x33111137, 0x9AA2DCCC, 0xDFFF0000, 0x000FFFDC, 0xCBDDEAAA, 0xAA876654, 0x443348AA, 0xAAEDDBCC, 0xDFFF0000, 0x0000FF2C, 0xBBCDDEAA, 0xAAAAA888, 0x888AAAAA, 0xAEDDCBBC, 0x2FF00000, 0x0000FFFD, 0xBBBCDDEA, 0xAAAAAAAA, 0xAAAAAAAA, 0xEDDCBBBD, 0xFFF00000, 0x00000FFF, 0xDBBBCDD2, 0xAAAAAAAA, 0xAAAAAAA2, 0xDDCBBBCF, 0xFF000000, 0x00000FFF, 0xFCBBBCDD, 0xD2EAAAAA, 0xAAAAE2DD, 0xDCBBBCFF, 0xFF000000, 0x000000FF, 0xFFCBBBBC, 0xDDD22EEE, 0xEE22DDDC, 0xBBBBCFFF, 0xF0000000, 0x0000000F, 0xFFFCBBBB, 0xBCCDDDDD, 0xDDDDCCBB, 0xBBBCFFFF, 0x00000000, 0x00000000, 0xFFFFDCBB, 0xBBBBCCCC, 0xCCCBBBBB, 0xBBCFFFF0, 0x00000000, 0x00000000, 0x0FFFF2CB, 0xBBBBBBBB, 0xBBBBBBBB, 0xC2FFFF00, 0x00000000, 0x00000000, 0x00FFFFF2, 0xDDCCBBBB, 0xBBBCCDD2, 0xFFFFF000, 0x00000000, 0x00000000, 0x0000FFFF, 0xFF2DDDDD, 0xDDDD2FFF, 0xFFF00000, 0x00000000, 0x00000000, 0x000000FF, 0xFFFFFFFF, 0xFFFFFFFF, 0xF0000000, 0x00000000, 0x00000000, 0x00000000, 0x0FFFFFFF, 0xFFFFFF00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x7BDEB5AD, 0x4211CAD7, 0xBA11A94B, 0xA1099885, 0x88436843, 0x48439CE7, 0x84216B5B, 0x30011085, 0x0011111F, 0x11F11F11, 0x1F000000, 0x01FFF1F1, 0xF1F1F1F1, 0xFF000000, 0x0F1F01F1, 0xF1F1F1F1, 0xF0000000, 0x00F1F1F1, 0x11F11FF1, 0xF0000000, 0x011FF1F1, 0xF1F1F1F1, 0xF0000000, 0x0FFF0FFF, 0xFFFFFFFF, 0xF0000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x7BDEF7BD, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00014211 diff --git a/ver/us/asm/data/E2950.data.s b/ver/us/asm/data/E2CA0.data.s similarity index 91% rename from ver/us/asm/data/E2950.data.s rename to ver/us/asm/data/E2CA0.data.s index 48d92ca3eb..4c0ae51b1d 100644 --- a/ver/us/asm/data/E2950.data.s +++ b/ver/us/asm/data/E2CA0.data.s @@ -2,63 +2,6 @@ .section .data -glabel D_8014C250 -.word 0x0001003C, 0x00000000, 0x00000000, 0x00000000 - -glabel D_8014C260 -.word 0x00000000, 0x00000000, 0xFFFFFF00, 0xFFFFFF00 - -glabel D_8014C270 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -glabel D_8014C280 -.word 0x028001E0, 0x01FF0000, 0x028001E0, 0x01FF0000 - -glabel MessagePlural -.word 0x53FD0000 - -glabel MessageSingular -.short 0xF0FD - -glabel gNextMessageBuffer -.short 0x0000 - -glabel D_8014C298 -.word 0xFFF00009, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00100009, 0x00000000, 0x04000000, 0xFFFFFFFF, 0xFFF0FFF7, 0x00000000, 0x00000240, 0xFFFFFFFF, 0x0010FFF7, 0x00000000, 0x04000240, 0xFFFFFFFF - -glabel D_8014C2D8 -.word 0xE3000A01, 0x00100000, 0xD9FDF9FF, 0x00000000, 0xD9FFFFFF, 0x00200004, 0xE3001801, 0x000000C0, 0xE3001A01, 0x00000030, 0xE2001E01, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xE3000C00, 0x00080000, 0xE3001001, 0x00000000, 0xE3001201, 0x00003000, 0xE200001C, 0x0C184B40, 0xFC11FFFF, 0xFFFFF438, 0xDF000000, 0x00000000 - -glabel D_8014C340 -.word 0x802EF0D0, 0x8010100B, 0x080B0B0B, 0x0B0B0B0B, 0x0B0B0000, 0x802EF0D0, 0x80101009, 0x08090909, 0x09090909, 0x09090000 - -glabel D_8014C368 -.word 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE3001201, 0x00000000, 0xE3000C00, 0x00000000, 0xE3001801, 0x000000C0, 0xE3001A01, 0x00000030, 0xE3001700, 0x00000000, 0xE2001E01, 0x00000000, 0xE3001001, 0x00008000, 0xD7000002, 0xFFFFFFFF, 0xDF000000, 0x00000000 - -glabel D_8014C3C0 -.word 0x00010000, 0x00000000, 0x00000000, 0xFFFFF8FF, 0x00200000, 0x00000000, 0x04000000, 0xFFFFF8FF, 0x0001FFC0, 0x00000000, 0x00000800, 0xBFB8B0FF, 0x0020FFC0, 0x00000000, 0x04000800, 0xBFB8B0FF - -glabel D_8014C400 -.word 0x00200000, 0x00000000, 0x00000000, 0xFFFFF8FF, 0x00E10000, 0x00000000, 0x01000000, 0xFFFFF8FF, 0x0020FFC0, 0x00000000, 0x00000800, 0xBFB8B0FF, 0x00E1FFC0, 0x00000000, 0x01000800, 0xBFB8B0FF - -glabel D_8014C440 -.word 0x00E10000, 0x00000000, 0x00000000, 0xFFFFF8FF, 0x01000000, 0x00000000, 0x04000000, 0xFFFFF8FF, 0x00E1FFC0, 0x00000000, 0x00000800, 0xBFB8B0FF, 0x0100FFC0, 0x00000000, 0x04000800, 0xBFB8B0FF - -glabel D_8014C480 -.word 0xFFF1001E, 0x00000000, 0x00000000, 0xBFB8B0FF, 0x000F001E, 0x00000000, 0x01E00000, 0xBFB8B0FF, 0xFFFF0000, 0x00000000, 0x000001E0, 0xBFB8B0FF, 0x00010000, 0x00000000, 0x01E001E0, 0xBFB8B0FF - -glabel D_8014C4C0 -.word 0xFFF1001E, 0x00000000, 0x00000000, 0xBFB8B0FF, 0x000F001E, 0x00000000, 0x01E00000, 0xBFB8B0FF, 0xFFFF0000, 0x00000000, 0x000001E0, 0xBFB8B0FF, 0x00010000, 0x00000000, 0x01E001E0, 0xBFB8B0FF - -glabel D_8014C500 -.word 0xE3000A01, 0x00000000, 0xE200001C, 0x0F0A7008, 0xFCFFFFFF, 0xFFFCF279, 0xE3001201, 0x00003000, 0xD7000002, 0xFFFFFFFF, 0xE3000C00, 0x00000000, 0xE3001801, 0x000000C0, 0xE3001A01, 0x00000030, 0xE3000F00, 0x00000000, 0xE3001001, 0x00008000, 0xE3000D01, 0x00000000, 0xE3001402, 0x00000C00, 0xE3001700, 0x00000000, 0xE2001E01, 0x00000000, 0x00000000, 0x00000000, 0xDF000000, 0x00000000 - -glabel D_8014C580 -.byte 0x32, 0x50, 0x64, 0x69, 0x64, 0x00, 0x00, 0x00 - -glabel D_8014C588 -.byte 0x69, 0x64, 0x4D, 0x39, 0x28, 0x1B, 0x10, 0x08, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - glabel D_8014C5A0 .word 0xFFF40000, 0x00000000, 0x23002300, 0x000000FF, 0x000B0000, 0x00000000, 0x20002300, 0x000000FF, 0x000B0017, 0x00000000, 0x20002000, 0x000000FF, 0xFFF40017, 0x00000000, 0x23002000, 0x000000FF diff --git a/ver/us/asm/data/code_10CC10.data.s b/ver/us/asm/data/code_10CC10.data.s deleted file mode 100644 index 5c889f772e..0000000000 --- a/ver/us/asm/data/code_10CC10.data.s +++ /dev/null @@ -1,90 +0,0 @@ -.include "macro.inc" - -.section .data - -glabel D_802EB3D0 -.word 0x0B08080A, 0x09090904, 0x08080909, 0x0509050A, 0x09070909, 0x09090909, 0x09090505, 0x08090809, 0x0A090909, 0x09090909, 0x09070909, 0x09090909, 0x09090909, 0x09090909, 0x09090907, 0x09060709, 0x06090808, 0x09080808, 0x07040708, 0x04090807, 0x09080808, 0x08080809, 0x08080807, 0x03070A07, 0x09090909, 0x09090909, 0x09070707, 0x08090909, 0x09090909, 0x09090909, 0x09090908, 0x08080808, 0x06060607, 0x09070707, 0x08080808, 0x08060907, 0x0B0B0B0B, 0x0C0C0B0B, 0x0D0D0E0E, 0x0C0D0D0D, 0x0D100909, 0x05050000, D_802EE8D0, D_802EB3D0, 0x0A000000, D_802EE8D0, D_802EB3D0, 0x0AFE0000, D_802EE8D0, D_802EB3D0, 0x0A000000, D_802EE8D0, D_802EB3D0, 0x0A000000, 0x00000000, 0x00000000, 0x00000000, D_802EE8D0, D_802EB3D0, 0x09FE0000, D_802EE8D0, D_802EB3D0, 0x09000000, D_802EE8D0, D_802EB3D0, 0x09000000, D_802EE8D0, D_802EB3D0, 0x09000000, 0x00000000, 0x00000000, 0x00000000, 0x10100E10, 0x00800000, 0x802EB478, 0x10100E10, 0x00800000, 0x802EB4B4, 0x08080809, 0x08080808, 0x05080908, 0x0A080809, 0x08090808, 0x08080A09, 0x09080403, 0x04090909, 0x09090909, 0x0909090A, 0x0A000000, 0x09090808, 0x07070807, 0x03070707, 0x08070808, 0x08070708, 0x07070808, 0x08070403, 0x04080808, 0x08080808, 0x08080808, 0x08000000, D_802ED970, 0x802EB508, 0x0E000000, 0x00000000, 0x00000000, 0x00000000, D_802F39D0, 0x802EB534, 0x0A000000, 0x00000000, 0x00000000, 0x00000000, 0x0C0F0E10, 0x00600000, 0x802EB560, 0x0C0C0A0A, 0x00480000, 0x802EB578 - -glabel D_802EB5A8 -.word 0x802EB4F0, 0x802EB4FC, 0x802EB4FC, 0x802EB590, 0x802EB59C, 0x00000000 - -glabel D_802EB5C0 -.word 0x0000D178, 0x0000ED78, 0x00010978, 0x00012578, 0x00014178, 0x00015D78, 0x00017978, 0x00019578, 0x0001B178, 0x0001CD78, 0x0001E978, 0x00020578 - -glabel D_802EB5F0 -.word 0x0000EB78, 0x00010778, 0x00012378, 0x00013F78, 0x00015B78, 0x00017778, 0x00019378, 0x0001AF78, 0x0001CB78, 0x0001E778, 0x00020378, 0x00021F78 - -glabel D_802EB620 -.word 0x00000011, 0x00000012, 0x00000000, 0x00000017, 0x00000018, 0xFFFFFFCE, 0x0000001B, 0x0000001B, 0x00000000 - -glabel D_802EB644 -.short 0x0000, 0xFFFC, 0xFFFC, 0xFFFC, 0xFFFC, 0x0000, 0xFFFC, 0xFFFC, 0xFFFC, 0x0000, 0x0000, 0x0000, 0x0000, 0xFFFC, 0xFFFC, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 - -glabel D_802EB670 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01111111, 0x00000000, 0x00000000, 0x00000111, 0x12233334, 0x00000000, 0x00000000, 0x00111233, 0x44444444, 0x00000000, 0x00000000, 0x11234444, 0x44444444, 0x00000000, 0x00000011, 0x23444444, 0x44444444, 0x00000000, 0x00000123, 0x44444444, 0x44444444, 0x00000000, 0x00011344, 0x44444444, 0x44444444, 0x00000000, 0x00123444, 0x44444444, 0x44444444, 0x00000000, 0x01244444, 0x44444444, 0x44444444, 0x00000000, 0x12444444, 0x44444444, 0x44444444, 0x00000001, 0x24444444, 0x44444444, 0x44444444, 0x00000012, 0x44444444, 0x44444444, 0x44444444, 0x00000013, 0x44444444, 0x44444444, 0x44444444, 0x00000134, 0x44444444, 0x44444444, 0x44444444, 0x00001244, 0x44444444, 0x44444444, 0x44444444, 0x00001344, 0x44444444, 0x44444444, 0x44444444, 0x00012444, 0x44444444, 0x44444444, 0x44444444, 0x00013444, 0x44444444, 0x44444444, 0x44444444, 0x00124444, 0x44444444, 0x44444444, 0x44444444, 0x00134444, 0x44444444, 0x44444444, 0x44444444, 0x01244444, 0x44444444, 0x44444444, 0x44444444, 0x01344444, 0x44444444, 0x44444444, 0x44444444, 0x01344444, 0x44444444, 0x44444444, 0x44444444, 0x01444444, 0x44444444, 0x44444444, 0x44444444, 0x12444444, 0x44444444, 0x44444444, 0x44444444, 0x12444444, 0x44444444, 0x44444444, 0x44444444, 0x13444444, 0x44444444, 0x44444444, 0x44444444, 0x13444444, 0x44444444, 0x44444444, 0x44444444, 0x13444444, 0x44444444, 0x44444444, 0x44444444, 0x13444444, 0x44444444, 0x44444444, 0x44444444, 0x13444444, 0x44444444, 0x44444444, 0x44444444, 0x13444444, 0x44444444, 0x44444444, 0x44444444, 0x12444444, 0x44444444, 0x44444444, 0x44444444, 0x12444444, 0x44444444, 0x44444444, 0x44444444, 0x01444444, 0x44444444, 0x44444444, 0x44444444, 0x01344444, 0x44444444, 0x44444444, 0x44444444, 0x01344444, 0x44444444, 0x44444444, 0x44444444, 0x01244444, 0x44444444, 0x44444444, 0x44444444, 0x00134444, 0x44444444, 0x44444444, 0x44444444, 0x00124444, 0x44444444, 0x44444444, 0x44444444, 0x00013444, 0x44444444, 0x44444444, 0x44444444, 0x00012444, 0x44444444, 0x44444444, 0x44444444, 0x00001344, 0x44444444, 0x44444444, 0x44444444, 0x00001244, 0x44444444, 0x44444444, 0x44444444, 0x00000134, 0x44444444, 0x44444444, 0x44444444, 0x00000014, 0x44444444, 0x44444444, 0x44444444, 0x00000099, 0x44444444, 0x44444444, 0x44444444, 0x00000009, 0x34444444, 0x44444444, 0x44444444, 0x00000000, 0x88444444, 0x44444444, 0x44444444, 0x00000000, 0x08544444, 0x44444444, 0x44444444, 0x00000000, 0x00AA4444, 0x44444444, 0x44444444, 0x00000000, 0x000A7544, 0x44444444, 0x44444444, 0x00000000, 0x00000765, 0x44444444, 0x44444444, 0x00000000, 0x00000077, 0x65444444, 0x44444444, 0x00000000, 0x00000000, 0x77654444, 0x44444444, 0x00000000, 0x00000000, 0x00777655, 0x44444444, 0x00000000, 0x00000000, 0x00000777, 0x76655554, 0x00000000, 0x00000000, 0x00000000, 0x07777777, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -glabel D_802EBA70 -.ascii "\0\0\0\0\0\0\0\0\0\0\0\0DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDwwww\0\0\0\0\0\0\0\0\0\0\0\0" - -glabel D_802EBB70 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x11111110, 0x00000000, 0x00000000, 0x00000000, 0x43333221, 0x11100000, 0x00000000, 0x00000000, 0x44444444, 0x33211100, 0x00000000, 0x00000000, 0x44444444, 0x44443211, 0x00000000, 0x00000000, 0x44444444, 0x44444432, 0x11000000, 0x00000000, 0x44444444, 0x44444444, 0x32100000, 0x00000000, 0x44444444, 0x44444444, 0x44319000, 0x00000000, 0x44444444, 0x44444444, 0x44449900, 0x00000000, 0x44444444, 0x44444444, 0x44444380, 0x00000000, 0x44444444, 0x44444444, 0x44444488, 0x00000000, 0x44444444, 0x44444444, 0x44444445, D_A0000000, 0x44444444, 0x44444444, 0x44444444, 0xAA000000, 0x44444444, 0x44444444, 0x44444444, 0x47000000, 0x44444444, 0x44444444, 0x44444444, 0x45700000, 0x44444444, 0x44444444, 0x44444444, 0x44670000, 0x44444444, 0x44444444, 0x44444444, 0x44570000, 0x44444444, 0x44444444, 0x44444444, 0x44467000, 0x44444444, 0x44444444, 0x44444444, 0x44457000, 0x44444444, 0x44444444, 0x44444444, 0x44446700, 0x44444444, 0x44444444, 0x44444444, 0x44445700, 0x44444444, 0x44444444, 0x44444444, 0x44444670, 0x44444444, 0x44444444, 0x44444444, 0x44444570, 0x44444444, 0x44444444, 0x44444444, 0x44444570, 0x44444444, 0x44444444, 0x44444444, 0x44444470, 0x44444444, 0x44444444, 0x44444444, 0x44444467, 0x44444444, 0x44444444, 0x44444444, 0x44444467, 0x44444444, 0x44444444, 0x44444444, 0x44444457, 0x44444444, 0x44444444, 0x44444444, 0x44444457, 0x44444444, 0x44444444, 0x44444444, 0x44444457, 0x44444444, 0x44444444, 0x44444444, 0x44444457, 0x44444444, 0x44444444, 0x44444444, 0x44444457, 0x44444444, 0x44444444, 0x44444444, 0x44444457, 0x44444444, 0x44444444, 0x44444444, 0x44444467, 0x44444444, 0x44444444, 0x44444444, 0x44444467, 0x44444444, 0x44444444, 0x44444444, 0x44444470, 0x44444444, 0x44444444, 0x44444444, 0x44444570, 0x44444444, 0x44444444, 0x44444444, 0x44444570, 0x44444444, 0x44444444, 0x44444444, 0x44444670, 0x44444444, 0x44444444, 0x44444444, 0x44445700, 0x44444444, 0x44444444, 0x44444444, 0x44446700, 0x44444444, 0x44444444, 0x44444444, 0x44457000, 0x44444444, 0x44444444, 0x44444444, 0x44467000, 0x44444444, 0x44444444, 0x44444444, 0x44570000, 0x44444444, 0x44444444, 0x44444444, 0x44670000, 0x44444444, 0x44444444, 0x44444444, 0x45700000, 0x44444444, 0x44444444, 0x44444444, 0x57000000, 0x44444444, 0x44444444, 0x44444444, 0x67000000, 0x44444444, 0x44444444, 0x44444446, 0x70000000, 0x44444444, 0x44444444, 0x44444467, 0x00000000, 0x44444444, 0x44444444, 0x44444670, 0x00000000, 0x44444444, 0x44444444, 0x44456700, 0x00000000, 0x44444444, 0x44444444, 0x44577000, 0x00000000, 0x44444444, 0x44444444, 0x56700000, 0x00000000, 0x44444444, 0x44444456, 0x77000000, 0x00000000, 0x44444444, 0x44445677, 0x00000000, 0x00000000, 0x44444444, 0x55677700, 0x00000000, 0x00000000, 0x45555667, 0x77700000, 0x00000000, 0x00000000, 0x77777770, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -glabel D_802EBF70 -.word 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78888888, 0x88888870, 0x77777777, 0x77777770, 0x00000000, 0x00000000, 0x00000001, 0x00000112, 0x00011344, 0x00123444, 0x00134444, 0x01344444, 0x01444444, 0x12444444, 0x11111111, 0x33344444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x11111111, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x11111111, 0x44444333, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x10000000, 0x21100000, 0x44398000, 0x44449A00, 0x44444A00, 0x44444570, 0x44444470, 0x44444467, 0x13444444, 0x13444444, 0x13444444, 0x14444444, 0x14444444, 0x14444444, 0x14444444, 0x14444444, 0x44444457, 0x44444457, 0x44444457, 0x44444447, 0x44444447, 0x44444447, 0x44444447, 0x44444447, 0x14444444, 0x14444444, 0x14444444, 0x14444444, 0x14444444, 0x14444444, 0x14444444, 0x14444444, 0x44444447, 0x44444447, 0x44444447, 0x44444447, 0x44444447, 0x44444447, 0x44444447, 0x44444447, 0x14444444, 0x14444444, 0x14444444, 0x14444444, 0x14444444, 0x13444444, 0x13444444, 0x13444444, 0x44444447, 0x44444447, 0x44444447, 0x44444447, 0x44444447, 0x44444457, 0x44444457, 0x44444457, 0x12444444, 0x01444444, 0x01344444, 0x00944444, 0x00894444, 0x000AA544, 0x00000776, 0x00000007, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x55544444, 0x77777777, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x77777777, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444555, 0x77777777, 0x44444467, 0x44444470, 0x44444570, 0x44445700, 0x44456700, 0x44577000, 0x67700000, 0x70000000, 0x00000008, 0x00000812, 0x00001245, 0x000145BB, 0x00146B00, 0x0825B000, 0x014B0000, 0x825B0000, 0x11111111, 0x33444444, 0xBBBBBBBB, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x11111111, 0x44444444, 0xBBBBBBBB, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x11111111, 0x44444444, 0xBBBBBBBB, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x21800000, 0x54210000, 0xBB541000, 0x00B64100, 0x000B5280, 0x0000B410, 0x0000B528, 0x13B00000, 0x13B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x00000B31, 0x00000B31, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x13B00000, 0x13B00000, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B31, 0x00000B31, 0x825B0000, 0x014B0000, 0x0825B000, 0x00146B00, 0x000145BB, 0x00001245, 0x00000812, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xBBBBBBBB, 0x33444444, 0x11111111, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xBBBBBBBB, 0x44444444, 0x11111111, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xBBBBBBBB, 0x44444433, 0x11111111, 0x0000B528, 0x0000B410, 0x000B5280, 0x00B64100, 0xBB541000, 0x54210000, 0x21800000, D_80000000 - -glabel D_802EC3F0 -.word 0x739EFFFF, 0xF7BBE739 - -glabel D_802EC3F8 -.short 0xDEF5, 0xC62F, 0x9CE5, 0x7BDD, 0xBDEF, 0xDEF7, 0x9CE5, 0x739D, 0x0001, 0x0001, 0x0001, 0x0001, 0x739E, 0xE73B, 0xDEF9, 0xD6B7, 0xCE75, 0xB5AF, 0x8C65, 0x6B5D, 0xAD6D, 0xCE75, 0x8C65, 0x631B, 0x0001, 0x0001, 0x0001, 0x0001, 0x739E, 0xFFFF, 0xF6F5, 0xF671, 0xF5AB, 0xCCE5, 0xAC61, 0x839B, 0xC5AD, 0xE6B5, 0xA4A3, 0x739D, 0x0001, 0x0001, 0x0001, 0x0001, 0x739E, 0xFFFF, 0xD6BD, 0xC63F, 0xB5BF, 0x9CF5, 0x8C6B, 0x73A1, 0xB5B1, 0xD6B9, 0x94A9, 0x739D, 0x0001, 0x0001, 0x0001, 0x0001, 0x739E, 0xFFFF, 0xF7B3, 0xF7A9, 0xF75F, 0xCE1D, 0xA51D, 0x7BDB, 0xC62B, 0xE733, 0xA523, 0x739D, 0x0001, 0x0001, 0x0001, 0x0001, 0x739E, 0xE739, 0xF69F, 0x8B4F, 0xABCF, 0xB455, 0xD559, 0xABD1, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0x7A03, 0x4101, 0x0001, 0x739E, 0xE739, 0xF69F, 0xBC51, 0xA83F, 0xB455, 0xD559, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0x7A03, 0x4101, 0x0001, 0x739E, 0xE739, 0xF69F, 0x830D, 0xA83F, 0xB413, 0xD559, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0x7A03, 0x4101, 0x0001, 0x739E, 0xFFFF, 0xF7BB, 0xE739, 0xDEF5, 0xC62F, 0x9CE5, 0x7BDD, 0xBDEF, 0xDEF7, 0x9CE5, 0x739D, 0x0001, 0x0001, 0x0001, 0x0001, 0x739E, 0x420F, 0x841D, 0xB5AB, 0xD6B3, 0xB5AB, 0x7BDD, 0x420F, 0x420F, 0x420F, 0x420F, 0x739D, 0x0001, 0x0001, 0x0001, 0x0001, 0x739E, 0xFFFF, 0xF739, 0xEEF7, 0xE673, 0xC56B, 0xAC61, 0x839B, 0xC5AD, 0xE6B5, 0xA4A3, 0x739D, 0x0001, 0x0001, 0x0001, 0x0001, 0x739E, 0xFFFF, 0xE73D, 0xD6BB, 0xCE79, 0xAD71, 0x8C6B, 0x73A1, 0xB5B1, 0xD6B9, 0x94A9, 0x739D, 0x0001, 0x0001, 0x0001, 0x0001, 0x739E, 0xFFFF, 0xF7B7, 0xEF73, 0xE72D, 0xC627, 0xA51F, 0x7BDB, 0xC62B, 0xE733, 0xA523, 0x739D, 0x0001, 0x0001, 0x0001, 0x0001, 0x739E, 0xE739, 0xE61D, 0x938F, 0xBC15, 0xC44F, 0xD557, 0xABD1, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0x8289, 0x4101, 0x0001, 0x739E, 0xE739, 0xE61D, 0xAC53, 0xAC13, 0xC44F, 0xD557, 0xA38D, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0x8289, 0x4101, 0x0001, 0x739E, 0xE739, 0xE61D, 0x9B4B, 0xA83F, 0xC44F, 0xCD17, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0x8289, 0x4101, 0x0001 - -glabel D_802EC5F0 -.word 0x00006666, 0x66666666, 0x00666666, 0x66666666, 0x06666666, 0x66666666, 0x06666FEE, 0xEEEEEEEE, 0x6666EEEE, 0xBBBBBBBB, 0x666FEEBB, 0xBBAAAAAA, 0x666EEBBA, 0xAAAAAAAA, 0x666EEBAA, 0xCCCCCCCC, 0x666EBBAC, 0x23333333, 0x666EBAAC, 0x99CCC923, 0x666EBAAC, 0x2C11DC23, 0x666EBAAC, 0x9C12DD23, 0x666EBAAC, 0x2CDDDC32, 0x666EBAAC, 0x23CDC332, 0x666EBAAC, 0x22333332, 0x666EBBAC, 0x22333323 - -glabel D_802EC670 -.word 0x66666666, 0x66660000, 0x66666666, 0x66666600, 0x66666666, 0x66666770, 0xEEEEEEEE, 0xEEF67770, 0xBBBBBBBB, 0xEEEE7777, 0xBAAAAABB, 0xBBEEF777, 0xAAAAAAAA, 0xABBEE777, 0xCCCCCCCC, 0xCBBEE777, 0x33332992, 0xDABBE777, 0x3239CC39, 0xDABBE777, 0x22922DC2, 0xDAABE777, 0x32C22DD9, 0xDAABE777, 0x23CDDDC9, 0xDAABE777, 0x233CDC33, 0xDAABE777, 0x23333333, 0xDAABE777, 0x32333333, 0xDAABE777 - -glabel D_802EC6F0 -.word 0x666EBAAC, 0x39993332, 0x666EBAAC, 0x33939322, 0x666EBAAC, 0x39393322, 0x666EBAAC, 0x39CCC322, 0x666EBAAC, 0x9C11DC22, 0x666EBAAC, 0x3D22DD22, 0x666EBAAC, 0x3CDDDC22, 0x666EBBBC, 0x33CDC322, 0x666EEBBC, 0xDDDDDDDD, 0x666EEBBB, 0xAAAAAAAA, 0x666FEEBB, 0xBBAAAAAA, 0x6666EEEE, 0xBBBBBBBB, 0x06667FEE, 0xEEEEEEEE, 0x06677777, 0x77777777, 0x00777777, 0x77777777, 0x00007777, 0x77777777 - -glabel D_802EC770 -.word 0x22323322, 0xDAABE777, 0x2222232C, 0xDAABE777, 0x22CCCCCD, 0xAABBE777, 0x22CCDDDA, 0xAABBE777, 0x39CCDDBA, 0xAABBE777, 0x3CCDDEAA, 0xABBBE777, 0xCDDDEAAA, 0xAABBE777, 0xDDEAAAAA, 0xABBBE777, 0xBAAAAAAA, 0xABBBE777, 0xAAAABABB, 0xBBBBF777, 0xAAAAABBB, 0xBBBE7777, 0xBBBBBBBB, 0xBBEF7777, 0xEEEEEEEE, 0xEEF77770, 0x77777777, 0x77777770, 0x77777777, 0x77777700, 0x77777777, 0x77770000 - -glabel D_802EC7F0 -.word 0x22323322, 0xDAABF777, 0x22222322, 0xDAABF777, 0x229CCC92, 0xDABBF777, 0x22C11DC2, 0xDABBE777, 0x22C12DD2, 0xDABBE777, 0x22CDDDC2, 0xDBBBE777, 0x223CDC32, 0xDABBE777, 0x22222222, 0xDBBBE777, 0xBDDDDDDD, 0xDBBBE777, 0xAAAABABB, 0xBBBBF777, 0xAAAAABBB, 0xBBBE7777, 0xBBBBBBBB, 0xBBEF7777, 0xEEEEEEEE, 0xEEF77770, 0x77777777, 0x77777770, 0x77777777, 0x77777700, 0x77777777, 0x77770000 - -glabel D_802EC870 -.word 0x66666666, 0x66666666, 0x66666666, 0x66666666, 0x66666666, 0x66666666, 0x66666666, 0x66666666, 0x66666666, 0x66666666, 0x66666666, 0x66666666, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0xBBBBBBBB, 0xBBBBBBBB, 0xBBBBBBBB, 0xBBBBBBBB, 0xAAAAAAAB, 0xBAAABBBB, 0xBBBAAAAA, 0xAABBBBBA, 0xAAAAAAAA, 0xAAAAAAAA, 0xAAAAAAAA, 0xAAAAAAAA, 0xCCCCCCCC, 0xCCCCCCCC, 0xCCCCCCCC, 0xCCCCCCCC, 0x33339999, 0x99999993, 0x33399999, 0x99999333, 0x22332333, 0x33333333, 0x33333333, 0x33333332, 0x22222333, 0x33333333, 0x33222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222 - -glabel D_802EC970 -.word 0x666EBBAC, 0x22332323, 0x666EBBAC, 0x23323233, 0x666EBAAC, 0x23392322, 0x666EBAAC, 0x23323223, 0x666EBAAC, 0x23332222, 0x666EBAAC, 0x23323223, 0x666EBAAC, 0x39332222, 0x666EBAAC, 0x99323223, 0x666EBAAC, 0x99332329, 0x666EBAAC, 0x99323223, 0x666EBAAC, 0x99932322, 0x666EBAAC, 0x99933323, 0x666EBAAC, 0x99993232, 0x666EBBAC, 0x99933222, 0x666EBBBC, 0x99933322, 0x666EBBBC, 0x99933222, 0x666EBBBC, 0x99932322, 0x666EBBAC, 0x99932222, 0x666EBAAC, 0x99332222, 0x666EBAAC, 0x99333222, 0x666EBAAC, 0x99332222, 0x666EBAAC, 0x99333222, 0x666EBAAC, 0x99332223, 0x666EBAAC, 0x93332222, 0x666EBAAC, 0x93322322, 0x666EBAAC, 0x93332222, 0x666EBBAC, 0x93332322, 0x666EBBAC, 0x93333233, 0x666EBBAC, 0x93332323, 0x666EBBAC, 0x93333233, 0x666EBAAC, 0x93332323, 0x666EBAAC, 0x93333233, 0x666EBAAC, 0x99222322, 0x666EBAAC, 0x99933233, 0x666EBAAC, 0x99332322, 0x666EAAAC, 0x93333232, 0x666EAAAC, 0x93333332, 0x666EAAAC, 0x93333332, 0x666EBAAC, 0x33333332, 0x666EBAAC, 0x33333332 - -glabel D_802ECAB0 -.word 0x23333399, 0xDAABE777, 0x23333999, 0xDAABE777, 0x23339993, 0xDAABE777, 0x23339993, 0xDAABE777, 0x23339333, 0xDAABE777, 0x22332333, 0xDAABE777, 0x22332339, 0xDAABE777, 0x22222339, 0xDAABE777, 0x22222339, 0xDAABE777, 0x22222339, 0xDAABE777, 0x22223399, 0xDAABE777, 0x22222399, 0xDAABE777, 0x32222399, 0xDAABE777, 0x22222339, 0xDAABE777, 0x22222339, 0xDAABE777, 0x22332339, 0xDAABE777, 0x32333339, 0xDAABE777, 0x23333339, 0xDAABE777, 0x23333339, 0xDAABE777, 0x22333333, 0xDAABE777, 0x32232339, 0xDAABE777, 0x22333339, 0xDAABE777, 0x22233339, 0xDAABE777, 0x23232399, 0xDAABE777, 0x22323999, 0xDAABE777, 0x22222399, 0xDABBE777, 0x22223399, 0xDABBE777, 0x23222399, 0xDAABE777, 0x32323339, 0xDAABE777, 0x22222339, 0xDAABE777, 0x32323333, 0xDAABE777, 0x23222333, 0xDAABE777, 0x32323333, 0xDAABE777, 0x23222333, 0xDAABE777, 0x32323333, 0xDAABE777, 0x23232333, 0xDABBE777, 0x32323333, 0xDABBE777, 0x23232933, 0xDABBE777, 0x32323333, 0xDAABE777, 0x23232322, 0xDAABE777 - -glabel D_802ECBF0 -.word 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x32222222, 0x22222222, 0x22222222, 0x22222222, 0x32232222, 0x22222222, 0x22222222, 0x33339932, 0x33333333, 0x33333333, 0x22222222, 0x33333332, 0x93399999, 0x33333333, 0x22332322, 0xDDDDDDDD, 0xDDDDDDDD, 0xDDDDDDDD, 0xDDDDDDDD, 0xAAAAAAAA, 0xAAAAAAAA, 0xAAAAAAAA, 0xAAAAAAAA, 0xAAAABBBB, 0xBAAABBBB, 0xBBAAAAAA, 0xABBAAAAA, 0xBBBBBBBB, 0xBBBBBBBB, 0xBBBBBBBB, 0xBBBBBBBB, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0x77777777, 0x77777777, 0x77777777, 0x77777777, 0x77777777, 0x77777777, 0x77777777, 0x77777777, 0x77777777, 0x77777777, 0x77777777, 0x77777777 - -glabel D_802ECCF0 -.word 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222 - -glabel D_802ECD10 -.word 0x7BDEBDAD, 0xCE2BC5E9, 0xF801F801, 0x51834143, 0xF801B565, 0xB459A3D3, 0x8C1B7353, 0x82CB6205 - -glabel D_802ECD30 -.word 0x7BDEBDAD, 0xCE2BC5E9, 0xF801F801, 0x218F210B, 0xF801B5E5, 0x2BDD2BDD, 0x5C1D2B59, 0x02D70211 - -glabel D_802ECD50 -.ascii "3333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333DDD333333333333333333333333333343D3C3333333333333333334C3333333DC34D333333333333333333DD3333334DDDDDC33333333333333333C43333333DDDDD333333333333333333CD33333344333CC33333333333333333CC33333343DDD3C33333333333333333D4DC333344CD4CC333333334DD33333344DC333334CD4C3333333334343333334D4C333334DDDC3333333334343333334C3C333333DDD333333334CD343333334D4C333333333333333334DC34C333333DD3333333333333333334DC4DC333333343333333333333333333DC4DD333333343333333333333333333334D33333334D3333333333333333333333333333334D33333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333C3333333333333333333333333333333D3333333333333333333333333333333DD333333333333333333333333333333C43333333333333333333333333333DD333333333333333333333333333333DD3333333333333333333333333333334D333333333333333C3333333333333333333333333333434D34333333333333333333333333334CDDCD333333333333333333333333334DDDDD333333333333333333333333334D4D4D333333333333333333333333334D4D4D333333333333333333333333334DDDDD333333333333333333333333333DDDDC3333333333333333333333333334DDD333333333333333333333333333D33C34C33333333333333333333333334DCCDD333333333333333333333333333DDDDC33333333333C3333333333333333333333333333334D3333333333333333333333333333334D333333333333333333333333333333DDC3333333DDD33333333333333333DDDDDDC33333D34333333333333333334DCCDD333333C34333333333333333333DCCDC333333C34C333333333333333334DDD3333333C33D3333333D3333333334DDD3333333C3DD3333333DC33333333DDDDC33334DC3DD3333333C433333333DC3DC33334DC3333333333C3C3333334C333D33333D33333333334C4C3333333333333333333333333334D3433333333333333333333333333334D3433333333333333333333333333333D4D3333333333333333333333333333334D3333333333333333333333333333334C3333333333333333333333333333333333333333333333333333333333333333333" - -glabel D_802ED550 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x05000000, 0x00000000, 0x00000000, 0x55500000, 0x00000000, 0x00000005, 0x52550000, 0x00000000, 0x00000055, 0x21255000, 0x00000000, 0x00000552, 0x11125500, 0x00000000, 0x00005521, 0x11112550, 0x00000000, 0x00005555, 0x11155550, 0x00000000, 0x00000055, 0x11155005, 0x55500000, 0x00000055, 0x11155055, 0x55550000, 0x00000055, 0x11155055, 0x11550000, 0x00000055, 0x11155555, 0x11550000, 0x00000055, 0x31135553, 0x12550000, 0x00000055, 0x42112221, 0x14550000, 0x00000005, 0x54311113, 0x45500000, 0x00000005, 0x55555555, 0x55000000, 0x00000000, 0x05555555, 0x50000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -glabel D_802ED670 -.word 0x294AE729, 0xC623AD61, 0x84194209, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001 - -glabel D_802ED690 -.word 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C79BCB, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x9BCBDE9B, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0xC553DE9B, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C79BCB, 0xDE9BDE9B, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C7C553, 0xDE9BDE9B, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x9BCBB44B, 0xC553C553, 0xDE55DE9B, 0xDE9BDE9B, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0xB44BDDCF, 0xDDCFDE55, 0xDE55DE55, 0xDE55DE55, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C7A3C7, 0xD549D549, 0xDDCFDDCF, 0xDDCFDE55, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x9B87CC87, 0xD549D549, 0xD549D549, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C7A3C7, 0xCC87CC87, 0xCC87CC87, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C7A3C7, 0xBC45BC45, 0xBC05BC05, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C7B44B, 0xBC45BC45, 0xBC05BC05, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C7BC05, 0xBC05B3C5, 0xB3C5B3C5, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x8B07B3C5, 0xB3C5B3C5, 0x9B878B07, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x8B07B3C5, 0xA3C78B07, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x8B079B87, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7 - -glabel D_802ED8D0 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x0000004F, 0x00000000, 0x000000CF, 0x00000000, 0x000003FF, 0x00000000, 0x00000BFF, 0x00000000, 0x69BDEFFF, 0x00000000, 0xAFFFFFFF, 0x00000000, 0x08FFFFFF, 0x00000000, 0x006FFFFF, 0x00000000, 0x0009FFFF, 0x00000000, 0x0009FFFF, 0x00000000, 0x000EFFFF, 0x00000000, 0x000FFFFF, 0x00000000, 0x002FFFC6, 0x00000000, 0x004FE500, 0x00000000, 0x00280000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/pause/1422A0.data.s b/ver/us/asm/data/pause/1422A0.data.s index 85a531efee..be322c123a 100644 --- a/ver/us/asm/data/pause/1422A0.data.s +++ b/ver/us/asm/data/pause/1422A0.data.s @@ -5,7 +5,7 @@ glabel gPauseMenuIconScripts .word D_80241ECC, 0x802427D4, nok_02_UnkMovePartner, 0x80241E00, D_801091E4, D_80108BBC, 0x80108D04, 0x80108D40 -glabel D_8024EF80 +glabel gPauseMenuTabs .word D_8024F314, D_8024F4AC, D_8024F54C, D_8024F5E4, D_8024F88C, D_8024FA10 glabel D_8024EF98 @@ -14,7 +14,7 @@ glabel D_8024EF98 glabel gPauseMenuCursorPosX .word 0x000000A0 -glabel D_8024EFA0 +glabel gPauseMenuCursorPosY .word 0xFFFFFF88 glabel gPauseMenuCursorOpacity diff --git a/ver/us/asm/data/world/area_flo/flo_14/CCD6A0.data.s b/ver/us/asm/data/world/area_flo/flo_14/CCD6A0.data.s deleted file mode 100644 index 123c701d75..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_14/CCD6A0.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -glabel D_80242390_CCD6A0 -.word 0x44340000, 0x00000000, 0x00000000, 0x43870000, 0xC4340000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802426BC_CCD9CC, D_80242390_CCD6A0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019011E - -glabel D_802423F0_CCD700 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -glabel D_80242460_CCD770 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, flo_14_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, flo_14_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -glabel D_802424FC_CCD80C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80245310, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -glabel D_80242558_CCD868 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80245318, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -glabel D_802425B4_CCD8C4 -.word 0x00000047, 0x00000005, D_80242558_CCD868, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802424FC_CCD80C, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -glabel D_802425FC_CCD90C -.word 0x0000001F, 0xC3FA0000, 0x00000000, 0xC2B40000, 0x00000019, 0xC3FF0000, 0x00000000, 0x00000000, 0x00000020, 0xC3FA0000, 0x00000000, 0x42DC0000, 0x00000021, 0xC37A0000, 0x00000000, 0xC2B40000, 0x0000001A, 0xC3700000, 0x00000000, 0x00000000, 0x00000022, 0xC37A0000, 0x00000000, 0x42DC0000, 0x0000001B, 0xC2480000, 0x00000000, 0x41C80000, 0x0000001C, 0x428C0000, 0x42700000, 0xC2BE0000, 0x0000001D, 0x43CD0000, 0x42700000, 0xC2BE0000, 0x0000001E, 0x44098000, 0x00000000, 0x42480000, 0x00000023, 0xC2480000, 0x00000000, 0x42DC0000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 - -glabel D_802426BC_CCD9CC -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80244F00, 0x00000044, 0x00000001, 0x80244F30, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000009, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, ResetFromLava, D_802425FC_CCD90C, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001D, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001F, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000020, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000023, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000024, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000027, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000029, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000002B, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000002D, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000002F, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000031, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000033, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000035, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001E, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000021, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000022, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000025, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000026, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000002A, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000002C, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000002E, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000030, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000032, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000034, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000036, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80242460_CCD770, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80242460_CCD770, 0x00000057, 0x00000000, 0x00000044, 0x00000001, 0x80243E78, 0x00000044, 0x00000001, 0x80245224, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_802425B4_CCD8C4, 0x00000044, 0x00000001, EnterWalk, 0x00000046, 0x00000001, D_802423F0_CCD700, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_8024030C_CCB61C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_14/CCDF10.data.s b/ver/us/asm/data/world/area_flo/flo_14/CCDF10.data.s deleted file mode 100644 index 99c6beedbe..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_14/CCDF10.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - -.section .data - -glabel D_80242C00_CCDF10 -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, RandInt, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -glabel D_80242EAC_CCE1BC -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_80240340_CCB650, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000008, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, PlaySoundAt, 0x000000F8, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C88, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0xFE363C89, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -glabel D_802431CC_CCE4DC -.word 0x00000000 - -glabel D_802431D0_CCE4E0 -.word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0xFE363C81, 0x00000030, 0x0000000F, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0x00000030, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -glabel D_802432E8_CCE5F8 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFFB, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -glabel D_80243384_CCE694 -.word 0x4404C000, 0x42960000, 0x42A20000, 0x43F08000, 0x42A00000, 0x42A20000, 0x43D78000, 0x42960000, 0x42A20000, 0x43BE8000, 0x428C0000, 0x42A20000, 0x43A58000, 0x42960000, 0x42A20000, 0x438C8000, 0x42A00000, 0x42A20000, 0x43670000, 0x42960000, 0x42A20000, 0x43350000, 0x428C0000, 0x42A20000, 0x43030000, 0x42960000, 0x42A20000, 0x42A20000, 0x42A00000, 0x42A20000, 0x41F80000, 0x42960000, 0x42A20000, 0xC1980000, 0x428C0000, 0x42A20000, 0xC28A0000, 0x42960000, 0x42A20000 - -glabel D_80243420_CCE730 -.word 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x80000023, 0x00000043, 0x00000005, LoadPath, 0x000000A5, D_80243384_CCE694, 0x0000000D, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, TranslateModel, 0x0000007B, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFE5, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFF6, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, func_8024046C_CCB77C, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000023, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, IsPlayerWithin, 0x00000213, 0x00000051, 0x0000001E, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000008, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000002, GetModelCenter, 0x0000007B, 0x00000056, 0x00000000, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFF6, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7B4D, 0x00000043, 0x00000005, PlayerJump, 0x00000213, 0x00000030, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFF1, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7B4D, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0x00000213, 0x00000044, 0xFE363C82, 0x0000000A, 0x00000057, 0x00000000, 0x00000045, 0x00000002, D_802431D0_CCE4E0, 0xFD050F89, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_802403D4_CCB6E4, 0x0000000B, 0x00000002, 0xFE363C8E, 0x00000000, 0x00000045, 0x00000002, D_802432E8_CCE5F8, 0xFE363C8E, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243420_CCE730, 0x0000000B, 0x00000002, 0xFE363C8E, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8E, 0x00000043, 0x00000001, func_8024042C_CCB73C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x0000007B, 0x00000043, 0x0000000F, PlayEffect, 0x00000043, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000002F3, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, ClearPartnerMoveHistory, 0xFFFFFFFC, 0x00000043, 0x00000003, EnableModel, 0x0000007B, 0x00000000, 0x00000024, 0x00000002, 0xF97188A5, 0x00000000, 0x00000049, 0x00000001, 0xFD050F89, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000193, 0x00000000, 0x0000024F, 0x00000037, 0x00000079, 0x00000043, 0x00000003, EnableModel, 0x0000007B, 0x00000001, 0x00000026, 0x00000002, 0xFE363C82, 0xF24A7E80, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C86, 0xF24A7A80, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFFE2, 0x00000024, 0x00000002, 0xFE363C88, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C87, 0xF24BE280, 0x0000002F, 0x00000002, 0xFE363C88, 0xF24BE280, 0x00000024, 0x00000002, 0xFE363C89, 0x000000B4, 0x00000005, 0x00000001, 0xFE363C89, 0x00000043, 0x00000005, TranslateModel, 0x0000007B, 0x0000024F, 0x00000037, 0x00000079, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002F, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000043, 0x00000005, ScaleModel, 0x0000007B, 0xFE363C83, 0xFE363C83, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0x0000007B, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24A7AB4, 0x0000000D, 0x00000002, 0xFE363C89, 0x0000005A, 0x0000002C, 0x00000002, 0xFE363C84, 0xFE363C87, 0x0000002C, 0x00000002, 0xFE363C85, 0xFE363C88, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFFE2, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFD8, 0x0000002F, 0x00000002, 0xFE363C87, 0xF24B6A80, 0x0000002F, 0x00000002, 0xFE363C88, 0xF24B6A80, 0x00000005, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, TranslateModel, 0x0000007B, 0x0000024F, 0x00000037, 0x00000079, 0x00000043, 0x00000005, ScaleModel, 0x0000007B, 0xFE363C83, 0xFE363C83, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0x0000007B, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x0000002C, 0x00000002, 0xFE363C84, 0xFE363C87, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C88, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF97188A4, 0x00000000, 0x00000024, 0x00000002, 0xF97188A5, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -glabel D_80243B14_CCEE24 -.word 0x00000000 - -glabel D_80243B18_CCEE28 -.word 0x0000005A - -glabel D_80243B1C_CCEE2C -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF97188A3, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000030, 0x00000001, D_802431CC_CCE4DC, 0x00000031, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x0000000A, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0xFE363C80, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000003, RandInt, 0x00000004, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A8A80, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7680, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A8280, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24AA280, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A7C1A, 0x00000026, 0x00000002, 0xFE363C84, 0xF253B680, 0x00000026, 0x00000002, 0xFE363C85, 0xF24B6A80, 0x00000026, 0x00000002, 0xFE363C86, 0xF24C5E80, 0x00000043, 0x00000003, RandInt, 0x00000003, 0xFE363C87, 0x0000002C, 0x00000002, 0xFE363C87, 0xF24A8680, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7AA9, 0x00000026, 0x00000002, 0xFE363C89, 0xFE363C87, 0x0000002F, 0x00000002, 0xFE363C89, 0xF24A8E80, 0x00000043, 0x00000003, RandInt, 0x00000032, 0xFE363C88, 0x00000027, 0x00000002, 0xFE363C88, 0x00000032, 0x00000005, 0x00000001, 0xFE363C88, 0x00000026, 0x00000002, 0xFE363C8E, 0xFE363C82, 0x0000002D, 0x00000002, 0xFE363C8E, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C8E, 0xF24A7AB0, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C8E, 0x00000026, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x0000002D, 0x00000002, 0xFE363C8E, 0xFE363C81, 0x0000002E, 0x00000002, 0xFE363C8E, 0xF24A7AB0, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C8E, 0x0000002C, 0x00000002, 0xFE363C84, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C8E, 0xFE363C87, 0x0000002D, 0x00000002, 0xFE363C8E, 0xFE363C89, 0x0000002E, 0x00000002, 0xFE363C8E, 0xF24A7B50, 0x0000002C, 0x00000002, 0xFE363C89, 0xFE363C8E, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8F, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8F, 0xFE363C89, 0xFE363C89, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8F, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000001F, 0x00000006, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000020, 0x00000006, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000021, 0x00000006, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000022, 0x00000006, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000023, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFD26, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF7E, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFE2A, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80242C00_CCDF10, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFD26, 0x00000024, 0x00000002, 0xFE363C81, 0x00000046, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFE2A, 0x00000024, 0x00000002, 0xFE363C83, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80242C00_CCDF10, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEE8, 0x00000024, 0x00000002, 0xFE363C81, 0x00000082, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF92, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80242C00_CCDF10, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEE8, 0x00000024, 0x00000002, 0xFE363C81, 0x00000046, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFF6, 0x00000024, 0x00000002, 0xFE363C83, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80242C00_CCDF10, 0x00000043, 0x00000002, GetModelCenter, 0x00000060, 0x00000024, 0x00000002, 0xFE363C83, 0x00000060, 0x00000024, 0x00000002, 0xFE363C84, 0x00000061, 0x00000024, 0x00000002, 0xFE363C85, 0x00000062, 0x00000024, 0x00000002, 0xFE363C86, 0x00000063, 0x00000024, 0x00000002, 0xFE363C8A, 0x000000AE, 0x00000044, 0x00000001, D_80242EAC_CCE1BC, 0x00000043, 0x00000002, GetModelCenter, 0x00000052, 0x00000024, 0x00000002, 0xFE363C83, 0x00000052, 0x00000024, 0x00000002, 0xFE363C84, 0x00000053, 0x00000024, 0x00000002, 0xFE363C85, 0x00000054, 0x00000024, 0x00000002, 0xFE363C86, 0x00000055, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_80242EAC_CCE1BC, 0x00000043, 0x00000002, GetModelCenter, 0x0000004C, 0x00000024, 0x00000002, 0xFE363C83, 0x0000004C, 0x00000024, 0x00000002, 0xFE363C84, 0x0000004D, 0x00000024, 0x00000002, 0xFE363C85, 0x0000004E, 0x00000024, 0x00000002, 0xFE363C86, 0x0000004F, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_80242EAC_CCE1BC, 0x00000043, 0x00000002, GetModelCenter, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C83, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C84, 0x0000005B, 0x00000024, 0x00000002, 0xFE363C85, 0x0000005C, 0x00000024, 0x00000002, 0xFE363C86, 0x0000005D, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_80242EAC_CCE1BC, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000F, 0x7FFFFE00, 0x00000043, 0x00000003, CloneModel, 0x0000007C, 0x00002711, 0x00000043, 0x00000003, CloneModel, 0x0000007C, 0x00002712, 0x00000043, 0x00000003, CloneModel, 0x0000007C, 0x00002713, 0x00000043, 0x00000003, CloneModel, 0x0000007C, 0x00002714, 0x00000043, 0x00000003, CloneModel, 0x0000007C, 0x00002715, 0x00000043, 0x00000003, EnableModel, 0x0000007B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000007C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00002711, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00002712, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00002713, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00002714, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00002715, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00002711, 0x00000044, 0x00000001, D_80243B1C_CCEE2C, 0x00000024, 0x00000002, 0xFE363C80, 0x00002712, 0x00000044, 0x00000001, D_80243B1C_CCEE2C, 0x00000024, 0x00000002, 0xFE363C80, 0x00002713, 0x00000044, 0x00000001, D_80243B1C_CCEE2C, 0x00000024, 0x00000002, 0xFE363C80, 0x00002714, 0x00000044, 0x00000001, D_80243B1C_CCEE2C, 0x00000024, 0x00000002, 0xFE363C80, 0x00002715, 0x00000044, 0x00000001, D_80243B1C_CCEE2C, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000000, 0x0000007B, 0x00000001, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000001, func_80240504_CCB814, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x0000007B, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00002711, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00002712, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00002713, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00002714, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00002715, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000001, 0x00000039, 0x00000001, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000002, func_802407D4_CCBAE4, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000039, 0x00000002, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_14/CCF7D0.data.s b/ver/us/asm/data/world/area_flo/flo_14/CCF7D0.data.s deleted file mode 100644 index 40f73297ea..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_14/CCF7D0.data.s +++ /dev/null @@ -1,45 +0,0 @@ -.include "macro.inc" - -.section .data - -glabel D_802444C0_CCF7D0 -.float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 - -glabel D_802444D8_CCF7E8 -.word 0x3F800000, 0x0000001E, 0x00000005, 0x42A00000, 0x41F00000, 0x00000002, 0x40900000, 0x00000006, 0x00000001, 0x42B40000, 0x41F00000, 0x00000001 - -glabel D_80244508_CCF818 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD8A, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000032, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x000000C8, 0x00000043, 0x00000002, func_80241E1C_CCD12C, D_802444D8_CCF7E8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -glabel D_80244578_CCF888 -.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_80244508_CCF818, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00130000 - -glabel D_802445A4_CCF8B4 -.word 0x00000000, 0x00380028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -glabel D_802445FC_CCF90C -.word 0x00000000 - -glabel D_80244600_CCF910 -.word 0x00000000 - -glabel D_80244604_CCF914 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, flo_14_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242288_CCD598, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -glabel D_80244738_CCFA48 -.word 0x00000043, 0x00000002, func_802422C0_CCD5D0, 0xFE363C80, 0x0000004E, 0x00000006, D_80244604_CCF914, 0x00000010, 0x00000000, D_802453B0_EF79C0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242234_CCD544, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -glabel D_80244788_CCFA98 -.word 0x000000A1, 0x00000000 - -glabel D_80244790_CCFAA0 -.word 0x0000000A, 0x00000002, 0xF97188A5, 0x00000001, 0x00000024, 0x00000002, 0xF97188A3, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00110063, 0x00000024, 0x00000002, 0xF97188A3, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF97188A3, 0x00000001, 0x0000000A, 0x00000002, 0xF8406104, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0011005F, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00110060, 0x00000013, 0x00000000, 0x00000043, 0x00000003, FindItem, 0x000000A1, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFE363C80, D_80244788_CCFA98, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_80244738_CCFA48, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00110064, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00110061, 0x00000024, 0x00000002, 0xF97188A4, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000022B, 0x0000006E, 0x00000014, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A7E80, 0x00000000, 0x0000015E, 0xF24ABE80, 0xF24A6280, 0x00000044, 0x00000001, 0x80243870, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00110062, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000013B, 0x00000000, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF97188A5, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000005, 0x00110063, 0x00000024, 0x00000002, 0xF8406104, 0x00000001, 0x00000047, 0x00000005, 0x8024352C, 0x00000800, 0x0000001E, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF97188A3, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -glabel D_80244ADC_CCFDEC -.word 0x00000024, 0x00000002, 0xF97188A4, 0x00000000, 0x00000024, 0x00000002, 0xF97188A5, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80244790_CCFAA0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -glabel D_80244B20_CCFE30 -.word 0x00000000, D_802445A4_CCF8B4, 0x441A4000, 0x00000000, 0x42D80000, 0x00004D01, D_80244ADC_CCFDEC, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00990002, 0x0099000E, 0x0099000E, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00000000, 0x00000000, 0x00000000, 0x001A00E3 - -glabel D_80244D10_CD0020 -.word 0x00000001, D_80244578_CCF888, 0xC32F0000, 0x425C0000, 0x41700000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A3, 0x00060000, 0x00A40004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00040000, 0xFFFFFF51, 0x00000037, 0x0000000F, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFF51, 0x00000037, 0x0000000F, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004B0002, 0x004B0002, 0x004B0003, 0x004B0003, 0x004B0001, 0x004B0002, 0x004B0006, 0x004B0006, 0x004B0004, 0x004B0002, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80244B20_CCFE30, 0x00000000, 0x00000001, D_80244D10_CD0020, 0x18190001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_14/CD0240.data.s b/ver/us/asm/data/world/area_flo/flo_14/CD0240.data.s deleted file mode 100644 index a7c90a5f30..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_14/CD0240.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -glabel D_80244F30_CD0240 -.word 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x000002A3, 0x0000003C, 0xFFFFFF9C, 0x00000011, 0xF84060EB, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_14/CD0280.data.s b/ver/us/asm/data/world/area_flo/flo_14/CD0280.data.s deleted file mode 100644 index 64754d11d7..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_14/CD0280.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -glabel D_80244F70_CD0280 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, flo_14_func_80242360_CCD670, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000017, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C85, 0x00000043, 0x00000006, PlaySoundAt, 0x000001DB, 0x00400000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C87, 0x0000005A, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C88, 0x00000006, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C89, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C88, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000032, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C87, 0x00000000, 0x00000028, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C88, 0x0000000E, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C85, 0x00000043, 0x00000006, PlaySoundAt, 0x000001DC, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C89, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000032, 0x0000000F, 0x00000002, 0xFE363C87, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFE363C87, 0x0000005A, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0xFE363C85, 0xFE363C87, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0xFE363C86, 0xFE363C87, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000015, 0x00000024, 0x00000002, 0xFE363C85, 0x00000015, 0x00000024, 0x00000002, 0xFE363C86, 0x00000014, 0x00000024, 0x00000002, 0xFE363C87, 0xFD050F8A, 0x00000024, 0x00000002, 0xFE363C88, 0xFD050F8B, 0x00000024, 0x00000002, 0xFE363C89, 0x00000016, 0x00000044, 0x00000001, D_80244F70_CD0280, 0x00000024, 0x00000002, 0xFE363C84, 0x00000011, 0x00000024, 0x00000002, 0xFE363C85, 0x0000001A, 0x00000024, 0x00000002, 0xFE363C86, 0x00000019, 0x00000024, 0x00000002, 0xFE363C87, 0xFD050F8C, 0x00000024, 0x00000002, 0xFE363C88, 0xFD050F8D, 0x00000024, 0x00000002, 0xFE363C89, 0x00000012, 0x00000044, 0x00000001, D_80244F70_CD0280, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_11/8E0190.data.s b/ver/us/asm/data/world/area_kmr/kmr_11/8E0190.data.s index 3dc2986bd2..0aa9637b80 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_11/8E0190.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_11/8E0190.data.s @@ -401,11 +401,11 @@ glabel D_8024EF48_8E9048 glabel D_8024EF74_8E9074 .word 0x00000000, 0x00000000, 0x00000000, 0xC31F0000, 0x00000000, 0xC2FC0000, D_8024EF1C_8E901C, D_8024EF48_8E9048, 0x00000000, 0x00000000, 0x00000000 -glabel D_8024EFA0_8E90A0 +glabel gPauseMenuCursorPosY_8E90A0 .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF0000, 0x00000000, 0x00790000 glabel D_8024EFCC_8E90CC -.word 0x00000000, 0x00000000, 0x00000000, 0xC31F0000, 0x00000000, 0xC2FC0000, D_8024EF74_8E9074, D_8024EFA0_8E90A0, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000000, 0x00000000, 0x00000000, 0xC31F0000, 0x00000000, 0xC2FC0000, D_8024EF74_8E9074, gPauseMenuCursorPosY_8E90A0, 0x00000000, 0x00000000, 0x00000000 glabel D_8024EFF8_8E90F8 .word 0x00000000, 0x00008001, 0x00000000, 0x430C0000, 0xC1200000, 0xC3B40000, 0x00000000, D_8024EFCC_8E90CC, 0x00000000, 0x00000000, 0x00000000 @@ -504,4 +504,4 @@ glabel D_8024F54C_8E964C .word 0x00000000, 0x00000907, 0x00000000, 0xC3850000, 0x00000000, 0xC2C60000, D_8024F158_8E9258, D_8024F520_8E9620, 0x00000000, 0x00000000, 0x00000000 glabel D_8024F578_8E9678 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8024F54C_8E964C, 0x00000000, 0x00000000, 0x00000000, D_8024F578_8E9678, D_8024F54C_8E964C, D_8024F520_8E9620, D_8024F4F4_8E95F4, D_8024F4C8_8E95C8, D_8024F49C_8E959C, D_8024F470_8E9570, D_8024F444_8E9544, D_8024F418_8E9518, D_8024F3EC_8E94EC, D_8024F3C0_8E94C0, D_8024F394_8E9494, D_8024F368_8E9468, D_8024F33C_8E943C, D_8024F310_8E9410, D_8024F2E4_8E93E4, D_8024F2B8_8E93B8, D_8024F28C_8E938C, D_8024F260_8E9360, D_8024F234_8E9334, D_8024F208_8E9308, D_8024F1DC_8E92DC, D_8024F1B0_8E92B0, D_8024F184_8E9284, D_8024F158_8E9258, D_8024F12C_8E922C, D_8024F100_8E9200, D_8024F0D4_8E91D4, D_8024F0A8_8E91A8, D_8024F07C_8E917C, D_8024F050_8E9150, D_8024F024_8E9124, D_8024EFF8_8E90F8, D_8024EFCC_8E90CC, D_8024EFA0_8E90A0, D_8024EF74_8E9074, D_8024EF48_8E9048, D_8024EF1C_8E901C, D_8024EEF0_8E8FF0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00050001, 0x00000000, 0x00000008, 0x00010000, 0x00000000, 0x00110001, 0x00B600B6, 0x00B60005, 0x00020000, 0x09070000, 0x00080002, 0xFEF60000, 0xFF9D0011, 0x000200B6, 0x00B600B6, 0x00050003, 0x00000000, 0x00000008, 0x00030000, 0x006E0000, 0x00110003, 0x00B600B6, 0x00B60005, 0x00040000, 0x00007FFE, 0x00080004, 0x00000000, 0x00000011, 0x000400B6, 0x00B600B6, 0x00050005, 0x00000000, 0xC0010008, 0x0005004B, 0x00000000, 0x00110005, 0x00B600B6, 0x00B60005, 0x00060000, 0x00000000, 0x00080006, 0x001E0000, 0x00000011, 0x000600B6, 0x00B600B6, 0x00050007, 0x00000000, 0xC0010008, 0x0007001E, 0x00000000, 0x00110007, 0x00B600B6, 0x00B60005, 0x00080000, 0x00007FFE, 0x00080008, 0x004B0000, 0x00000011, 0x000800B6, 0x00B600B6, 0x00050009, 0x00000000, 0xC0010008, 0x0009004B, 0x00000000, 0x00110009, 0x00B600B6, 0x00B60005, 0x000A0000, 0x00000000, 0x0008000A, 0x001E0000, 0x00000011, 0x000A00B6, 0x00B600B6, 0x0005000B, 0x00000000, 0xC0010008, 0x000B001E, 0x00000000, 0x0011000B, 0x00B600B6, 0x00B60005, 0x000C0000, 0x00007FFE, 0x0008000C, 0x004B0000, 0x00000011, 0x000C00B6, 0x00B600B6, 0x0005000D, 0x00000000, 0xC0010008, 0x000D004B, 0x00000000, 0x0011000D, 0x00B600B6, 0x00B60005, 0x000E0000, 0x00000000, 0x0008000E, 0x001E0000, 0x00000011, 0x000E00B6, 0x00B600B6, 0x0005000F, 0x00000000, 0xC0010008, 0x000F001E, 0x00000000, 0x0011000F, 0x00B600B6, 0x00B60005, 0x00100000, 0x00000000, 0x00080010, 0x004B0000, 0x00000011, 0x001000B6, 0x00B600B6, 0x00050011, 0x0000F6F9, 0x00000008, 0x00110138, 0xFEDF009B, 0x00110011, 0x00B600B6, 0x00B60005, 0x00120000, 0xF6F98002, 0x00080012, 0xFF1300E5, 0x009B0011, 0x001200B6, 0x00B600B6, 0x00050013, 0x0000F6F9, 0x00000008, 0x00130138, 0xFF1B009B, 0x00110013, 0x00B600B6, 0x00B60005, 0x00140000, 0xF6F98002, 0x00080014, 0xFF1300A9, 0x009B0011, 0x001400B6, 0x00B600B6, 0x00050015, 0x0000F6F9, 0x00000008, 0x00150138, 0xFF57009B, 0x00110015, 0x00B600B6, 0x00B60005, 0x00160000, 0xF6F98002, 0x00080016, 0xFF13006D, 0x009B0011, 0x001600B6, 0x00B600B6, 0x00050017, 0x00000000, 0x00000008, 0x00170000, 0x006E0000, 0x00110017, 0x00B600B6, 0x00B60005, 0x00180000, 0xF6F90000, 0x00080018, 0x00000000, 0x00000011, 0x001800B6, 0x00B600B6, 0x00050019, 0x00000000, 0x00000008, 0x00190000, 0x00000000, 0x00110019, 0x00B600B6, 0x00B60005, 0x001A0000, 0x00000000, 0x0008001A, 0x0000FFF6, 0x00000011, 0x001A00B6, 0x00B600B6, 0x0005001B, 0x00000000, 0x00000008, 0x001BFF61, 0x0000FF82, 0x0011001B, 0x00B600B6, 0x00B60005, 0x001C0000, 0x00000000, 0x0008001C, 0x00000000, 0x00000011, 0x001C00B6, 0x00B600B6, 0x0005001D, 0x00000000, 0x00000008, 0x001DFF61, 0x0000FF82, 0x0011001D, 0x00B600B6, 0x00B60005, 0x001E0000, 0x00000000, 0x0008001E, 0x00000000, 0x00000011, 0x001E00B6, 0x00B600B6, 0x0005001F, 0x00000000, 0x00000008, 0x001FFF61, 0x0000FF82, 0x0011001F, 0x00B600B6, 0x00B60005, 0x00200000, 0x00000000, 0x00080020, 0x00000000, 0x00000011, 0x002000B6, 0x00B600B6, 0x00050021, 0x00008001, 0x00000008, 0x0021008C, 0xFFF6FE98, 0x00110021, 0x00B600B6, 0x00B60005, 0x00220000, 0x00000000, 0x00080022, 0xFF610000, 0xFF820011, 0x002200B6, 0x00B600B6, 0x00050023, 0x00000000, 0x00000008, 0x00230000, 0x00000000, 0x00110023, 0x00B600B6, 0x00B60005, 0x00240000, 0x00000000, 0x00080024, 0xFF610000, 0xFF820011, 0x002400B6, 0x00B600B6, 0x00050025, 0x00000000, 0x00000008, 0x00250000, 0x00000000, 0x00110025, 0x00B600B6, 0x00B60005, 0x00260000, 0x00000000, 0x00080026, 0xFF610000, 0xFF820011, 0x002600B6, 0x00B600B6, 0x00050027, 0x00000000, 0x00000008, 0x00270000, 0x00000000, 0x00110027, 0x00B600B6, 0x00B60001, 0x00010005, 0x00040000, 0x00007FFA, 0x00050006, 0x00000000, 0x00100005, 0x00080000, 0x00007FEB, 0x0005000A, 0x00000000, 0x00110005, 0x000C0000, 0x00007FFC, 0x0005000E, 0x00000000, 0x00120001, 0x00010005, 0x00040000, 0x00007FDE, 0x00050006, 0x00000000, 0x00360005, 0x00080000, 0x00007FC4, 0x0005000A, 0x00000000, 0x00380005, 0x000C0000, 0x00007FE4, 0x0005000E, 0x00000000, 0x003A0001, 0x00010005, 0x00040000, 0x00007FA5, 0x00050006, 0x00000000, 0x00760005, 0x00080000, 0x00007F82, 0x0005000A, 0x00000000, 0x00790005, 0x000C0000, 0x00007FAF, 0x0005000E, 0x00000000, 0x007B0001, 0x00010005, 0x00040000, 0x00007F4E, 0x00050006, 0x00000000, 0x00D60005, 0x00080000, 0x00007F20, 0x0005000A, 0x00000000, 0x00DA0005, 0x000C0000, 0x00007F58, 0x0005000E, 0x00000000, 0x00DD0001, 0x00010005, 0x00040000, 0x00007ED6, 0x00050006, 0x00000000, 0x015C0005, 0x00080000, 0x00007E99, 0x0005000A, 0x00000000, 0x01610005, 0x000C0000, 0x00007ED9, 0x0005000E, 0x00000000, 0x01640001, 0x00010005, 0x00040000, 0x00007E3A, 0x00050006, 0x00000000, 0x020E0005, 0x00080000, 0x00007DE6, 0x0005000A, 0x00000000, 0x02130005, 0x000C0000, 0x00007E2D, 0x0005000E, 0x00000000, 0x02170001, 0x00010005, 0x00040000, 0x00007D77, 0x00050006, 0x00000000, 0x02F10005, 0x00080000, 0x00007D02, 0x0005000A, 0x00000000, 0x02F70005, 0x000C0000, 0x00007D4E, 0x0005000E, 0x00000000, 0x02FB0001, 0x00010005, 0x00040000, 0x00007C8C, 0x00050006, 0x00000000, 0x040C0005, 0x00080000, 0x00007BE7, 0x0005000A, 0x00000000, 0x04120005, 0x000C0000, 0x00007C36, 0x0005000E, 0x00000000, 0x04160001, 0x00010005, 0x00040000, 0x00007B75, 0x00050006, 0x00000000, 0x05630005, 0x00080000, 0x00007A8F, 0x0005000A, 0x00000000, 0x05690005, 0x000C0000, 0x00007AE1, 0x0005000E, 0x00000000, 0x056D0001, 0x00010005, 0x00040000, 0x00007A2F, 0x00050006, 0x00000000, 0x06FD0005, 0x00080000, 0x000078F5, 0x0005000A, 0x00000000, 0x07030005, 0x000C0000, 0x00007948, 0x0005000E, 0x00000000, 0x07070001, 0x00010005, 0x00040000, 0x000078B9, 0x00050006, 0x00000000, 0x08DF0005, 0x00080000, 0x00007713, 0x0005000A, 0x00000000, 0x08E50005, 0x000C0000, 0x00007765, 0x0005000E, 0x00000000, 0x08E90001, 0x00010005, 0x00040000, 0x0000770E, 0x00050006, 0x00000000, 0x0B0F0005, 0x00080000, 0x000074E4, 0x0005000A, 0x00000000, 0x0B150005, 0x000C0000, 0x00007533, 0x0005000E, 0x00000000, 0x0B190001, 0x00010005, 0x00040000, 0x0000752D, 0x00050006, 0x00000000, 0x0D930005, 0x00080000, 0x00007260, 0x0005000A, 0x00000000, 0x0D980005, 0x000C0000, 0x000072AD, 0x0005000E, 0x00000000, 0x0D9D0001, 0x00010005, 0x00040000, 0x00007314, 0x00050006, 0x00000000, 0x10700005, 0x00080000, 0x00006F84, 0x0005000A, 0x00000000, 0x10750005, 0x000C0000, 0x00006FCD, 0x0005000E, 0x00000000, 0x10790001, 0x00010005, 0x00040000, 0x000070BE, 0x00050006, 0x00000000, 0x13AC0005, 0x00080000, 0x00006C48, 0x0005000A, 0x00000000, 0x13B10005, 0x000C0000, 0x00006C8D, 0x0005000E, 0x00000000, 0x13B50001, 0x00010005, 0x00040000, 0x00006E2A, 0x00050006, 0x00000000, 0x174D0005, 0x00080000, 0x000068A7, 0x0005000A, 0x00000000, 0x17520005, 0x000C0000, 0x000068E8, 0x0005000E, 0x00000000, 0x17560001, 0x00010005, 0x00040000, 0x00006B55, 0x00050006, 0x00000000, 0x1B590005, 0x00080000, 0x0000649C, 0x0005000A, 0x00000000, 0x1B5E0005, 0x000C0000, 0x000064D7, 0x0005000E, 0x00000000, 0x1B610001, 0x00010005, 0x00040000, 0x0000683D, 0x00050006, 0x00000000, 0x1FD50005, 0x00080000, 0x00006021, 0x0005000A, 0x00000000, 0x1FD90005, 0x000C0000, 0x00006056, 0x0005000E, 0x00000000, 0x1FDC0001, 0x00010005, 0x00040000, 0x000064DE, 0x00050006, 0x00000000, 0x24C70005, 0x00080000, 0x00005B30, 0x0005000A, 0x00000000, 0x24CB0005, 0x000C0000, 0x00005B5F, 0x0005000E, 0x00000000, 0x24CD0001, 0x00010005, 0x00040000, 0x00006136, 0x00050006, 0x00000000, 0x2A350005, 0x00080000, 0x000055C3, 0x0005000A, 0x00000000, 0x2A380005, 0x000C0000, 0x000055EC, 0x0005000E, 0x00000000, 0x2A3A0001, 0x00010005, 0x00040000, 0x00005D42, 0x00050006, 0x00000000, 0x30240005, 0x00080000, 0x00004FD5, 0x0005000A, 0x00000000, 0x30270005, 0x000C0000, 0x00004FF8, 0x0005000E, 0x00000000, 0x30290001, 0x00010005, 0x00040000, 0x00005900, 0x00050006, 0x00000000, 0x369B0005, 0x00080000, 0x0000495F, 0x0005000A, 0x00000000, 0x369D0005, 0x000C0000, 0x0000497C, 0x0005000E, 0x00000000, 0x369F0001, 0x00010005, 0x00040000, 0x0000546D, 0x00050006, 0x00000000, 0x3D9E0005, 0x00080000, 0x0000425D, 0x0005000A, 0x00000000, 0x3DA00005, 0x000C0000, 0x00004274, 0x0005000E, 0x00000000, 0x3DA10001, 0x00010005, 0x00040000, 0x00004F86, 0x00050006, 0x00000000, 0x45340005, 0x00080000, 0x00003AC7, 0x0005000A, 0x00000000, 0x45350005, 0x000C0000, 0x00003AD9, 0x0005000E, 0x00000000, 0x45360001, 0x00010005, 0x00040000, 0x00004A49, 0x00050006, 0x00000000, 0x4D620005, 0x00080000, 0x0000329A, 0x0005000A, 0x00000000, 0x4D630005, 0x000C0000, 0x000032A7, 0x0005000E, 0x00000000, 0x4D640001, 0x00010008, 0x00030003, 0x00800000, 0x00050004, 0x00000000, 0x44B20005, 0x00060000, 0x0000562F, 0x00050008, 0x00000000, 0x29CE0005, 0x000A0000, 0x0000562F, 0x0005000C, 0x00000000, 0x29D70005, 0x000E0000, 0x00005630, 0x00080017, 0x00030080, 0x00000001, 0x00010008, 0x00030006, 0x00910000, 0x00050004, 0x00000000, 0x3EC00005, 0x00060000, 0x00005F9F, 0x00050008, 0x00000000, 0x205F0005, 0x000A0000, 0x00005F9F, 0x0005000C, 0x00000000, 0x20640005, 0x000E0000, 0x00005F9F, 0x00080017, 0x00060091, 0x00000001, 0x00010008, 0x0003000A, 0x009F0000, 0x00050004, 0x00000000, 0x38700005, 0x00060000, 0x000069B8, 0x00050008, 0x00000000, 0x16450005, 0x000A0000, 0x000069B8, 0x0005000C, 0x00000000, 0x16480005, 0x000E0000, 0x000069B8, 0x00080017, 0x000A009F, 0x00000001, 0x00010008, 0x0003000D, 0x00AA0000, 0x00050004, 0x00000000, 0x31BF0005, 0x00060000, 0x00007481, 0x00050008, 0x00000000, 0x0B7D0005, 0x000A0000, 0x00007481, 0x0005000C, 0x00000000, 0x0B7E0005, 0x000E0000, 0x00007481, 0x00080017, 0x000D00AA, 0x00000001, 0x00010008, 0x00030011, 0x00B40000, 0x00050004, 0x00000000, 0x2AAA0005, 0x00060000, 0x00008001, 0x00050008, 0x00000000, 0x00000005, 0x000A0000, 0x00008001, 0x0005000C, 0x00000000, 0x00000005, 0x000E0000, 0x00008001, 0x00080017, 0x001100B4, 0x00000001, 0x00010008, 0x00030014, 0x00BB0000, 0x00050004, 0x00000000, 0x29890008, 0x00170014, 0x00BB0000, 0x00010001, 0x00080003, 0x001800C1, 0x00000005, 0x00040000, 0x0000286B, 0x00080017, 0x001800C1, 0x00000001, 0x00010008, 0x0003001B, 0x00C50000, 0x00050004, 0x00000000, 0x27510008, 0x0017001B, 0x00C50000, 0x00010001, 0x00080003, 0x001E00C7, 0x00000005, 0x00040000, 0x00002639, 0x00080017, 0x001E00C7, 0x00000001, 0x00010008, 0x00030022, 0x00C80000, 0x00050004, 0x00000000, 0x25250008, 0x00170022, 0x00C80000, 0x00010001, 0x00080003, 0x002500C8, 0x00000005, 0x00040000, 0x00002414, 0x00080017, 0x002500C8, 0x00000001, 0x00010008, 0x00030029, 0x00C80000, 0x00050004, 0x00000000, 0x23070008, 0x00170029, 0x00C80000, 0x00010001, 0x00080003, 0x002C00C8, 0x00000005, 0x00040000, 0x000021FC, 0x00080017, 0x002C00C8, 0x00000001, 0x00010008, 0x00030030, 0x00C80000, 0x00050004, 0x00000000, 0x20F50008, 0x00170030, 0x00C80000, 0x00010001, 0x00080003, 0x003300C8, 0x00000005, 0x00040000, 0x00001FF1, 0x00080017, 0x003300C8, 0x00000001, 0x00010008, 0x00030036, 0x00C70000, 0x00050004, 0x00000000, 0x1EF10008, 0x00170036, 0x00C70000, 0x00010001, 0x00080003, 0x003A00C5, 0x00000005, 0x00040000, 0x00001DF3, 0x00080017, 0x003A00C5, 0x00000001, 0x00010008, 0x0003003D, 0x00C30000, 0x00050004, 0x00000000, 0x1CF90008, 0x0017003D, 0x00C30000, 0x00010001, 0x00080003, 0x004100BF, 0x00000005, 0x00040000, 0x00001C02, 0x00080017, 0x004100BF, 0x00000001, 0x00010008, 0x00030044, 0x00BA0000, 0x00050004, 0x00000000, 0x1B0D0008, 0x00170044, 0x00BA0000, 0x00010001, 0x00080003, 0x004800B4, 0x00000005, 0x00040000, 0x00001A1D, 0x00080017, 0x004800B4, 0x00000001, 0x00010008, 0x0003004B, 0x00AD0000, 0x00050004, 0x00000000, 0x192F0008, 0x0017004B, 0x00AD0000, 0x00010001, 0x00080003, 0x004E00A5, 0x00000005, 0x00040000, 0x00001844, 0x00080017, 0x004E00A5, 0x00000001, 0x00010008, 0x00030052, 0x009C0000, 0x00050004, 0x00000000, 0x175D0008, 0x00170052, 0x009C0000, 0x00010001, 0x00080003, 0x00550092, 0x00000005, 0x00040000, 0x00001679, 0x00080017, 0x00550092, 0x00000001, 0x00010008, 0x00030059, 0x00880000, 0x00050004, 0x00000000, 0x15970008, 0x00170059, 0x00880000, 0x00010001, 0x00080003, 0x005C007C, 0x00000005, 0x00040000, 0x000014B9, 0x00080017, 0x005C007C, 0x00000001, 0x00010008, 0x0003005F, 0x006F0000, 0x00050004, 0x00000000, 0x13DE0008, 0x0017005F, 0x006F0000, 0x00010001, 0x00080003, 0x00630062, 0x00000005, 0x00040000, 0x00001307, 0x00080017, 0x00630062, 0x00000001, 0x00010008, 0x00030066, 0x00540000, 0x00050004, 0x00000000, 0x12320008, 0x00170066, 0x00540000, 0x00010001, 0x00080003, 0x006A0044, 0x00000005, 0x00040000, 0x00001160, 0x00080017, 0x006A0044, 0x00000001, 0x00010008, 0x0003006D, 0x00340000, 0x00050004, 0x00000000, 0x10920008, 0x0017006D, 0x00340000, 0x00010001, 0x00080003, 0x00710024, 0x00000005, 0x00040000, 0x00000FC6, 0x00080017, 0x00710024, 0x00000001, 0x00010008, 0x00030074, 0x00120000, 0x00050004, 0x00000000, 0x0EFE0008, 0x00170074, 0x00120000, 0x00010001, 0x00080003, 0x00780000, 0x00000005, 0x00040000, 0x00000E38, 0x00080017, 0x00780000, 0x00000008, 0x001BFF6B, 0x0000FF82, 0x00010001, 0x00050004, 0x00000000, 0x096C0008, 0x001BFF6C, 0x0000FF82, 0x00010001, 0x00050004, 0x00000000, 0x04A60008, 0x001BFF6F, 0xFFFFFF82, 0x00010001, 0x00050004, 0x00000000, 0x00000008, 0x001BFF73, 0xFFFDFF82, 0x00010001, 0x00080003, 0x0078000A, 0x00000005, 0x00040000, 0x000000EF, 0x00080017, 0x0078000A, 0x00000008, 0x001BFF77, 0xFFFBFF82, 0x00010001, 0x00080003, 0x00780011, 0x00000005, 0x00040000, 0x0000018D, 0x00080017, 0x00780011, 0x00000008, 0x001BFF7B, 0xFFF7FF82, 0x00010001, 0x00080003, 0x00780014, 0x00000005, 0x00040000, 0x000001C7, 0x00080017, 0x00780014, 0x00000008, 0x001BFF7D, 0xFFF3FF82, 0x00010001, 0x00080003, 0x00780011, 0x00000005, 0x00040000, 0x000001B3, 0x00080017, 0x00780011, 0x00000008, 0x001BFF7E, 0xFFEEFF82, 0x00010001, 0x00080003, 0x0078000A, 0x00000005, 0x00040000, 0x0000016E, 0x00080017, 0x0078000A, 0x00000008, 0x001BFF7E, 0xFFE9FF82, 0x00010001, 0x00080003, 0x00780000, 0x00000005, 0x00040000, 0x000000E2, 0x00080017, 0x00780000, 0x00000008, 0x001BFF7D, 0xFFE3FF82, 0x00010001, 0x00080003, 0x00780003, 0x00000005, 0x00040000, 0x00000000, 0x00080017, 0x00780003, 0x00000008, 0x001BFF7B, 0xFFDCFF82, 0x00010001, 0x00080003, 0x00780005, 0x00000005, 0x00040000, 0x00000079, 0x00080017, 0x00780005, 0x00000008, 0x001BFF78, 0xFFD5FF82, 0x00010001, 0x00080003, 0x00780004, 0x00000005, 0x00040000, 0x000000B6, 0x00080017, 0x00780004, 0x00000008, 0x001BFF75, 0xFFCDFF82, 0x00010001, 0x00080003, 0x00780000, 0x00000005, 0x00040000, 0x0000007B, 0x00080017, 0x00780000, 0x00000008, 0x001BFF72, 0xFFC4FF82, 0x00010001, 0x00050004, 0x00000000, 0x00000008, 0x001BFF6F, 0xFFBAFF82, 0x00010001, 0x0008001B, 0xFF6BFFB0, 0xFF820008, 0x001DFF6B, 0x0000FF82, 0x00010001, 0x0008001B, 0xFF6CFFA6, 0xFF820001, 0x00010008, 0x001BFF6D, 0xFF9BFF82, 0x0008001D, 0xFF6CFFFF, 0xFF820001, 0x00010008, 0x001BFF6E, 0xFF8FFF82, 0x0008001D, 0xFF6CFFFD, 0xFF820001, 0x00010008, 0x001BFF6E, 0xFF82FF82, 0x0008001D, 0xFF6DFFFB, 0xFF820001, 0x00010008, 0x001BFF6F, 0xFF75FF82, 0x0008001D, 0xFF6DFFF7, 0xFF820008, 0x001FFF6B, 0x0000FF82, 0x00080022, 0xFF6B0000, 0xFF820001, 0x00010008, 0x001BFF6F, 0xFF68FF82, 0x0008001D, 0xFF6EFFF3, 0xFF820008, 0x001FFF6C, 0x0000FF82, 0x00080022, 0xFF6C0000, 0xFF820001, 0x00010008, 0x001BFF6F, 0xFF59FF82, 0x0008001D, 0xFF6FFFEE, 0xFF820008, 0x001FFF6F, 0xFFFFFF82, 0x00080022, 0xFF6FFFFF, 0xFF820001, 0x00010008, 0x001BFF6F, 0xFF4BFF82, 0x0008001D, 0xFF70FFE9, 0xFF820008, 0x001FFF73, 0xFFFDFF82, 0x00080022, 0xFF73FFFD, 0xFF820001, 0x00010008, 0x001BFF6F, 0xFF3BFF82, 0x0008001D, 0xFF71FFE3, 0xFF820008, 0x001FFF77, 0xFFFBFF82, 0x00080022, 0xFF77FFFB, 0xFF820001, 0x00010008, 0x001BFF6E, 0xFF2BFF82, 0x0008001D, 0xFF72FFDC, 0xFF820008, 0x001FFF7B, 0xFFF7FF82, 0x00080022, 0xFF7BFFF7, 0xFF820001, 0x00010008, 0x001BFF6D, 0xFF1BFF82, 0x0008001D, 0xFF73FFD5, 0xFF820008, 0x001FFF7E, 0xFFF3FF82, 0x00080022, 0xFF7DFFF3, 0xFF820001, 0x00010008, 0x001BFF6D, 0xFF0AFF82, 0x0008001D, 0xFF75FFCD, 0xFF820008, 0x001FFF7E, 0xFFEEFF82, 0x00080022, 0xFF7EFFEE, 0xFF820001, 0x00010008, 0x001BFF6C, 0xFEF9FF82, 0x0008001D, 0xFF76FFC4, 0xFF820008, 0x001FFF7E, 0xFFE9FF82, 0x00080022, 0xFF7EFFE9, 0xFF820001, 0x00010008, 0x001BFF6C, 0xFEE7FF82, 0x0008001D, 0xFF77FFBA, 0xFF820008, 0x001FFF7D, 0xFFE3FF82, 0x00080022, 0xFF7DFFE3, 0xFF820001, 0x00010008, 0x001BFF6B, 0xFED4FF82, 0x0008001D, 0xFF79FFB0, 0xFF820008, 0x001FFF7C, 0xFFDCFF82, 0x00080022, 0xFF7BFFDC, 0xFF820001, 0x00010008, 0x001DFF7A, 0xFFA6FF82, 0x0008001F, 0xFF7BFFD5, 0xFF820008, 0x0022FF78, 0xFFD5FF82, 0x00010001, 0x0008001D, 0xFF7BFF9B, 0xFF820008, 0x001FFF79, 0xFFCDFF82, 0x00080022, 0xFF75FFCD, 0xFF820001, 0x00010008, 0x001DFF7D, 0xFF8FFF82, 0x0008001F, 0xFF78FFC4, 0xFF820008, 0x0022FF72, 0xFFC4FF82, 0x00010001, 0x0008001D, 0xFF7EFF82, 0xFF820008, 0x001FFF76, 0xFFBAFF82, 0x00080022, 0xFF6FFFBA, 0xFF820001, 0x00010008, 0x001DFF7F, 0xFF75FF82, 0x0008001F, 0xFF74FFB0, 0xFF820008, 0x0022FF6B, 0xFFB0FF82, 0x00080026, 0xFF6B0000, 0xFF820001, 0x00010008, 0x001DFF80, 0xFF68FF82, 0x0008001F, 0xFF72FFA6, 0xFF820008, 0x0022FF6C, 0xFFA6FF82, 0x00080026, 0xFF6C0000, 0xFF820001, 0x00010008, 0x001DFF81, 0xFF59FF82, 0x0008001F, 0xFF70FF9B, 0xFF820008, 0x0022FF6D, 0xFF9BFF82, 0x00080026, 0xFF6FFFFF, 0xFF820001, 0x00010008, 0x001DFF82, 0xFF4BFF82, 0x0008001F, 0xFF6EFF8F, 0xFF820008, 0x0022FF6E, 0xFF8FFF82, 0x00080026, 0xFF73FFFD, 0xFF820001, 0x00010008, 0x001DFF83, 0xFF3BFF82, 0x0008001F, 0xFF6CFF82, 0xFF820008, 0x0022FF6E, 0xFF82FF82, 0x00080026, 0xFF77FFFB, 0xFF820001, 0x00010008, 0x001DFF84, 0xFF2BFF82, 0x0008001F, 0xFF6AFF75, 0xFF820008, 0x0022FF6F, 0xFF75FF82, 0x00080026, 0xFF7BFFF7, 0xFF820001, 0x00010008, 0x001DFF85, 0xFF1BFF82, 0x0008001F, 0xFF68FF68, 0xFF820008, 0x0022FF6F, 0xFF68FF82, 0x00080026, 0xFF7EFFF3, 0xFF820001, 0x00010008, 0x001DFF85, 0xFF0AFF82, 0x0008001F, 0xFF66FF59, 0xFF820008, 0x0022FF6F, 0xFF59FF82, 0x00080026, 0xFF7EFFEE, 0xFF820001, 0x00010008, 0x001DFF86, 0xFEF9FF82, 0x0008001F, 0xFF65FF4B, 0xFF820008, 0x0022FF6F, 0xFF4BFF82, 0x00080026, 0xFF7EFFE9, 0xFF820001, 0x00010008, 0x001DFF86, 0xFEE7FF82, 0x0008001F, 0xFF63FF3B, 0xFF820008, 0x0022FF6F, 0xFF3BFF82, 0x00080026, 0xFF7DFFE3, 0xFF820001, 0x00010008, 0x001DFF86, 0xFED4FF82, 0x0008001F, 0xFF62FF2B, 0xFF820008, 0x0022FF6E, 0xFF2BFF82, 0x00080026, 0xFF7CFFDC, 0xFF820001, 0x00010008, 0x001FFF60, 0xFF1BFF82, 0x00080022, 0xFF6DFF1B, 0xFF820008, 0x0026FF7B, 0xFFD5FF82, 0x00010001, 0x0008001F, 0xFF5FFF0A, 0xFF820008, 0x0022FF6D, 0xFF0AFF82, 0x00080026, 0xFF79FFCD, 0xFF820001, 0x00010008, 0x001FFF5F, 0xFEF9FF82, 0x00080022, 0xFF6CFEF9, 0xFF820008, 0x0026FF78, 0xFFC4FF82, 0x00010001, 0x0008001F, 0xFF5EFEE7, 0xFF820008, 0x0022FF6C, 0xFEE7FF82, 0x00080026, 0xFF76FFBA, 0xFF820001, 0x00010008, 0x001FFF5E, 0xFED4FF82, 0x00080022, 0xFF6BFED4, 0xFF820008, 0x0024FF6B, 0x0000FF82, 0x00080026, 0xFF74FFB0, 0xFF820001, 0x00010008, 0x0026FF72, 0xFFA6FF82, 0x00010001, 0x00080024, 0xFF6CFFFF, 0xFF820008, 0x0026FF70, 0xFF9BFF82, 0x00010001, 0x00080024, 0xFF6CFFFD, 0xFF820008, 0x0026FF6E, 0xFF8FFF82, 0x00010001, 0x00080024, 0xFF6DFFFB, 0xFF820008, 0x0026FF6C, 0xFF82FF82, 0x00010001, 0x00080024, 0xFF6DFFF7, 0xFF820008, 0x0026FF6A, 0xFF75FF82, 0x00010001, 0x00080024, 0xFF6EFFF3, 0xFF820008, 0x0026FF68, 0xFF68FF82, 0x00010001, 0x00080024, 0xFF6FFFEE, 0xFF820008, 0x0026FF66, 0xFF59FF82, 0x00010001, 0x00080024, 0xFF70FFE9, 0xFF820008, 0x0026FF65, 0xFF4BFF82, 0x00010001, 0x00080024, 0xFF71FFE3, 0xFF820008, 0x0026FF63, 0xFF3BFF82, 0x00010001, 0x00080024, 0xFF72FFDC, 0xFF820008, 0x0026FF62, 0xFF2BFF82, 0x00010001, 0x00080024, 0xFF73FFD5, 0xFF820008, 0x0026FF60, 0xFF1BFF82, 0x00010001, 0x00080024, 0xFF75FFCD, 0xFF820008, 0x0026FF5F, 0xFF0AFF82, 0x00010001, 0x00080024, 0xFF76FFC4, 0xFF820008, 0x0026FF5F, 0xFEF9FF82, 0x00010001, 0x00080024, 0xFF77FFBA, 0xFF820008, 0x0026FF5E, 0xFEE7FF82, 0x00010001, 0x00080024, 0xFF79FFB0, 0xFF820008, 0x0026FF5E, 0xFED4FF82, 0x00010001, 0x00080024, 0xFF7AFFA6, 0xFF820001, 0x00010008, 0x0024FF7B, 0xFF9BFF82, 0x00010001, 0x00080024, 0xFF7DFF8F, 0xFF820001, 0x00010008, 0x0024FF7E, 0xFF82FF82, 0x00010001, 0x00080024, 0xFF7FFF75, 0xFF820001, 0x00010008, 0x0024FF80, 0xFF68FF82, 0x00010001, 0x00080024, 0xFF81FF59, 0xFF820001, 0x00010008, 0x0024FF82, 0xFF4BFF82, 0x00010001, 0x00080024, 0xFF83FF3B, 0xFF820001, 0x00010008, 0x0024FF84, 0xFF2BFF82, 0x00010001, 0x00080024, 0xFF85FF1B, 0xFF820001, 0x00010008, 0x0024FF85, 0xFF0AFF82, 0x00010001, 0x00080024, 0xFF86FEF9, 0xFF820001, 0x00010008, 0x0024FF86, 0xFEE7FF82, 0x00010001, 0x000A0008, 0x0024FF86, 0xFED4FF82, 0x00010001, 0x00030000 +.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8024F54C_8E964C, 0x00000000, 0x00000000, 0x00000000, D_8024F578_8E9678, D_8024F54C_8E964C, D_8024F520_8E9620, D_8024F4F4_8E95F4, D_8024F4C8_8E95C8, D_8024F49C_8E959C, D_8024F470_8E9570, D_8024F444_8E9544, D_8024F418_8E9518, D_8024F3EC_8E94EC, D_8024F3C0_8E94C0, D_8024F394_8E9494, D_8024F368_8E9468, D_8024F33C_8E943C, D_8024F310_8E9410, D_8024F2E4_8E93E4, D_8024F2B8_8E93B8, D_8024F28C_8E938C, D_8024F260_8E9360, D_8024F234_8E9334, D_8024F208_8E9308, D_8024F1DC_8E92DC, D_8024F1B0_8E92B0, D_8024F184_8E9284, D_8024F158_8E9258, D_8024F12C_8E922C, D_8024F100_8E9200, D_8024F0D4_8E91D4, D_8024F0A8_8E91A8, D_8024F07C_8E917C, D_8024F050_8E9150, D_8024F024_8E9124, D_8024EFF8_8E90F8, D_8024EFCC_8E90CC, gPauseMenuCursorPosY_8E90A0, D_8024EF74_8E9074, D_8024EF48_8E9048, D_8024EF1C_8E901C, D_8024EEF0_8E8FF0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00050001, 0x00000000, 0x00000008, 0x00010000, 0x00000000, 0x00110001, 0x00B600B6, 0x00B60005, 0x00020000, 0x09070000, 0x00080002, 0xFEF60000, 0xFF9D0011, 0x000200B6, 0x00B600B6, 0x00050003, 0x00000000, 0x00000008, 0x00030000, 0x006E0000, 0x00110003, 0x00B600B6, 0x00B60005, 0x00040000, 0x00007FFE, 0x00080004, 0x00000000, 0x00000011, 0x000400B6, 0x00B600B6, 0x00050005, 0x00000000, 0xC0010008, 0x0005004B, 0x00000000, 0x00110005, 0x00B600B6, 0x00B60005, 0x00060000, 0x00000000, 0x00080006, 0x001E0000, 0x00000011, 0x000600B6, 0x00B600B6, 0x00050007, 0x00000000, 0xC0010008, 0x0007001E, 0x00000000, 0x00110007, 0x00B600B6, 0x00B60005, 0x00080000, 0x00007FFE, 0x00080008, 0x004B0000, 0x00000011, 0x000800B6, 0x00B600B6, 0x00050009, 0x00000000, 0xC0010008, 0x0009004B, 0x00000000, 0x00110009, 0x00B600B6, 0x00B60005, 0x000A0000, 0x00000000, 0x0008000A, 0x001E0000, 0x00000011, 0x000A00B6, 0x00B600B6, 0x0005000B, 0x00000000, 0xC0010008, 0x000B001E, 0x00000000, 0x0011000B, 0x00B600B6, 0x00B60005, 0x000C0000, 0x00007FFE, 0x0008000C, 0x004B0000, 0x00000011, 0x000C00B6, 0x00B600B6, 0x0005000D, 0x00000000, 0xC0010008, 0x000D004B, 0x00000000, 0x0011000D, 0x00B600B6, 0x00B60005, 0x000E0000, 0x00000000, 0x0008000E, 0x001E0000, 0x00000011, 0x000E00B6, 0x00B600B6, 0x0005000F, 0x00000000, 0xC0010008, 0x000F001E, 0x00000000, 0x0011000F, 0x00B600B6, 0x00B60005, 0x00100000, 0x00000000, 0x00080010, 0x004B0000, 0x00000011, 0x001000B6, 0x00B600B6, 0x00050011, 0x0000F6F9, 0x00000008, 0x00110138, 0xFEDF009B, 0x00110011, 0x00B600B6, 0x00B60005, 0x00120000, 0xF6F98002, 0x00080012, 0xFF1300E5, 0x009B0011, 0x001200B6, 0x00B600B6, 0x00050013, 0x0000F6F9, 0x00000008, 0x00130138, 0xFF1B009B, 0x00110013, 0x00B600B6, 0x00B60005, 0x00140000, 0xF6F98002, 0x00080014, 0xFF1300A9, 0x009B0011, 0x001400B6, 0x00B600B6, 0x00050015, 0x0000F6F9, 0x00000008, 0x00150138, 0xFF57009B, 0x00110015, 0x00B600B6, 0x00B60005, 0x00160000, 0xF6F98002, 0x00080016, 0xFF13006D, 0x009B0011, 0x001600B6, 0x00B600B6, 0x00050017, 0x00000000, 0x00000008, 0x00170000, 0x006E0000, 0x00110017, 0x00B600B6, 0x00B60005, 0x00180000, 0xF6F90000, 0x00080018, 0x00000000, 0x00000011, 0x001800B6, 0x00B600B6, 0x00050019, 0x00000000, 0x00000008, 0x00190000, 0x00000000, 0x00110019, 0x00B600B6, 0x00B60005, 0x001A0000, 0x00000000, 0x0008001A, 0x0000FFF6, 0x00000011, 0x001A00B6, 0x00B600B6, 0x0005001B, 0x00000000, 0x00000008, 0x001BFF61, 0x0000FF82, 0x0011001B, 0x00B600B6, 0x00B60005, 0x001C0000, 0x00000000, 0x0008001C, 0x00000000, 0x00000011, 0x001C00B6, 0x00B600B6, 0x0005001D, 0x00000000, 0x00000008, 0x001DFF61, 0x0000FF82, 0x0011001D, 0x00B600B6, 0x00B60005, 0x001E0000, 0x00000000, 0x0008001E, 0x00000000, 0x00000011, 0x001E00B6, 0x00B600B6, 0x0005001F, 0x00000000, 0x00000008, 0x001FFF61, 0x0000FF82, 0x0011001F, 0x00B600B6, 0x00B60005, 0x00200000, 0x00000000, 0x00080020, 0x00000000, 0x00000011, 0x002000B6, 0x00B600B6, 0x00050021, 0x00008001, 0x00000008, 0x0021008C, 0xFFF6FE98, 0x00110021, 0x00B600B6, 0x00B60005, 0x00220000, 0x00000000, 0x00080022, 0xFF610000, 0xFF820011, 0x002200B6, 0x00B600B6, 0x00050023, 0x00000000, 0x00000008, 0x00230000, 0x00000000, 0x00110023, 0x00B600B6, 0x00B60005, 0x00240000, 0x00000000, 0x00080024, 0xFF610000, 0xFF820011, 0x002400B6, 0x00B600B6, 0x00050025, 0x00000000, 0x00000008, 0x00250000, 0x00000000, 0x00110025, 0x00B600B6, 0x00B60005, 0x00260000, 0x00000000, 0x00080026, 0xFF610000, 0xFF820011, 0x002600B6, 0x00B600B6, 0x00050027, 0x00000000, 0x00000008, 0x00270000, 0x00000000, 0x00110027, 0x00B600B6, 0x00B60001, 0x00010005, 0x00040000, 0x00007FFA, 0x00050006, 0x00000000, 0x00100005, 0x00080000, 0x00007FEB, 0x0005000A, 0x00000000, 0x00110005, 0x000C0000, 0x00007FFC, 0x0005000E, 0x00000000, 0x00120001, 0x00010005, 0x00040000, 0x00007FDE, 0x00050006, 0x00000000, 0x00360005, 0x00080000, 0x00007FC4, 0x0005000A, 0x00000000, 0x00380005, 0x000C0000, 0x00007FE4, 0x0005000E, 0x00000000, 0x003A0001, 0x00010005, 0x00040000, 0x00007FA5, 0x00050006, 0x00000000, 0x00760005, 0x00080000, 0x00007F82, 0x0005000A, 0x00000000, 0x00790005, 0x000C0000, 0x00007FAF, 0x0005000E, 0x00000000, 0x007B0001, 0x00010005, 0x00040000, 0x00007F4E, 0x00050006, 0x00000000, 0x00D60005, 0x00080000, 0x00007F20, 0x0005000A, 0x00000000, 0x00DA0005, 0x000C0000, 0x00007F58, 0x0005000E, 0x00000000, 0x00DD0001, 0x00010005, 0x00040000, 0x00007ED6, 0x00050006, 0x00000000, 0x015C0005, 0x00080000, 0x00007E99, 0x0005000A, 0x00000000, 0x01610005, 0x000C0000, 0x00007ED9, 0x0005000E, 0x00000000, 0x01640001, 0x00010005, 0x00040000, 0x00007E3A, 0x00050006, 0x00000000, 0x020E0005, 0x00080000, 0x00007DE6, 0x0005000A, 0x00000000, 0x02130005, 0x000C0000, 0x00007E2D, 0x0005000E, 0x00000000, 0x02170001, 0x00010005, 0x00040000, 0x00007D77, 0x00050006, 0x00000000, 0x02F10005, 0x00080000, 0x00007D02, 0x0005000A, 0x00000000, 0x02F70005, 0x000C0000, 0x00007D4E, 0x0005000E, 0x00000000, 0x02FB0001, 0x00010005, 0x00040000, 0x00007C8C, 0x00050006, 0x00000000, 0x040C0005, 0x00080000, 0x00007BE7, 0x0005000A, 0x00000000, 0x04120005, 0x000C0000, 0x00007C36, 0x0005000E, 0x00000000, 0x04160001, 0x00010005, 0x00040000, 0x00007B75, 0x00050006, 0x00000000, 0x05630005, 0x00080000, 0x00007A8F, 0x0005000A, 0x00000000, 0x05690005, 0x000C0000, 0x00007AE1, 0x0005000E, 0x00000000, 0x056D0001, 0x00010005, 0x00040000, 0x00007A2F, 0x00050006, 0x00000000, 0x06FD0005, 0x00080000, 0x000078F5, 0x0005000A, 0x00000000, 0x07030005, 0x000C0000, 0x00007948, 0x0005000E, 0x00000000, 0x07070001, 0x00010005, 0x00040000, 0x000078B9, 0x00050006, 0x00000000, 0x08DF0005, 0x00080000, 0x00007713, 0x0005000A, 0x00000000, 0x08E50005, 0x000C0000, 0x00007765, 0x0005000E, 0x00000000, 0x08E90001, 0x00010005, 0x00040000, 0x0000770E, 0x00050006, 0x00000000, 0x0B0F0005, 0x00080000, 0x000074E4, 0x0005000A, 0x00000000, 0x0B150005, 0x000C0000, 0x00007533, 0x0005000E, 0x00000000, 0x0B190001, 0x00010005, 0x00040000, 0x0000752D, 0x00050006, 0x00000000, 0x0D930005, 0x00080000, 0x00007260, 0x0005000A, 0x00000000, 0x0D980005, 0x000C0000, 0x000072AD, 0x0005000E, 0x00000000, 0x0D9D0001, 0x00010005, 0x00040000, 0x00007314, 0x00050006, 0x00000000, 0x10700005, 0x00080000, 0x00006F84, 0x0005000A, 0x00000000, 0x10750005, 0x000C0000, 0x00006FCD, 0x0005000E, 0x00000000, 0x10790001, 0x00010005, 0x00040000, 0x000070BE, 0x00050006, 0x00000000, 0x13AC0005, 0x00080000, 0x00006C48, 0x0005000A, 0x00000000, 0x13B10005, 0x000C0000, 0x00006C8D, 0x0005000E, 0x00000000, 0x13B50001, 0x00010005, 0x00040000, 0x00006E2A, 0x00050006, 0x00000000, 0x174D0005, 0x00080000, 0x000068A7, 0x0005000A, 0x00000000, 0x17520005, 0x000C0000, 0x000068E8, 0x0005000E, 0x00000000, 0x17560001, 0x00010005, 0x00040000, 0x00006B55, 0x00050006, 0x00000000, 0x1B590005, 0x00080000, 0x0000649C, 0x0005000A, 0x00000000, 0x1B5E0005, 0x000C0000, 0x000064D7, 0x0005000E, 0x00000000, 0x1B610001, 0x00010005, 0x00040000, 0x0000683D, 0x00050006, 0x00000000, 0x1FD50005, 0x00080000, 0x00006021, 0x0005000A, 0x00000000, 0x1FD90005, 0x000C0000, 0x00006056, 0x0005000E, 0x00000000, 0x1FDC0001, 0x00010005, 0x00040000, 0x000064DE, 0x00050006, 0x00000000, 0x24C70005, 0x00080000, 0x00005B30, 0x0005000A, 0x00000000, 0x24CB0005, 0x000C0000, 0x00005B5F, 0x0005000E, 0x00000000, 0x24CD0001, 0x00010005, 0x00040000, 0x00006136, 0x00050006, 0x00000000, 0x2A350005, 0x00080000, 0x000055C3, 0x0005000A, 0x00000000, 0x2A380005, 0x000C0000, 0x000055EC, 0x0005000E, 0x00000000, 0x2A3A0001, 0x00010005, 0x00040000, 0x00005D42, 0x00050006, 0x00000000, 0x30240005, 0x00080000, 0x00004FD5, 0x0005000A, 0x00000000, 0x30270005, 0x000C0000, 0x00004FF8, 0x0005000E, 0x00000000, 0x30290001, 0x00010005, 0x00040000, 0x00005900, 0x00050006, 0x00000000, 0x369B0005, 0x00080000, 0x0000495F, 0x0005000A, 0x00000000, 0x369D0005, 0x000C0000, 0x0000497C, 0x0005000E, 0x00000000, 0x369F0001, 0x00010005, 0x00040000, 0x0000546D, 0x00050006, 0x00000000, 0x3D9E0005, 0x00080000, 0x0000425D, 0x0005000A, 0x00000000, 0x3DA00005, 0x000C0000, 0x00004274, 0x0005000E, 0x00000000, 0x3DA10001, 0x00010005, 0x00040000, 0x00004F86, 0x00050006, 0x00000000, 0x45340005, 0x00080000, 0x00003AC7, 0x0005000A, 0x00000000, 0x45350005, 0x000C0000, 0x00003AD9, 0x0005000E, 0x00000000, 0x45360001, 0x00010005, 0x00040000, 0x00004A49, 0x00050006, 0x00000000, 0x4D620005, 0x00080000, 0x0000329A, 0x0005000A, 0x00000000, 0x4D630005, 0x000C0000, 0x000032A7, 0x0005000E, 0x00000000, 0x4D640001, 0x00010008, 0x00030003, 0x00800000, 0x00050004, 0x00000000, 0x44B20005, 0x00060000, 0x0000562F, 0x00050008, 0x00000000, 0x29CE0005, 0x000A0000, 0x0000562F, 0x0005000C, 0x00000000, 0x29D70005, 0x000E0000, 0x00005630, 0x00080017, 0x00030080, 0x00000001, 0x00010008, 0x00030006, 0x00910000, 0x00050004, 0x00000000, 0x3EC00005, 0x00060000, 0x00005F9F, 0x00050008, 0x00000000, 0x205F0005, 0x000A0000, 0x00005F9F, 0x0005000C, 0x00000000, 0x20640005, 0x000E0000, 0x00005F9F, 0x00080017, 0x00060091, 0x00000001, 0x00010008, 0x0003000A, 0x009F0000, 0x00050004, 0x00000000, 0x38700005, 0x00060000, 0x000069B8, 0x00050008, 0x00000000, 0x16450005, 0x000A0000, 0x000069B8, 0x0005000C, 0x00000000, 0x16480005, 0x000E0000, 0x000069B8, 0x00080017, 0x000A009F, 0x00000001, 0x00010008, 0x0003000D, 0x00AA0000, 0x00050004, 0x00000000, 0x31BF0005, 0x00060000, 0x00007481, 0x00050008, 0x00000000, 0x0B7D0005, 0x000A0000, 0x00007481, 0x0005000C, 0x00000000, 0x0B7E0005, 0x000E0000, 0x00007481, 0x00080017, 0x000D00AA, 0x00000001, 0x00010008, 0x00030011, 0x00B40000, 0x00050004, 0x00000000, 0x2AAA0005, 0x00060000, 0x00008001, 0x00050008, 0x00000000, 0x00000005, 0x000A0000, 0x00008001, 0x0005000C, 0x00000000, 0x00000005, 0x000E0000, 0x00008001, 0x00080017, 0x001100B4, 0x00000001, 0x00010008, 0x00030014, 0x00BB0000, 0x00050004, 0x00000000, 0x29890008, 0x00170014, 0x00BB0000, 0x00010001, 0x00080003, 0x001800C1, 0x00000005, 0x00040000, 0x0000286B, 0x00080017, 0x001800C1, 0x00000001, 0x00010008, 0x0003001B, 0x00C50000, 0x00050004, 0x00000000, 0x27510008, 0x0017001B, 0x00C50000, 0x00010001, 0x00080003, 0x001E00C7, 0x00000005, 0x00040000, 0x00002639, 0x00080017, 0x001E00C7, 0x00000001, 0x00010008, 0x00030022, 0x00C80000, 0x00050004, 0x00000000, 0x25250008, 0x00170022, 0x00C80000, 0x00010001, 0x00080003, 0x002500C8, 0x00000005, 0x00040000, 0x00002414, 0x00080017, 0x002500C8, 0x00000001, 0x00010008, 0x00030029, 0x00C80000, 0x00050004, 0x00000000, 0x23070008, 0x00170029, 0x00C80000, 0x00010001, 0x00080003, 0x002C00C8, 0x00000005, 0x00040000, 0x000021FC, 0x00080017, 0x002C00C8, 0x00000001, 0x00010008, 0x00030030, 0x00C80000, 0x00050004, 0x00000000, 0x20F50008, 0x00170030, 0x00C80000, 0x00010001, 0x00080003, 0x003300C8, 0x00000005, 0x00040000, 0x00001FF1, 0x00080017, 0x003300C8, 0x00000001, 0x00010008, 0x00030036, 0x00C70000, 0x00050004, 0x00000000, 0x1EF10008, 0x00170036, 0x00C70000, 0x00010001, 0x00080003, 0x003A00C5, 0x00000005, 0x00040000, 0x00001DF3, 0x00080017, 0x003A00C5, 0x00000001, 0x00010008, 0x0003003D, 0x00C30000, 0x00050004, 0x00000000, 0x1CF90008, 0x0017003D, 0x00C30000, 0x00010001, 0x00080003, 0x004100BF, 0x00000005, 0x00040000, 0x00001C02, 0x00080017, 0x004100BF, 0x00000001, 0x00010008, 0x00030044, 0x00BA0000, 0x00050004, 0x00000000, 0x1B0D0008, 0x00170044, 0x00BA0000, 0x00010001, 0x00080003, 0x004800B4, 0x00000005, 0x00040000, 0x00001A1D, 0x00080017, 0x004800B4, 0x00000001, 0x00010008, 0x0003004B, 0x00AD0000, 0x00050004, 0x00000000, 0x192F0008, 0x0017004B, 0x00AD0000, 0x00010001, 0x00080003, 0x004E00A5, 0x00000005, 0x00040000, 0x00001844, 0x00080017, 0x004E00A5, 0x00000001, 0x00010008, 0x00030052, 0x009C0000, 0x00050004, 0x00000000, 0x175D0008, 0x00170052, 0x009C0000, 0x00010001, 0x00080003, 0x00550092, 0x00000005, 0x00040000, 0x00001679, 0x00080017, 0x00550092, 0x00000001, 0x00010008, 0x00030059, 0x00880000, 0x00050004, 0x00000000, 0x15970008, 0x00170059, 0x00880000, 0x00010001, 0x00080003, 0x005C007C, 0x00000005, 0x00040000, 0x000014B9, 0x00080017, 0x005C007C, 0x00000001, 0x00010008, 0x0003005F, 0x006F0000, 0x00050004, 0x00000000, 0x13DE0008, 0x0017005F, 0x006F0000, 0x00010001, 0x00080003, 0x00630062, 0x00000005, 0x00040000, 0x00001307, 0x00080017, 0x00630062, 0x00000001, 0x00010008, 0x00030066, 0x00540000, 0x00050004, 0x00000000, 0x12320008, 0x00170066, 0x00540000, 0x00010001, 0x00080003, 0x006A0044, 0x00000005, 0x00040000, 0x00001160, 0x00080017, 0x006A0044, 0x00000001, 0x00010008, 0x0003006D, 0x00340000, 0x00050004, 0x00000000, 0x10920008, 0x0017006D, 0x00340000, 0x00010001, 0x00080003, 0x00710024, 0x00000005, 0x00040000, 0x00000FC6, 0x00080017, 0x00710024, 0x00000001, 0x00010008, 0x00030074, 0x00120000, 0x00050004, 0x00000000, 0x0EFE0008, 0x00170074, 0x00120000, 0x00010001, 0x00080003, 0x00780000, 0x00000005, 0x00040000, 0x00000E38, 0x00080017, 0x00780000, 0x00000008, 0x001BFF6B, 0x0000FF82, 0x00010001, 0x00050004, 0x00000000, 0x096C0008, 0x001BFF6C, 0x0000FF82, 0x00010001, 0x00050004, 0x00000000, 0x04A60008, 0x001BFF6F, 0xFFFFFF82, 0x00010001, 0x00050004, 0x00000000, 0x00000008, 0x001BFF73, 0xFFFDFF82, 0x00010001, 0x00080003, 0x0078000A, 0x00000005, 0x00040000, 0x000000EF, 0x00080017, 0x0078000A, 0x00000008, 0x001BFF77, 0xFFFBFF82, 0x00010001, 0x00080003, 0x00780011, 0x00000005, 0x00040000, 0x0000018D, 0x00080017, 0x00780011, 0x00000008, 0x001BFF7B, 0xFFF7FF82, 0x00010001, 0x00080003, 0x00780014, 0x00000005, 0x00040000, 0x000001C7, 0x00080017, 0x00780014, 0x00000008, 0x001BFF7D, 0xFFF3FF82, 0x00010001, 0x00080003, 0x00780011, 0x00000005, 0x00040000, 0x000001B3, 0x00080017, 0x00780011, 0x00000008, 0x001BFF7E, 0xFFEEFF82, 0x00010001, 0x00080003, 0x0078000A, 0x00000005, 0x00040000, 0x0000016E, 0x00080017, 0x0078000A, 0x00000008, 0x001BFF7E, 0xFFE9FF82, 0x00010001, 0x00080003, 0x00780000, 0x00000005, 0x00040000, 0x000000E2, 0x00080017, 0x00780000, 0x00000008, 0x001BFF7D, 0xFFE3FF82, 0x00010001, 0x00080003, 0x00780003, 0x00000005, 0x00040000, 0x00000000, 0x00080017, 0x00780003, 0x00000008, 0x001BFF7B, 0xFFDCFF82, 0x00010001, 0x00080003, 0x00780005, 0x00000005, 0x00040000, 0x00000079, 0x00080017, 0x00780005, 0x00000008, 0x001BFF78, 0xFFD5FF82, 0x00010001, 0x00080003, 0x00780004, 0x00000005, 0x00040000, 0x000000B6, 0x00080017, 0x00780004, 0x00000008, 0x001BFF75, 0xFFCDFF82, 0x00010001, 0x00080003, 0x00780000, 0x00000005, 0x00040000, 0x0000007B, 0x00080017, 0x00780000, 0x00000008, 0x001BFF72, 0xFFC4FF82, 0x00010001, 0x00050004, 0x00000000, 0x00000008, 0x001BFF6F, 0xFFBAFF82, 0x00010001, 0x0008001B, 0xFF6BFFB0, 0xFF820008, 0x001DFF6B, 0x0000FF82, 0x00010001, 0x0008001B, 0xFF6CFFA6, 0xFF820001, 0x00010008, 0x001BFF6D, 0xFF9BFF82, 0x0008001D, 0xFF6CFFFF, 0xFF820001, 0x00010008, 0x001BFF6E, 0xFF8FFF82, 0x0008001D, 0xFF6CFFFD, 0xFF820001, 0x00010008, 0x001BFF6E, 0xFF82FF82, 0x0008001D, 0xFF6DFFFB, 0xFF820001, 0x00010008, 0x001BFF6F, 0xFF75FF82, 0x0008001D, 0xFF6DFFF7, 0xFF820008, 0x001FFF6B, 0x0000FF82, 0x00080022, 0xFF6B0000, 0xFF820001, 0x00010008, 0x001BFF6F, 0xFF68FF82, 0x0008001D, 0xFF6EFFF3, 0xFF820008, 0x001FFF6C, 0x0000FF82, 0x00080022, 0xFF6C0000, 0xFF820001, 0x00010008, 0x001BFF6F, 0xFF59FF82, 0x0008001D, 0xFF6FFFEE, 0xFF820008, 0x001FFF6F, 0xFFFFFF82, 0x00080022, 0xFF6FFFFF, 0xFF820001, 0x00010008, 0x001BFF6F, 0xFF4BFF82, 0x0008001D, 0xFF70FFE9, 0xFF820008, 0x001FFF73, 0xFFFDFF82, 0x00080022, 0xFF73FFFD, 0xFF820001, 0x00010008, 0x001BFF6F, 0xFF3BFF82, 0x0008001D, 0xFF71FFE3, 0xFF820008, 0x001FFF77, 0xFFFBFF82, 0x00080022, 0xFF77FFFB, 0xFF820001, 0x00010008, 0x001BFF6E, 0xFF2BFF82, 0x0008001D, 0xFF72FFDC, 0xFF820008, 0x001FFF7B, 0xFFF7FF82, 0x00080022, 0xFF7BFFF7, 0xFF820001, 0x00010008, 0x001BFF6D, 0xFF1BFF82, 0x0008001D, 0xFF73FFD5, 0xFF820008, 0x001FFF7E, 0xFFF3FF82, 0x00080022, 0xFF7DFFF3, 0xFF820001, 0x00010008, 0x001BFF6D, 0xFF0AFF82, 0x0008001D, 0xFF75FFCD, 0xFF820008, 0x001FFF7E, 0xFFEEFF82, 0x00080022, 0xFF7EFFEE, 0xFF820001, 0x00010008, 0x001BFF6C, 0xFEF9FF82, 0x0008001D, 0xFF76FFC4, 0xFF820008, 0x001FFF7E, 0xFFE9FF82, 0x00080022, 0xFF7EFFE9, 0xFF820001, 0x00010008, 0x001BFF6C, 0xFEE7FF82, 0x0008001D, 0xFF77FFBA, 0xFF820008, 0x001FFF7D, 0xFFE3FF82, 0x00080022, 0xFF7DFFE3, 0xFF820001, 0x00010008, 0x001BFF6B, 0xFED4FF82, 0x0008001D, 0xFF79FFB0, 0xFF820008, 0x001FFF7C, 0xFFDCFF82, 0x00080022, 0xFF7BFFDC, 0xFF820001, 0x00010008, 0x001DFF7A, 0xFFA6FF82, 0x0008001F, 0xFF7BFFD5, 0xFF820008, 0x0022FF78, 0xFFD5FF82, 0x00010001, 0x0008001D, 0xFF7BFF9B, 0xFF820008, 0x001FFF79, 0xFFCDFF82, 0x00080022, 0xFF75FFCD, 0xFF820001, 0x00010008, 0x001DFF7D, 0xFF8FFF82, 0x0008001F, 0xFF78FFC4, 0xFF820008, 0x0022FF72, 0xFFC4FF82, 0x00010001, 0x0008001D, 0xFF7EFF82, 0xFF820008, 0x001FFF76, 0xFFBAFF82, 0x00080022, 0xFF6FFFBA, 0xFF820001, 0x00010008, 0x001DFF7F, 0xFF75FF82, 0x0008001F, 0xFF74FFB0, 0xFF820008, 0x0022FF6B, 0xFFB0FF82, 0x00080026, 0xFF6B0000, 0xFF820001, 0x00010008, 0x001DFF80, 0xFF68FF82, 0x0008001F, 0xFF72FFA6, 0xFF820008, 0x0022FF6C, 0xFFA6FF82, 0x00080026, 0xFF6C0000, 0xFF820001, 0x00010008, 0x001DFF81, 0xFF59FF82, 0x0008001F, 0xFF70FF9B, 0xFF820008, 0x0022FF6D, 0xFF9BFF82, 0x00080026, 0xFF6FFFFF, 0xFF820001, 0x00010008, 0x001DFF82, 0xFF4BFF82, 0x0008001F, 0xFF6EFF8F, 0xFF820008, 0x0022FF6E, 0xFF8FFF82, 0x00080026, 0xFF73FFFD, 0xFF820001, 0x00010008, 0x001DFF83, 0xFF3BFF82, 0x0008001F, 0xFF6CFF82, 0xFF820008, 0x0022FF6E, 0xFF82FF82, 0x00080026, 0xFF77FFFB, 0xFF820001, 0x00010008, 0x001DFF84, 0xFF2BFF82, 0x0008001F, 0xFF6AFF75, 0xFF820008, 0x0022FF6F, 0xFF75FF82, 0x00080026, 0xFF7BFFF7, 0xFF820001, 0x00010008, 0x001DFF85, 0xFF1BFF82, 0x0008001F, 0xFF68FF68, 0xFF820008, 0x0022FF6F, 0xFF68FF82, 0x00080026, 0xFF7EFFF3, 0xFF820001, 0x00010008, 0x001DFF85, 0xFF0AFF82, 0x0008001F, 0xFF66FF59, 0xFF820008, 0x0022FF6F, 0xFF59FF82, 0x00080026, 0xFF7EFFEE, 0xFF820001, 0x00010008, 0x001DFF86, 0xFEF9FF82, 0x0008001F, 0xFF65FF4B, 0xFF820008, 0x0022FF6F, 0xFF4BFF82, 0x00080026, 0xFF7EFFE9, 0xFF820001, 0x00010008, 0x001DFF86, 0xFEE7FF82, 0x0008001F, 0xFF63FF3B, 0xFF820008, 0x0022FF6F, 0xFF3BFF82, 0x00080026, 0xFF7DFFE3, 0xFF820001, 0x00010008, 0x001DFF86, 0xFED4FF82, 0x0008001F, 0xFF62FF2B, 0xFF820008, 0x0022FF6E, 0xFF2BFF82, 0x00080026, 0xFF7CFFDC, 0xFF820001, 0x00010008, 0x001FFF60, 0xFF1BFF82, 0x00080022, 0xFF6DFF1B, 0xFF820008, 0x0026FF7B, 0xFFD5FF82, 0x00010001, 0x0008001F, 0xFF5FFF0A, 0xFF820008, 0x0022FF6D, 0xFF0AFF82, 0x00080026, 0xFF79FFCD, 0xFF820001, 0x00010008, 0x001FFF5F, 0xFEF9FF82, 0x00080022, 0xFF6CFEF9, 0xFF820008, 0x0026FF78, 0xFFC4FF82, 0x00010001, 0x0008001F, 0xFF5EFEE7, 0xFF820008, 0x0022FF6C, 0xFEE7FF82, 0x00080026, 0xFF76FFBA, 0xFF820001, 0x00010008, 0x001FFF5E, 0xFED4FF82, 0x00080022, 0xFF6BFED4, 0xFF820008, 0x0024FF6B, 0x0000FF82, 0x00080026, 0xFF74FFB0, 0xFF820001, 0x00010008, 0x0026FF72, 0xFFA6FF82, 0x00010001, 0x00080024, 0xFF6CFFFF, 0xFF820008, 0x0026FF70, 0xFF9BFF82, 0x00010001, 0x00080024, 0xFF6CFFFD, 0xFF820008, 0x0026FF6E, 0xFF8FFF82, 0x00010001, 0x00080024, 0xFF6DFFFB, 0xFF820008, 0x0026FF6C, 0xFF82FF82, 0x00010001, 0x00080024, 0xFF6DFFF7, 0xFF820008, 0x0026FF6A, 0xFF75FF82, 0x00010001, 0x00080024, 0xFF6EFFF3, 0xFF820008, 0x0026FF68, 0xFF68FF82, 0x00010001, 0x00080024, 0xFF6FFFEE, 0xFF820008, 0x0026FF66, 0xFF59FF82, 0x00010001, 0x00080024, 0xFF70FFE9, 0xFF820008, 0x0026FF65, 0xFF4BFF82, 0x00010001, 0x00080024, 0xFF71FFE3, 0xFF820008, 0x0026FF63, 0xFF3BFF82, 0x00010001, 0x00080024, 0xFF72FFDC, 0xFF820008, 0x0026FF62, 0xFF2BFF82, 0x00010001, 0x00080024, 0xFF73FFD5, 0xFF820008, 0x0026FF60, 0xFF1BFF82, 0x00010001, 0x00080024, 0xFF75FFCD, 0xFF820008, 0x0026FF5F, 0xFF0AFF82, 0x00010001, 0x00080024, 0xFF76FFC4, 0xFF820008, 0x0026FF5F, 0xFEF9FF82, 0x00010001, 0x00080024, 0xFF77FFBA, 0xFF820008, 0x0026FF5E, 0xFEE7FF82, 0x00010001, 0x00080024, 0xFF79FFB0, 0xFF820008, 0x0026FF5E, 0xFED4FF82, 0x00010001, 0x00080024, 0xFF7AFFA6, 0xFF820001, 0x00010008, 0x0024FF7B, 0xFF9BFF82, 0x00010001, 0x00080024, 0xFF7DFF8F, 0xFF820001, 0x00010008, 0x0024FF7E, 0xFF82FF82, 0x00010001, 0x00080024, 0xFF7FFF75, 0xFF820001, 0x00010008, 0x0024FF80, 0xFF68FF82, 0x00010001, 0x00080024, 0xFF81FF59, 0xFF820001, 0x00010008, 0x0024FF82, 0xFF4BFF82, 0x00010001, 0x00080024, 0xFF83FF3B, 0xFF820001, 0x00010008, 0x0024FF84, 0xFF2BFF82, 0x00010001, 0x00080024, 0xFF85FF1B, 0xFF820001, 0x00010008, 0x0024FF85, 0xFF0AFF82, 0x00010001, 0x00080024, 0xFF86FEF9, 0xFF820001, 0x00010008, 0x0024FF86, 0xFEE7FF82, 0x00010001, 0x000A0008, 0x0024FF86, 0xFED4FF82, 0x00010001, 0x00030000 diff --git a/ver/us/asm/nonmatchings/169BE0/filemenu_draw_char.s b/ver/us/asm/nonmatchings/169BE0/filemenu_draw_char.s index b8cb32e74d..9af9b654da 100644 --- a/ver/us/asm/nonmatchings/169BE0/filemenu_draw_char.s +++ b/ver/us/asm/nonmatchings/169BE0/filemenu_draw_char.s @@ -31,9 +31,9 @@ glabel filemenu_draw_char /* 169C44 802493E4 00031880 */ sll $v1, $v1, 2 /* 169C48 802493E8 00041040 */ sll $v0, $a0, 1 /* 169C4C 802493EC 00441021 */ addu $v0, $v0, $a0 -/* 169C50 802493F0 3C01802F */ lui $at, %hi(D_802EB5A8) +/* 169C50 802493F0 3C01802F */ lui $at, %hi(gMsgCharsets) /* 169C54 802493F4 00230821 */ addu $at, $at, $v1 -/* 169C58 802493F8 8C23B5A8 */ lw $v1, %lo(D_802EB5A8)($at) +/* 169C58 802493F8 8C23B5A8 */ lw $v1, %lo(gMsgCharsets)($at) /* 169C5C 802493FC 00021080 */ sll $v0, $v0, 2 /* 169C60 80249400 8C640008 */ lw $a0, 8($v1) /* 169C64 80249404 90720000 */ lbu $s2, ($v1) diff --git a/ver/us/asm/nonmatchings/msg/appendGfx_message.s b/ver/us/asm/nonmatchings/msg/appendGfx_message.s index d8682e2737..fb7b2ef0ed 100644 --- a/ver/us/asm/nonmatchings/msg/appendGfx_message.s +++ b/ver/us/asm/nonmatchings/msg/appendGfx_message.s @@ -100,8 +100,8 @@ glabel appendGfx_message /* BE494 80127D94 AFBE0108 */ sw $fp, 0x108($sp) /* BE498 80127D98 0080F02D */ daddu $fp, $a0, $zero /* BE49C 80127D9C AFB000E8 */ sw $s0, 0xe8($sp) -/* BE4A0 80127DA0 3C108015 */ lui $s0, %hi(D_80155D74) -/* BE4A4 80127DA4 26105D74 */ addiu $s0, $s0, %lo(D_80155D74) +/* BE4A0 80127DA0 3C108015 */ lui $s0, %hi(gMessageDrawStatePtr) +/* BE4A4 80127DA4 26105D74 */ addiu $s0, $s0, %lo(gMessageDrawStatePtr) /* BE4A8 80127DA8 AFB100EC */ sw $s1, 0xec($sp) /* BE4AC 80127DAC 8FB10154 */ lw $s1, 0x154($sp) /* BE4B0 80127DB0 97B80152 */ lhu $t8, 0x152($sp) @@ -213,16 +213,16 @@ glabel appendGfx_message /* BE648 80127F48 37180400 */ ori $t8, $t8, 0x400 /* BE64C 80127F4C AFB900C4 */ sw $t9, 0xc4($sp) /* BE650 80127F50 3C190701 */ lui $t9, 0x701 -/* BE654 80127F54 3C028015 */ lui $v0, %hi(D_80155D74) -/* BE658 80127F58 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* BE654 80127F54 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* BE658 80127F58 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* BE65C 80127F5C 37390050 */ ori $t9, $t9, 0x50 /* BE660 80127F60 A7A00080 */ sh $zero, 0x80($sp) /* BE664 80127F64 AFB800C8 */ sw $t8, 0xc8($sp) /* BE668 80127F68 AFB900CC */ sw $t9, 0xcc($sp) /* BE66C 80127F6C AC400020 */ sw $zero, 0x20($v0) .L80127F70: -/* BE670 80127F70 3C038015 */ lui $v1, %hi(D_80155D74) -/* BE674 80127F74 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) +/* BE670 80127F70 3C038015 */ lui $v1, %hi(gMessageDrawStatePtr) +/* BE674 80127F74 8C635D74 */ lw $v1, %lo(gMessageDrawStatePtr)($v1) /* BE678 80127F78 8C62004C */ lw $v0, 0x4c($v1) /* BE67C 80127F7C 8C630020 */ lw $v1, 0x20($v1) /* BE680 80127F80 00431021 */ addu $v0, $v0, $v1 @@ -237,14 +237,14 @@ glabel appendGfx_message /* BE6A4 80127FA4 00400008 */ jr $v0 /* BE6A8 80127FA8 00000000 */ nop glabel L80127FAC_BE6AC -/* BE6AC 80127FAC 3C048015 */ lui $a0, %hi(D_80155D74) -/* BE6B0 80127FB0 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) +/* BE6AC 80127FAC 3C048015 */ lui $a0, %hi(gMessageDrawStatePtr) +/* BE6B0 80127FB0 8C845D74 */ lw $a0, %lo(gMessageDrawStatePtr)($a0) /* BE6B4 80127FB4 9482003C */ lhu $v0, 0x3c($a0) /* BE6B8 80127FB8 A4800042 */ sh $zero, 0x42($a0) /* BE6BC 80127FBC 00021080 */ sll $v0, $v0, 2 -/* BE6C0 80127FC0 3C01802F */ lui $at, %hi(D_802EB5A8) +/* BE6C0 80127FC0 3C01802F */ lui $at, %hi(gMsgCharsets) /* BE6C4 80127FC4 00220821 */ addu $at, $at, $v0 -/* BE6C8 80127FC8 8C22B5A8 */ lw $v0, %lo(D_802EB5A8)($at) +/* BE6C8 80127FC8 8C22B5A8 */ lw $v0, %lo(gMsgCharsets)($at) /* BE6CC 80127FCC 90420003 */ lbu $v0, 3($v0) /* BE6D0 80127FD0 C4820014 */ lwc1 $f2, 0x14($a0) /* BE6D4 80127FD4 44820000 */ mtc1 $v0, $f0 @@ -274,8 +274,8 @@ glabel L80127FAC_BE6AC /* BE734 80128034 0804A9B1 */ j L8012A6C4_C0DC4 /* BE738 80128038 A4820034 */ sh $v0, 0x34($a0) glabel L8012803C_BE73C -/* BE73C 8012803C 3C048015 */ lui $a0, %hi(D_80155D74) -/* BE740 80128040 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) +/* BE73C 8012803C 3C048015 */ lui $a0, %hi(gMessageDrawStatePtr) +/* BE740 80128040 8C845D74 */ lw $a0, %lo(gMessageDrawStatePtr)($a0) /* BE744 80128044 8C83004C */ lw $v1, 0x4c($a0) /* BE748 80128048 8C820020 */ lw $v0, 0x20($a0) /* BE74C 8012804C 00621821 */ addu $v1, $v1, $v0 @@ -286,8 +286,8 @@ glabel L8012803C_BE73C /* BE760 80128060 0804AFDC */ j L8012BF70_C2670 /* BE764 80128064 A483003E */ sh $v1, 0x3e($a0) glabel L80128068_BE768 -/* BE768 80128068 3C078015 */ lui $a3, %hi(D_80155D74) -/* BE76C 8012806C 8CE75D74 */ lw $a3, %lo(D_80155D74)($a3) +/* BE768 80128068 3C078015 */ lui $a3, %hi(gMessageDrawStatePtr) +/* BE76C 8012806C 8CE75D74 */ lw $a3, %lo(gMessageDrawStatePtr)($a3) /* BE770 80128070 8CE2004C */ lw $v0, 0x4c($a3) /* BE774 80128074 8CE30020 */ lw $v1, 0x20($a3) /* BE778 80128078 94E5003C */ lhu $a1, 0x3c($a3) @@ -301,8 +301,8 @@ glabel L80128068_BE768 /* BE798 80128098 0804AFD2 */ j .L8012BF48 /* BE79C 8012809C 8CE70010 */ lw $a3, 0x10($a3) glabel L801280A0_BE7A0 -/* BE7A0 801280A0 3C038015 */ lui $v1, %hi(D_80155D74) -/* BE7A4 801280A4 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) +/* BE7A0 801280A0 3C038015 */ lui $v1, %hi(gMessageDrawStatePtr) +/* BE7A4 801280A4 8C635D74 */ lw $v1, %lo(gMessageDrawStatePtr)($v1) /* BE7A8 801280A8 8C620020 */ lw $v0, 0x20($v1) /* BE7AC 801280AC 8C63004C */ lw $v1, 0x4c($v1) /* BE7B0 801280B0 00431021 */ addu $v0, $v0, $v1 @@ -341,8 +341,8 @@ glabel L801280DC_BE7DC /* BE82C 8012812C 462C0002 */ mul.d $f0, $f0, $f12 /* BE830 80128130 00000000 */ nop /* BE834 80128134 97D50510 */ lhu $s5, 0x510($fp) -/* BE838 80128138 3C058015 */ lui $a1, %hi(D_80155D74) -/* BE83C 8012813C 8CA55D74 */ lw $a1, %lo(D_80155D74)($a1) +/* BE838 80128138 3C058015 */ lui $a1, %hi(gMessageDrawStatePtr) +/* BE83C 8012813C 8CA55D74 */ lw $a1, %lo(gMessageDrawStatePtr)($a1) /* BE840 80128140 87C3045A */ lh $v1, 0x45a($fp) /* BE844 80128144 97C20516 */ lhu $v0, 0x516($fp) /* BE848 80128148 87C4045C */ lh $a0, 0x45c($fp) @@ -430,8 +430,8 @@ glabel L801280DC_BE7DC /* BE97C 8012827C 0804A0A7 */ j .L8012829C /* BE980 80128280 A4A20048 */ sh $v0, 0x48($a1) .L80128284: -/* BE984 80128284 3C028015 */ lui $v0, %hi(D_80155D74) -/* BE988 80128288 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* BE984 80128284 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* BE988 80128288 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* BE98C 8012828C 2403001A */ addiu $v1, $zero, 0x1a /* BE990 80128290 A4430046 */ sh $v1, 0x46($v0) /* BE994 80128294 24030006 */ addiu $v1, $zero, 6 @@ -508,8 +508,8 @@ glabel L801280DC_BE7DC /* BEA88 80128388 2C420002 */ sltiu $v0, $v0, 2 /* BEA8C 8012838C 10400004 */ beqz $v0, .L801283A0 /* BEA90 80128390 24190001 */ addiu $t9, $zero, 1 -/* BEA94 80128394 3C028015 */ lui $v0, %hi(D_80155D74) -/* BEA98 80128398 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* BEA94 80128394 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* BEA98 80128398 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* BEA9C 8012839C A059002B */ sb $t9, 0x2b($v0) .L801283A0: /* BEAA0 801283A0 93C204F8 */ lbu $v0, 0x4f8($fp) @@ -738,8 +738,8 @@ glabel L801280DC_BE7DC /* BEE10 80128710 4600E1A1 */ cvt.d.s $f6, $f28 /* BEE14 80128714 46203182 */ mul.d $f6, $f6, $f0 /* BEE18 80128718 00000000 */ nop -/* BEE1C 8012871C 3C028015 */ lui $v0, %hi(D_80155D74) -/* BEE20 80128720 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* BEE1C 8012871C 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* BEE20 80128720 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* BEE24 80128724 4600E30D */ trunc.w.s $f12, $f28 /* BEE28 80128728 44046000 */ mfc1 $a0, $f12 /* BEE2C 8012872C 00000000 */ nop @@ -877,8 +877,8 @@ glabel L801280DC_BE7DC /* BF02C 8012892C 24190003 */ addiu $t9, $zero, 3 /* BF030 80128930 10590466 */ beq $v0, $t9, .L80129ACC /* BF034 80128934 24020014 */ addiu $v0, $zero, 0x14 -/* BF038 80128938 3C048015 */ lui $a0, %hi(D_80155D74) -/* BF03C 8012893C 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) +/* BF038 80128938 3C048015 */ lui $a0, %hi(gMessageDrawStatePtr) +/* BF03C 8012893C 8C845D74 */ lw $a0, %lo(gMessageDrawStatePtr)($a0) /* BF040 80128940 AC820000 */ sw $v0, ($a0) /* BF044 80128944 87C30458 */ lh $v1, 0x458($fp) /* BF048 80128948 87C5045C */ lh $a1, 0x45c($fp) @@ -898,11 +898,11 @@ glabel L8012897C_BF07C /* BF07C 8012897C 0000A82D */ daddu $s5, $zero, $zero /* BF080 80128980 97D20514 */ lhu $s2, 0x514($fp) /* BF084 80128984 97D30516 */ lhu $s3, 0x516($fp) -/* BF088 80128988 3C028015 */ lui $v0, %hi(D_80155D74) -/* BF08C 8012898C 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* BF088 80128988 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* BF08C 8012898C 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* BF090 80128990 A040002B */ sb $zero, 0x2b($v0) -/* BF094 80128994 3C038015 */ lui $v1, %hi(D_80155D74) -/* BF098 80128998 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) +/* BF094 80128994 3C038015 */ lui $v1, %hi(gMessageDrawStatePtr) +/* BF098 80128998 8C635D74 */ lw $v1, %lo(gMessageDrawStatePtr)($v1) /* BF09C 8012899C 2402000C */ addiu $v0, $zero, 0xc /* BF0A0 801289A0 A4620046 */ sh $v0, 0x46($v1) /* BF0A4 801289A4 24020006 */ addiu $v0, $zero, 6 @@ -1106,8 +1106,8 @@ glabel L8012897C_BF07C /* BF390 80128C90 0200282D */ daddu $a1, $s0, $zero /* BF394 80128C94 0240302D */ daddu $a2, $s2, $zero /* BF398 80128C98 24820002 */ addiu $v0, $a0, 2 -/* BF39C 80128C9C 3C038015 */ lui $v1, %hi(D_80155D74) -/* BF3A0 80128CA0 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) +/* BF39C 80128C9C 3C038015 */ lui $v1, %hi(gMessageDrawStatePtr) +/* BF3A0 80128CA0 8C635D74 */ lw $v1, %lo(gMessageDrawStatePtr)($v1) /* BF3A4 80128CA4 0260382D */ daddu $a3, $s3, $zero /* BF3A8 80128CA8 AC620000 */ sw $v0, ($v1) /* BF3AC 80128CAC 24A20002 */ addiu $v0, $a1, 2 @@ -1129,8 +1129,8 @@ glabel L8012897C_BF07C /* BF3EC 80128CEC AFA30014 */ sw $v1, 0x14($sp) /* BF3F0 80128CF0 0C04B0B8 */ jal msg_reset_gfx_state /* BF3F4 80128CF4 329400FF */ andi $s4, $s4, 0xff -/* BF3F8 80128CF8 3C048015 */ lui $a0, %hi(D_80155D74) -/* BF3FC 80128CFC 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) +/* BF3F8 80128CF8 3C048015 */ lui $a0, %hi(gMessageDrawStatePtr) +/* BF3FC 80128CFC 8C845D74 */ lw $a0, %lo(gMessageDrawStatePtr)($a0) /* BF400 80128D00 A7B400AE */ sh $s4, 0xae($sp) /* BF404 80128D04 8C820020 */ lw $v0, 0x20($a0) /* BF408 80128D08 94830034 */ lhu $v1, 0x34($a0) @@ -1142,8 +1142,8 @@ glabel L8012897C_BF07C /* BF420 80128D20 0804AFDC */ j L8012BF70_C2670 /* BF424 80128D24 A4830034 */ sh $v1, 0x34($a0) glabel L80128D28_BF428 -/* BF428 80128D28 3C058015 */ lui $a1, %hi(D_80155D74) -/* BF42C 80128D2C 8CA55D74 */ lw $a1, %lo(D_80155D74)($a1) +/* BF428 80128D28 3C058015 */ lui $a1, %hi(gMessageDrawStatePtr) +/* BF42C 80128D2C 8CA55D74 */ lw $a1, %lo(gMessageDrawStatePtr)($a1) /* BF430 80128D30 24020010 */ addiu $v0, $zero, 0x10 /* BF434 80128D34 24190003 */ addiu $t9, $zero, 3 /* BF438 80128D38 A4A20046 */ sh $v0, 0x46($a1) @@ -1259,8 +1259,8 @@ glabel L80128D28_BF428 /* BF5E8 80128EE8 97C70516 */ lhu $a3, 0x516($fp) /* BF5EC 80128EEC 24020006 */ addiu $v0, $zero, 6 /* BF5F0 80128EF0 AFA20010 */ sw $v0, 0x10($sp) -/* BF5F4 80128EF4 3C028015 */ lui $v0, %hi(D_80155D74) -/* BF5F8 80128EF8 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* BF5F4 80128EF4 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* BF5F8 80128EF8 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* BF5FC 80128EFC 9043002B */ lbu $v1, 0x2b($v0) /* BF600 80128F00 320200FF */ andi $v0, $s0, 0xff /* BF604 80128F04 AFB10018 */ sw $s1, 0x18($sp) @@ -1270,16 +1270,16 @@ glabel L80128D28_BF428 /* BF614 80128F14 AFA30014 */ sw $v1, 0x14($sp) /* BF618 80128F18 0C04B0B8 */ jal msg_reset_gfx_state /* BF61C 80128F1C 321000FF */ andi $s0, $s0, 0xff -/* BF620 80128F20 3C038015 */ lui $v1, %hi(D_80155D74) -/* BF624 80128F24 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) +/* BF620 80128F20 3C038015 */ lui $v1, %hi(gMessageDrawStatePtr) +/* BF624 80128F24 8C635D74 */ lw $v1, %lo(gMessageDrawStatePtr)($v1) /* BF628 80128F28 8C620020 */ lw $v0, 0x20($v1) /* BF62C 80128F2C 0804AAD4 */ j .L8012AB50 /* BF630 80128F30 A7B000AE */ sh $s0, 0xae($sp) glabel L80128F34_BF634 /* BF634 80128F34 24020012 */ addiu $v0, $zero, 0x12 /* BF638 80128F38 2404001C */ addiu $a0, $zero, 0x1c -/* BF63C 80128F3C 3C038015 */ lui $v1, %hi(D_80155D74) -/* BF640 80128F40 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) +/* BF63C 80128F3C 3C038015 */ lui $v1, %hi(gMessageDrawStatePtr) +/* BF640 80128F40 8C635D74 */ lw $v1, %lo(gMessageDrawStatePtr)($v1) /* BF644 80128F44 A4620046 */ sh $v0, 0x46($v1) /* BF648 80128F48 2402000B */ addiu $v0, $zero, 0xb /* BF64C 80128F4C A4620048 */ sh $v0, 0x48($v1) @@ -1298,8 +1298,8 @@ glabel L80128F34_BF634 /* BF680 80128F80 2739C770 */ addiu $t9, $t9, %lo(D_802EC770) /* BF684 80128F84 3C16802F */ lui $s6, %hi(D_802ECD10) /* BF688 80128F88 26D6CD10 */ addiu $s6, $s6, %lo(D_802ECD10) -/* BF68C 80128F8C 3C038015 */ lui $v1, %hi(D_80155D74) -/* BF690 80128F90 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) +/* BF68C 80128F8C 3C038015 */ lui $v1, %hi(gMessageDrawStatePtr) +/* BF690 80128F90 8C635D74 */ lw $v1, %lo(gMessageDrawStatePtr)($v1) /* BF694 80128F94 24020048 */ addiu $v0, $zero, 0x48 /* BF698 80128F98 AFB900C0 */ sw $t9, 0xc0($sp) /* BF69C 80128F9C A7C20516 */ sh $v0, 0x516($fp) @@ -1309,16 +1309,16 @@ glabel L80128F34_BF634 .L80128FAC: /* BF6AC 80128FAC 3C18802F */ lui $t8, %hi(D_802EC7F0) /* BF6B0 80128FB0 2718C7F0 */ addiu $t8, $t8, %lo(D_802EC7F0) -/* BF6B4 80128FB4 3C028015 */ lui $v0, %hi(D_80155D74) -/* BF6B8 80128FB8 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* BF6B4 80128FB4 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* BF6B8 80128FB8 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* BF6BC 80128FBC 3C16802F */ lui $s6, %hi(D_802ECD30) /* BF6C0 80128FC0 26D6CD30 */ addiu $s6, $s6, %lo(D_802ECD30) /* BF6C4 80128FC4 AFB800C0 */ sw $t8, 0xc0($sp) /* BF6C8 80128FC8 A444004A */ sh $a0, 0x4a($v0) .L80128FCC: /* BF6CC 80128FCC 24020022 */ addiu $v0, $zero, 0x22 -/* BF6D0 80128FD0 3C048015 */ lui $a0, %hi(D_80155D74) -/* BF6D4 80128FD4 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) +/* BF6D0 80128FD0 3C048015 */ lui $a0, %hi(gMessageDrawStatePtr) +/* BF6D4 80128FD4 8C845D74 */ lw $a0, %lo(gMessageDrawStatePtr)($a0) /* BF6D8 80128FD8 24190002 */ addiu $t9, $zero, 2 /* BF6DC 80128FDC AC820000 */ sw $v0, ($a0) /* BF6E0 80128FE0 24020028 */ addiu $v0, $zero, 0x28 @@ -1780,8 +1780,8 @@ glabel L801296EC_BFDEC /* BFDF4 801296F4 24050020 */ addiu $a1, $zero, 0x20 /* BFDF8 801296F8 2402000C */ addiu $v0, $zero, 0xc /* BFDFC 801296FC 00A0302D */ daddu $a2, $a1, $zero -/* BFE00 80129700 3C078015 */ lui $a3, %hi(D_80155D74) -/* BFE04 80129704 8CE75D74 */ lw $a3, %lo(D_80155D74)($a3) +/* BFE00 80129700 3C078015 */ lui $a3, %hi(gMessageDrawStatePtr) +/* BFE04 80129704 8CE75D74 */ lw $a3, %lo(gMessageDrawStatePtr)($a3) /* BFE08 80129708 2411002B */ addiu $s1, $zero, 0x2b /* BFE0C 8012970C 24180005 */ addiu $t8, $zero, 5 /* BFE10 80129710 A4E20046 */ sh $v0, 0x46($a3) @@ -1806,8 +1806,8 @@ glabel L801296EC_BFDEC /* BFE5C 8012975C 2442FFEC */ addiu $v0, $v0, -0x14 /* BFE60 80129760 A7C20484 */ sh $v0, 0x484($fp) /* BFE64 80129764 A0E0002B */ sb $zero, 0x2b($a3) -/* BFE68 80129768 3C028015 */ lui $v0, %hi(D_80155D74) -/* BFE6C 8012976C 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* BFE68 80129768 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* BFE6C 8012976C 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* BFE70 80129770 0000382D */ daddu $a3, $zero, $zero /* BFE74 80129774 A440004A */ sh $zero, 0x4a($v0) /* BFE78 80129778 2402001B */ addiu $v0, $zero, 0x1b @@ -1874,8 +1874,8 @@ glabel L801296EC_BFDEC /* BFF60 80129860 2405001C */ addiu $a1, $zero, 0x1c /* BFF64 80129864 240600F0 */ addiu $a2, $zero, 0xf0 /* BFF68 80129868 24020006 */ addiu $v0, $zero, 6 -/* BFF6C 8012986C 3C038015 */ lui $v1, %hi(D_80155D74) -/* BFF70 80129870 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) +/* BFF6C 8012986C 3C038015 */ lui $v1, %hi(gMessageDrawStatePtr) +/* BFF70 80129870 8C635D74 */ lw $v1, %lo(gMessageDrawStatePtr)($v1) /* BFF74 80129874 2407003A */ addiu $a3, $zero, 0x3a /* BFF78 80129878 AFA20010 */ sw $v0, 0x10($sp) /* BFF7C 8012987C 9062002B */ lbu $v0, 0x2b($v1) @@ -1928,14 +1928,14 @@ glabel L801296EC_BFDEC /* C0038 80129938 24070002 */ addiu $a3, $zero, 2 /* C003C 8012993C 0C04B0B8 */ jal msg_reset_gfx_state /* C0040 80129940 327300FF */ andi $s3, $s3, 0xff -/* C0044 80129944 3C038015 */ lui $v1, %hi(D_80155D74) -/* C0048 80129948 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) +/* C0044 80129944 3C038015 */ lui $v1, %hi(gMessageDrawStatePtr) +/* C0048 80129948 8C635D74 */ lw $v1, %lo(gMessageDrawStatePtr)($v1) /* C004C 8012994C 8C620020 */ lw $v0, 0x20($v1) /* C0050 80129950 0804AAD4 */ j .L8012AB50 /* C0054 80129954 A7B300AE */ sh $s3, 0xae($sp) glabel L80129958_C0058 -/* C0058 80129958 3C038015 */ lui $v1, %hi(D_80155D74) -/* C005C 8012995C 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) +/* C0058 80129958 3C038015 */ lui $v1, %hi(gMessageDrawStatePtr) +/* C005C 8012995C 8C635D74 */ lw $v1, %lo(gMessageDrawStatePtr)($v1) /* C0060 80129960 94640034 */ lhu $a0, 0x34($v1) /* C0064 80129964 24020010 */ addiu $v0, $zero, 0x10 /* C0068 80129968 A4620046 */ sh $v0, 0x46($v1) @@ -1994,8 +1994,8 @@ glabel L80129958_C0058 /* C0138 80129A38 0804A6B3 */ j .L80129ACC /* C013C 80129A3C 00000000 */ nop glabel L80129A40_C0140 -/* C0140 80129A40 3C048015 */ lui $a0, %hi(D_80155D74) -/* C0144 80129A44 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) +/* C0140 80129A40 3C048015 */ lui $a0, %hi(gMessageDrawStatePtr) +/* C0144 80129A44 8C845D74 */ lw $a0, %lo(gMessageDrawStatePtr)($a0) /* C0148 80129A48 2402003C */ addiu $v0, $zero, 0x3c /* C014C 80129A4C A7C2045A */ sh $v0, 0x45a($fp) /* C0150 80129A50 2402006E */ addiu $v0, $zero, 0x6e @@ -2039,8 +2039,8 @@ glabel L80129ADC_C01DC /* C01E0 80129AE0 2402000C */ addiu $v0, $zero, 0xc /* C01E4 80129AE4 1462000A */ bne $v1, $v0, .L80129B10 /* C01E8 80129AE8 2402000B */ addiu $v0, $zero, 0xb -/* C01EC 80129AEC 3C028015 */ lui $v0, %hi(D_80155D74) -/* C01F0 80129AF0 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C01EC 80129AEC 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C01F0 80129AF0 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C01F4 80129AF4 93C30487 */ lbu $v1, 0x487($fp) /* C01F8 80129AF8 90420050 */ lbu $v0, 0x50($v0) /* C01FC 80129AFC 0043102B */ sltu $v0, $v0, $v1 @@ -2059,8 +2059,8 @@ glabel L80129ADC_C01DC /* C022C 80129B2C 0043102A */ slt $v0, $v0, $v1 /* C0230 80129B30 10400009 */ beqz $v0, .L80129B58 /* C0234 80129B34 00A0182D */ daddu $v1, $a1, $zero -/* C0238 80129B38 3C028015 */ lui $v0, %hi(D_80155D74) -/* C023C 80129B3C 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C0238 80129B38 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C023C 80129B3C 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C0240 80129B40 90420050 */ lbu $v0, 0x50($v0) /* C0244 80129B44 0045102B */ sltu $v0, $v0, $a1 /* C0248 80129B48 14400025 */ bnez $v0, .L80129BE0 @@ -2068,8 +2068,8 @@ glabel L80129ADC_C01DC /* C0250 80129B50 0804A6F8 */ j .L80129BE0 /* C0254 80129B54 A7B90080 */ sh $t9, 0x80($sp) .L80129B58: -/* C0258 80129B58 3C028015 */ lui $v0, %hi(D_80155D74) -/* C025C 80129B5C 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C0258 80129B58 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C025C 80129B5C 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C0260 80129B60 90440050 */ lbu $a0, 0x50($v0) /* C0264 80129B64 0064102B */ sltu $v0, $v1, $a0 /* C0268 80129B68 10400003 */ beqz $v0, .L80129B78 @@ -2106,8 +2106,8 @@ glabel L80129ADC_C01DC /* C02D8 80129BD8 04420001 */ bltzl $v0, .L80129BE0 /* C02DC 80129BDC A7A0008E */ sh $zero, 0x8e($sp) .L80129BE0: -/* C02E0 80129BE0 3C038015 */ lui $v1, %hi(D_80155D74) -/* C02E4 80129BE4 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) +/* C02E0 80129BE0 3C038015 */ lui $v1, %hi(gMessageDrawStatePtr) +/* C02E4 80129BE4 8C635D74 */ lw $v1, %lo(gMessageDrawStatePtr)($v1) /* C02E8 80129BE8 90620050 */ lbu $v0, 0x50($v1) /* C02EC 80129BEC 24420001 */ addiu $v0, $v0, 1 /* C02F0 80129BF0 0804A9B1 */ j L8012A6C4_C0DC4 @@ -2117,8 +2117,8 @@ glabel L80129BF8_C02F8 /* C02FC 80129BFC 0804AFDC */ j L8012BF70_C2670 /* C0300 80129C00 A7B80080 */ sh $t8, 0x80($sp) glabel L80129C04_C0304 -/* C0304 80129C04 3C038015 */ lui $v1, %hi(D_80155D74) -/* C0308 80129C08 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) +/* C0304 80129C04 3C038015 */ lui $v1, %hi(gMessageDrawStatePtr) +/* C0308 80129C08 8C635D74 */ lw $v1, %lo(gMessageDrawStatePtr)($v1) /* C030C 80129C0C 8C620020 */ lw $v0, 0x20($v1) /* C0310 80129C10 8C64004C */ lw $a0, 0x4c($v1) /* C0314 80129C14 24420001 */ addiu $v0, $v0, 1 @@ -2134,8 +2134,8 @@ glabel L80129C04_C0304 /* C033C 80129C3C 00400008 */ jr $v0 /* C0340 80129C40 00000000 */ nop glabel L80129C44_C0344 -/* C0344 80129C44 3C048015 */ lui $a0, %hi(D_80155D74) -/* C0348 80129C48 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) +/* C0344 80129C44 3C048015 */ lui $a0, %hi(gMessageDrawStatePtr) +/* C0348 80129C48 8C845D74 */ lw $a0, %lo(gMessageDrawStatePtr)($a0) /* C034C 80129C4C 8C820020 */ lw $v0, 0x20($a0) /* C0350 80129C50 8C83004C */ lw $v1, 0x4c($a0) /* C0354 80129C54 00431021 */ addu $v0, $v0, $v1 @@ -2149,8 +2149,8 @@ glabel L80129C44_C0344 /* C0374 80129C74 0804AFDC */ j L8012BF70_C2670 /* C0378 80129C78 A485003C */ sh $a1, 0x3c($a0) glabel L80129C7C_C037C -/* C037C 80129C7C 3C048015 */ lui $a0, %hi(D_80155D74) -/* C0380 80129C80 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) +/* C037C 80129C7C 3C048015 */ lui $a0, %hi(gMessageDrawStatePtr) +/* C0380 80129C80 8C845D74 */ lw $a0, %lo(gMessageDrawStatePtr)($a0) /* C0384 80129C84 8C830020 */ lw $v1, 0x20($a0) /* C0388 80129C88 8C82004C */ lw $v0, 0x4c($a0) /* C038C 80129C8C 00621821 */ addu $v1, $v1, $v0 @@ -2161,8 +2161,8 @@ glabel L80129C7C_C037C /* C03A0 80129CA0 0804AFDC */ j L8012BF70_C2670 /* C03A4 80129CA4 A483003E */ sh $v1, 0x3e($a0) glabel L80129CA8_C03A8 -/* C03A8 80129CA8 3C048015 */ lui $a0, %hi(D_80155D74) -/* C03AC 80129CAC 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) +/* C03A8 80129CA8 3C048015 */ lui $a0, %hi(gMessageDrawStatePtr) +/* C03AC 80129CAC 8C845D74 */ lw $a0, %lo(gMessageDrawStatePtr)($a0) /* C03B0 80129CB0 8C820020 */ lw $v0, 0x20($a0) /* C03B4 80129CB4 8C83004C */ lw $v1, 0x4c($a0) /* C03B8 80129CB8 00431021 */ addu $v0, $v0, $v1 @@ -2176,8 +2176,8 @@ glabel L80129CA8_C03A8 /* C03D8 80129CD8 0804AFDC */ j L8012BF70_C2670 /* C03DC 80129CDC A485004A */ sh $a1, 0x4a($a0) glabel L80129CE0_C03E0 -/* C03E0 80129CE0 3C048015 */ lui $a0, %hi(D_80155D74) -/* C03E4 80129CE4 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) +/* C03E0 80129CE0 3C048015 */ lui $a0, %hi(gMessageDrawStatePtr) +/* C03E4 80129CE4 8C845D74 */ lw $a0, %lo(gMessageDrawStatePtr)($a0) /* C03E8 80129CE8 8C820020 */ lw $v0, 0x20($a0) /* C03EC 80129CEC 8C83004C */ lw $v1, 0x4c($a0) /* C03F0 80129CF0 00431021 */ addu $v0, $v0, $v1 @@ -2185,8 +2185,8 @@ glabel L80129CE0_C03E0 /* C03F8 80129CF8 0804AAD1 */ j L8012AB44_C1244 /* C03FC 80129CFC A0820040 */ sb $v0, 0x40($a0) glabel L80129D00_C0400 -/* C0400 80129D00 3C048015 */ lui $a0, %hi(D_80155D74) -/* C0404 80129D04 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) +/* C0400 80129D00 3C048015 */ lui $a0, %hi(gMessageDrawStatePtr) +/* C0404 80129D04 8C845D74 */ lw $a0, %lo(gMessageDrawStatePtr)($a0) /* C0408 80129D08 8C820020 */ lw $v0, 0x20($a0) /* C040C 80129D0C 8C83004C */ lw $v1, 0x4c($a0) /* C0410 80129D10 00431021 */ addu $v0, $v0, $v1 @@ -2270,8 +2270,8 @@ glabel L80129E38_C0538 /* C0538 80129E38 3C06E300 */ lui $a2, 0xe300 /* C053C 80129E3C 34C61201 */ ori $a2, $a2, 0x1201 /* C0540 80129E40 8EE20000 */ lw $v0, ($s7) -/* C0544 80129E44 3C048015 */ lui $a0, %hi(D_80155D74) -/* C0548 80129E48 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) +/* C0544 80129E44 3C048015 */ lui $a0, %hi(gMessageDrawStatePtr) +/* C0548 80129E48 8C845D74 */ lw $a0, %lo(gMessageDrawStatePtr)($a0) /* C054C 80129E4C 0040282D */ daddu $a1, $v0, $zero /* C0550 80129E50 24420008 */ addiu $v0, $v0, 8 /* C0554 80129E54 8C830020 */ lw $v1, 0x20($a0) @@ -2287,8 +2287,8 @@ glabel L80129E38_C0538 /* C057C 80129E7C 0804AFDC */ j L8012BF70_C2670 /* C0580 80129E80 ACA20004 */ sw $v0, 4($a1) glabel L80129E84_C0584 -/* C0584 80129E84 3C058015 */ lui $a1, %hi(D_80155D74) -/* C0588 80129E88 8CA55D74 */ lw $a1, %lo(D_80155D74)($a1) +/* C0584 80129E84 3C058015 */ lui $a1, %hi(gMessageDrawStatePtr) +/* C0588 80129E88 8CA55D74 */ lw $a1, %lo(gMessageDrawStatePtr)($a1) /* C058C 80129E8C 8CA30020 */ lw $v1, 0x20($a1) /* C0590 80129E90 8CA2004C */ lw $v0, 0x4c($a1) /* C0594 80129E94 00621821 */ addu $v1, $v1, $v0 @@ -2302,8 +2302,8 @@ glabel L80129E84_C0584 /* C05B4 80129EB4 0804AFDC */ j L8012BF70_C2670 /* C05B8 80129EB8 A4A30042 */ sh $v1, 0x42($a1) glabel L80129EBC_C05BC -/* C05BC 80129EBC 3C048015 */ lui $a0, %hi(D_80155D74) -/* C05C0 80129EC0 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) +/* C05BC 80129EBC 3C048015 */ lui $a0, %hi(gMessageDrawStatePtr) +/* C05C0 80129EC0 8C845D74 */ lw $a0, %lo(gMessageDrawStatePtr)($a0) /* C05C4 80129EC4 8C830020 */ lw $v1, 0x20($a0) /* C05C8 80129EC8 8C82004C */ lw $v0, 0x4c($a0) /* C05CC 80129ECC 00621821 */ addu $v1, $v1, $v0 @@ -2312,8 +2312,8 @@ glabel L80129EBC_C05BC /* C05D8 80129ED8 0804A7DA */ j .L80129F68 /* C05DC 80129EDC 24420002 */ addiu $v0, $v0, 2 glabel L80129EE0_C05E0 -/* C05E0 80129EE0 3C048015 */ lui $a0, %hi(D_80155D74) -/* C05E4 80129EE4 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) +/* C05E0 80129EE0 3C048015 */ lui $a0, %hi(gMessageDrawStatePtr) +/* C05E4 80129EE4 8C845D74 */ lw $a0, %lo(gMessageDrawStatePtr)($a0) /* C05E8 80129EE8 8C820020 */ lw $v0, 0x20($a0) /* C05EC 80129EEC 8C83004C */ lw $v1, 0x4c($a0) /* C05F0 80129EF0 00431021 */ addu $v0, $v0, $v1 @@ -2326,8 +2326,8 @@ glabel L80129EE0_C05E0 /* C060C 80129F0C 0804AFDC */ j L8012BF70_C2670 /* C0610 80129F10 A4830042 */ sh $v1, 0x42($a0) glabel L80129F14_C0614 -/* C0614 80129F14 3C048015 */ lui $a0, %hi(D_80155D74) -/* C0618 80129F18 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) +/* C0614 80129F14 3C048015 */ lui $a0, %hi(gMessageDrawStatePtr) +/* C0618 80129F18 8C845D74 */ lw $a0, %lo(gMessageDrawStatePtr)($a0) /* C061C 80129F1C 8C820020 */ lw $v0, 0x20($a0) /* C0620 80129F20 8C83004C */ lw $v1, 0x4c($a0) /* C0624 80129F24 00431021 */ addu $v0, $v0, $v1 @@ -2338,8 +2338,8 @@ glabel L80129F14_C0614 /* C0638 80129F38 0804A7DA */ j .L80129F68 /* C063C 80129F3C 00651821 */ addu $v1, $v1, $a1 glabel L80129F40_C0640 -/* C0640 80129F40 3C048015 */ lui $a0, %hi(D_80155D74) -/* C0644 80129F44 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) +/* C0640 80129F40 3C048015 */ lui $a0, %hi(gMessageDrawStatePtr) +/* C0644 80129F44 8C845D74 */ lw $a0, %lo(gMessageDrawStatePtr)($a0) /* C0648 80129F48 8C820020 */ lw $v0, 0x20($a0) /* C064C 80129F4C 8C83004C */ lw $v1, 0x4c($a0) /* C0650 80129F50 00431021 */ addu $v0, $v0, $v1 @@ -2353,8 +2353,8 @@ glabel L80129F40_C0640 /* C066C 80129F6C 0804AFDC */ j L8012BF70_C2670 /* C0670 80129F70 A4830044 */ sh $v1, 0x44($a0) glabel L80129F74_C0674 -/* C0674 80129F74 3C0B8015 */ lui $t3, %hi(D_80155D74) -/* C0678 80129F78 8D6B5D74 */ lw $t3, %lo(D_80155D74)($t3) +/* C0674 80129F74 3C0B8015 */ lui $t3, %hi(gMessageDrawStatePtr) +/* C0678 80129F78 8D6B5D74 */ lw $t3, %lo(gMessageDrawStatePtr)($t3) /* C067C 80129F7C 8D620020 */ lw $v0, 0x20($t3) /* C0680 80129F80 8D63004C */ lw $v1, 0x4c($t3) /* C0684 80129F84 00431021 */ addu $v0, $v0, $v1 @@ -2430,8 +2430,8 @@ glabel L80129F74_C0674 /* C0798 8012A098 8D840000 */ lw $a0, ($t4) /* C079C 8012A09C 0C04BA68 */ jal draw_ci_image_with_clipping /* C07A0 8012A0A0 8D87000C */ lw $a3, 0xc($t4) -/* C07A4 8012A0A4 3C048015 */ lui $a0, %hi(D_80155D74) -/* C07A8 8012A0A8 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) +/* C07A4 8012A0A4 3C048015 */ lui $a0, %hi(gMessageDrawStatePtr) +/* C07A8 8012A0A8 8C845D74 */ lw $a0, %lo(gMessageDrawStatePtr)($a0) /* C07AC 8012A0AC 94820034 */ lhu $v0, 0x34($a0) /* C07B0 8012A0B0 8C830020 */ lw $v1, 0x20($a0) /* C07B4 8012A0B4 34420012 */ ori $v0, $v0, 0x12 @@ -2456,8 +2456,8 @@ glabel L8012A0C8_C07C8 /* C07FC 8012A0FC 4620030D */ trunc.w.d $f12, $f0 /* C0800 8012A100 44106000 */ mfc1 $s0, $f12 .L8012A104: -/* C0804 8012A104 3C028015 */ lui $v0, %hi(D_80155D74) -/* C0808 8012A108 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C0804 8012A104 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C0808 8012A108 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C080C 8012A10C 8C430020 */ lw $v1, 0x20($v0) /* C0810 8012A110 8C42004C */ lw $v0, 0x4c($v0) /* C0814 8012A114 27A40050 */ addiu $a0, $sp, 0x50 @@ -2470,8 +2470,8 @@ glabel L8012A0C8_C07C8 /* C0830 8012A130 00A22825 */ or $a1, $a1, $v0 /* C0834 8012A134 104000FA */ beqz $v0, .L8012A520 /* C0838 8012A138 00000000 */ nop -/* C083C 8012A13C 3C058015 */ lui $a1, %hi(D_80155D74) -/* C0840 8012A140 8CA55D74 */ lw $a1, %lo(D_80155D74)($a1) +/* C083C 8012A13C 3C058015 */ lui $a1, %hi(gMessageDrawStatePtr) +/* C0840 8012A140 8CA55D74 */ lw $a1, %lo(gMessageDrawStatePtr)($a1) /* C0844 8012A144 97C6045A */ lhu $a2, 0x45a($fp) /* C0848 8012A148 97C8045C */ lhu $t0, 0x45c($fp) /* C084C 8012A14C 97B90066 */ lhu $t9, 0x66($sp) @@ -2520,8 +2520,8 @@ glabel L8012A0C8_C07C8 /* C08F8 8012A1F8 8FA6005C */ lw $a2, 0x5c($sp) /* C08FC 8012A1FC 0C04BA68 */ jal draw_ci_image_with_clipping /* C0900 8012A200 24070002 */ addiu $a3, $zero, 2 -/* C0904 8012A204 3C038015 */ lui $v1, %hi(D_80155D74) -/* C0908 8012A208 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) +/* C0904 8012A204 3C038015 */ lui $v1, %hi(gMessageDrawStatePtr) +/* C0908 8012A208 8C635D74 */ lw $v1, %lo(gMessageDrawStatePtr)($v1) /* C090C 8012A20C 94620034 */ lhu $v0, 0x34($v1) /* C0910 8012A210 34420010 */ ori $v0, $v0, 0x10 /* C0914 8012A214 0804A948 */ j .L8012A520 @@ -2549,8 +2549,8 @@ glabel L8012A21C_C091C .L8012A268: /* C0968 8012A268 3C048016 */ lui $a0, %hi(D_80159B50) /* C096C 8012A26C 24849B50 */ addiu $a0, $a0, %lo(D_80159B50) -/* C0970 8012A270 3C088015 */ lui $t0, %hi(D_80155D74) -/* C0974 8012A274 8D085D74 */ lw $t0, %lo(D_80155D74)($t0) +/* C0970 8012A270 3C088015 */ lui $t0, %hi(gMessageDrawStatePtr) +/* C0974 8012A274 8D085D74 */ lw $t0, %lo(gMessageDrawStatePtr)($t0) /* C0978 8012A278 97C6045A */ lhu $a2, 0x45a($fp) /* C097C 8012A27C 97C9045C */ lhu $t1, 0x45c($fp) /* C0980 8012A280 97B90066 */ lhu $t9, 0x66($sp) @@ -2599,15 +2599,15 @@ glabel L8012A21C_C091C /* C0A2C 8012A32C 3063FFFF */ andi $v1, $v1, 0xffff /* C0A30 8012A330 0C04BA68 */ jal draw_ci_image_with_clipping /* C0A34 8012A334 AFA3002C */ sw $v1, 0x2c($sp) -/* C0A38 8012A338 3C038015 */ lui $v1, %hi(D_80155D74) -/* C0A3C 8012A33C 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) +/* C0A38 8012A338 3C038015 */ lui $v1, %hi(gMessageDrawStatePtr) +/* C0A3C 8012A33C 8C635D74 */ lw $v1, %lo(gMessageDrawStatePtr)($v1) /* C0A40 8012A340 94620034 */ lhu $v0, 0x34($v1) /* C0A44 8012A344 34420010 */ ori $v0, $v0, 0x10 /* C0A48 8012A348 0804A9B1 */ j L8012A6C4_C0DC4 /* C0A4C 8012A34C A4620034 */ sh $v0, 0x34($v1) glabel L8012A350_C0A50 -/* C0A50 8012A350 3C028015 */ lui $v0, %hi(D_80155D74) -/* C0A54 8012A354 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C0A50 8012A350 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C0A54 8012A354 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C0A58 8012A358 8C430020 */ lw $v1, 0x20($v0) /* C0A5C 8012A35C 8C42004C */ lw $v0, 0x4c($v0) /* C0A60 8012A360 00622821 */ addu $a1, $v1, $v0 @@ -2632,14 +2632,14 @@ glabel L8012A350_C0A50 /* C0AA4 8012A3A4 03C72821 */ addu $a1, $fp, $a3 /* C0AA8 8012A3A8 24090012 */ addiu $t1, $zero, 0x12 /* C0AAC 8012A3AC 0080302D */ daddu $a2, $a0, $zero -/* C0AB0 8012A3B0 3C028015 */ lui $v0, %hi(D_80155D74) -/* C0AB4 8012A3B4 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C0AB0 8012A3B0 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C0AB4 8012A3B4 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C0AB8 8012A3B8 24080013 */ addiu $t0, $zero, 0x13 .L8012A3BC: /* C0ABC 8012A3BC 8C440020 */ lw $a0, 0x20($v0) .L8012A3C0: -/* C0AC0 8012A3C0 3C028015 */ lui $v0, %hi(D_80155D74) -/* C0AC4 8012A3C4 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C0AC0 8012A3C0 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C0AC4 8012A3C4 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C0AC8 8012A3C8 8C42004C */ lw $v0, 0x4c($v0) /* C0ACC 8012A3CC 00821821 */ addu $v1, $a0, $v0 /* C0AD0 8012A3D0 9062FFFF */ lbu $v0, -1($v1) @@ -2659,8 +2659,8 @@ glabel L8012A350_C0A50 /* C0B08 8012A408 0804A929 */ j .L8012A4A4 /* C0B0C 8012A40C 24840004 */ addiu $a0, $a0, 4 .L8012A410: -/* C0B10 8012A410 3C028015 */ lui $v0, %hi(D_80155D74) -/* C0B14 8012A414 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C0B10 8012A410 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C0B14 8012A414 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C0B18 8012A418 8C42004C */ lw $v0, 0x4c($v0) /* C0B1C 8012A41C 00441821 */ addu $v1, $v0, $a0 /* C0B20 8012A420 90620000 */ lbu $v0, ($v1) @@ -2678,13 +2678,13 @@ glabel L8012A350_C0A50 /* C0B50 8012A450 24840001 */ addiu $a0, $a0, 1 /* C0B54 8012A454 90620003 */ lbu $v0, 3($v1) /* C0B58 8012A458 A0A20470 */ sb $v0, 0x470($a1) -/* C0B5C 8012A45C 3C028015 */ lui $v0, %hi(D_80155D74) -/* C0B60 8012A460 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C0B5C 8012A45C 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C0B60 8012A460 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C0B64 8012A464 0804A8EF */ j .L8012A3BC /* C0B68 8012A468 00000000 */ nop .L8012A46C: -/* C0B6C 8012A46C 3C028015 */ lui $v0, %hi(D_80155D74) -/* C0B70 8012A470 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C0B6C 8012A46C 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C0B70 8012A470 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C0B74 8012A474 8C42004C */ lw $v0, 0x4c($v0) /* C0B78 8012A478 00441821 */ addu $v1, $v0, $a0 /* C0B7C 8012A47C 90620000 */ lbu $v0, ($v1) @@ -2701,8 +2701,8 @@ glabel L8012A350_C0A50 /* C0BA4 8012A4A4 0804A8F0 */ j .L8012A3C0 /* C0BA8 8012A4A8 24840001 */ addiu $a0, $a0, 1 .L8012A4AC: -/* C0BAC 8012A4AC 3C058015 */ lui $a1, %hi(D_80155D74) -/* C0BB0 8012A4B0 8CA55D74 */ lw $a1, %lo(D_80155D74)($a1) +/* C0BAC 8012A4AC 3C058015 */ lui $a1, %hi(gMessageDrawStatePtr) +/* C0BB0 8012A4B0 8CA55D74 */ lw $a1, %lo(gMessageDrawStatePtr)($a1) /* C0BB4 8012A4B4 8CA2004C */ lw $v0, 0x4c($a1) /* C0BB8 8012A4B8 ACA40020 */ sw $a0, 0x20($a1) /* C0BBC 8012A4BC 00443021 */ addu $a2, $v0, $a0 @@ -2734,8 +2734,8 @@ glabel L8012A350_C0A50 .L8012A51C: /* C0C1C 8012A51C A4620474 */ sh $v0, 0x474($v1) .L8012A520: -/* C0C20 8012A520 3C038015 */ lui $v1, %hi(D_80155D74) -/* C0C24 8012A524 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) +/* C0C20 8012A520 3C038015 */ lui $v1, %hi(gMessageDrawStatePtr) +/* C0C24 8012A524 8C635D74 */ lw $v1, %lo(gMessageDrawStatePtr)($v1) /* C0C28 8012A528 8C620020 */ lw $v0, 0x20($v1) /* C0C2C 8012A52C 24420004 */ addiu $v0, $v0, 4 /* C0C30 8012A530 0804AFDC */ j L8012BF70_C2670 @@ -2748,15 +2748,15 @@ glabel L8012A350_C0A50 /* C0C44 8012A544 0804AFDC */ j L8012BF70_C2670 /* C0C48 8012A548 ACA20020 */ sw $v0, 0x20($a1) glabel L8012A54C_C0C4C -/* C0C4C 8012A54C 3C038015 */ lui $v1, %hi(D_80155D74) -/* C0C50 8012A550 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) +/* C0C4C 8012A54C 3C038015 */ lui $v1, %hi(gMessageDrawStatePtr) +/* C0C50 8012A550 8C635D74 */ lw $v1, %lo(gMessageDrawStatePtr)($v1) /* C0C54 8012A554 8C620020 */ lw $v0, 0x20($v1) /* C0C58 8012A558 24420003 */ addiu $v0, $v0, 3 /* C0C5C 8012A55C 0804AFDC */ j L8012BF70_C2670 /* C0C60 8012A560 AC620020 */ sw $v0, 0x20($v1) glabel L8012A564_C0C64 -/* C0C64 8012A564 3C058015 */ lui $a1, %hi(D_80155D74) -/* C0C68 8012A568 8CA55D74 */ lw $a1, %lo(D_80155D74)($a1) +/* C0C64 8012A564 3C058015 */ lui $a1, %hi(gMessageDrawStatePtr) +/* C0C68 8012A568 8CA55D74 */ lw $a1, %lo(gMessageDrawStatePtr)($a1) /* C0C6C 8012A56C 97B80076 */ lhu $t8, 0x76($sp) /* C0C70 8012A570 8CA20020 */ lw $v0, 0x20($a1) /* C0C74 8012A574 8CA3004C */ lw $v1, 0x4c($a1) @@ -2787,8 +2787,8 @@ glabel L8012A564_C0C64 /* C0CD8 8012A5D8 0804A9E9 */ j .L8012A7A4 /* C0CDC 8012A5DC 24420002 */ addiu $v0, $v0, 2 glabel L8012A5E0_C0CE0 -/* C0CE0 8012A5E0 3C048015 */ lui $a0, %hi(D_80155D74) -/* C0CE4 8012A5E4 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) +/* C0CE0 8012A5E0 3C048015 */ lui $a0, %hi(gMessageDrawStatePtr) +/* C0CE4 8012A5E4 8C845D74 */ lw $a0, %lo(gMessageDrawStatePtr)($a0) /* C0CE8 8012A5E8 8C820020 */ lw $v0, 0x20($a0) /* C0CEC 8012A5EC 8C83004C */ lw $v1, 0x4c($a0) /* C0CF0 8012A5F0 00431021 */ addu $v0, $v0, $v1 @@ -2800,8 +2800,8 @@ glabel L8012A5E0_C0CE0 /* C0D08 8012A608 0804AAD0 */ j .L8012AB40 /* C0D0C 8012A60C 3042FFDF */ andi $v0, $v0, 0xffdf .L8012A610: -/* C0D10 8012A610 3C028015 */ lui $v0, %hi(D_80155D74) -/* C0D14 8012A614 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C0D10 8012A610 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C0D14 8012A614 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C0D18 8012A618 94430034 */ lhu $v1, 0x34($v0) /* C0D1C 8012A61C 94440042 */ lhu $a0, 0x42($v0) /* C0D20 8012A620 34630020 */ ori $v1, $v1, 0x20 @@ -2810,8 +2810,8 @@ glabel L8012A5E0_C0CE0 /* C0D2C 8012A62C 0804AAD1 */ j L8012AB44_C1244 /* C0D30 8012A630 A4440042 */ sh $a0, 0x42($v0) glabel L8012A634_C0D34 -/* C0D34 8012A634 3C048015 */ lui $a0, %hi(D_80155D74) -/* C0D38 8012A638 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) +/* C0D34 8012A634 3C048015 */ lui $a0, %hi(gMessageDrawStatePtr) +/* C0D38 8012A638 8C845D74 */ lw $a0, %lo(gMessageDrawStatePtr)($a0) /* C0D3C 8012A63C 8C820020 */ lw $v0, 0x20($a0) /* C0D40 8012A640 8C83004C */ lw $v1, 0x4c($a0) /* C0D44 8012A644 00431021 */ addu $v0, $v0, $v1 @@ -2824,8 +2824,8 @@ glabel L8012A654_C0D54 /* C0D5C 8012A65C 0804A9B1 */ j L8012A6C4_C0DC4 /* C0D60 8012A660 00000000 */ nop glabel L8012A664_C0D64 -/* C0D64 8012A664 3C028015 */ lui $v0, %hi(D_80155D74) -/* C0D68 8012A668 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C0D64 8012A664 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C0D68 8012A668 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C0D6C 8012A66C 94440042 */ lhu $a0, 0x42($v0) /* C0D70 8012A670 8C430020 */ lw $v1, 0x20($v0) /* C0D74 8012A674 94450044 */ lhu $a1, 0x44($v0) @@ -2835,8 +2835,8 @@ glabel L8012A664_C0D64 /* C0D84 8012A684 0804AFDC */ j L8012BF70_C2670 /* C0D88 8012A688 AC430020 */ sw $v1, 0x20($v0) glabel L8012A68C_C0D8C -/* C0D8C 8012A68C 3C028015 */ lui $v0, %hi(D_80155D74) -/* C0D90 8012A690 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C0D8C 8012A68C 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C0D90 8012A690 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C0D94 8012A694 94440024 */ lhu $a0, 0x24($v0) /* C0D98 8012A698 8C430020 */ lw $v1, 0x20($v0) /* C0D9C 8012A69C 94450026 */ lhu $a1, 0x26($v0) @@ -2846,20 +2846,20 @@ glabel L8012A68C_C0D8C /* C0DAC 8012A6AC 0804AFDC */ j L8012BF70_C2670 /* C0DB0 8012A6B0 AC430020 */ sw $v1, 0x20($v0) glabel L8012A6B4_C0DB4 -/* C0DB4 8012A6B4 3C038015 */ lui $v1, %hi(D_80155D74) -/* C0DB8 8012A6B8 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) +/* C0DB4 8012A6B4 3C038015 */ lui $v1, %hi(gMessageDrawStatePtr) +/* C0DB8 8012A6B8 8C635D74 */ lw $v1, %lo(gMessageDrawStatePtr)($v1) /* C0DBC 8012A6BC 9062004B */ lbu $v0, 0x4b($v1) /* C0DC0 8012A6C0 A0620028 */ sb $v0, 0x28($v1) glabel L8012A6C4_C0DC4 -/* C0DC4 8012A6C4 3C038015 */ lui $v1, %hi(D_80155D74) -/* C0DC8 8012A6C8 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) +/* C0DC4 8012A6C4 3C038015 */ lui $v1, %hi(gMessageDrawStatePtr) +/* C0DC8 8012A6C8 8C635D74 */ lw $v1, %lo(gMessageDrawStatePtr)($v1) /* C0DCC 8012A6CC 8C620020 */ lw $v0, 0x20($v1) /* C0DD0 8012A6D0 24420001 */ addiu $v0, $v0, 1 /* C0DD4 8012A6D4 0804AFDC */ j L8012BF70_C2670 /* C0DD8 8012A6D8 AC620020 */ sw $v0, 0x20($v1) glabel L8012A6DC_C0DDC -/* C0DDC 8012A6DC 3C028015 */ lui $v0, %hi(D_80155D74) -/* C0DE0 8012A6E0 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C0DDC 8012A6DC 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C0DE0 8012A6E0 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C0DE4 8012A6E4 8C430020 */ lw $v1, 0x20($v0) /* C0DE8 8012A6E8 90440028 */ lbu $a0, 0x28($v0) /* C0DEC 8012A6EC 24630001 */ addiu $v1, $v1, 1 @@ -2867,8 +2867,8 @@ glabel L8012A6DC_C0DDC /* C0DF4 8012A6F4 0804AFDC */ j L8012BF70_C2670 /* C0DF8 8012A6F8 AC430020 */ sw $v1, 0x20($v0) glabel L8012A6FC_C0DFC -/* C0DFC 8012A6FC 3C038015 */ lui $v1, %hi(D_80155D74) -/* C0E00 8012A700 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) +/* C0DFC 8012A6FC 3C038015 */ lui $v1, %hi(gMessageDrawStatePtr) +/* C0E00 8012A700 8C635D74 */ lw $v1, %lo(gMessageDrawStatePtr)($v1) /* C0E04 8012A704 8C620020 */ lw $v0, 0x20($v1) /* C0E08 8012A708 8C63004C */ lw $v1, 0x4c($v1) /* C0E0C 8012A70C 00431021 */ addu $v0, $v0, $v1 @@ -2882,15 +2882,15 @@ glabel L8012A6FC_C0DFC /* C0E2C 8012A72C 00400008 */ jr $v0 /* C0E30 8012A730 00000000 */ nop glabel L8012A734_C0E34 -/* C0E34 8012A734 3C028015 */ lui $v0, %hi(D_80155D74) -/* C0E38 8012A738 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C0E34 8012A734 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C0E38 8012A738 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C0E3C 8012A73C 8C430038 */ lw $v1, 0x38($v0) /* C0E40 8012A740 8C440020 */ lw $a0, 0x20($v0) /* C0E44 8012A744 0804AA54 */ j .L8012A950 /* C0E48 8012A748 34630001 */ ori $v1, $v1, 1 glabel L8012A74C_C0E4C -/* C0E4C 8012A74C 3C028015 */ lui $v0, %hi(D_80155D74) -/* C0E50 8012A750 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C0E4C 8012A74C 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C0E50 8012A750 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C0E54 8012A754 8C430038 */ lw $v1, 0x38($v0) /* C0E58 8012A758 8C440020 */ lw $a0, 0x20($v0) /* C0E5C 8012A75C 0804AA54 */ j .L8012A950 @@ -2898,8 +2898,8 @@ glabel L8012A74C_C0E4C glabel L8012A764_C0E64 /* C0E64 8012A764 3C06FC70 */ lui $a2, 0xfc70 /* C0E68 8012A768 34C6FEE1 */ ori $a2, $a2, 0xfee1 -/* C0E6C 8012A76C 3C058015 */ lui $a1, %hi(D_80155D74) -/* C0E70 8012A770 8CA55D74 */ lw $a1, %lo(D_80155D74)($a1) +/* C0E6C 8012A76C 3C058015 */ lui $a1, %hi(gMessageDrawStatePtr) +/* C0E70 8012A770 8CA55D74 */ lw $a1, %lo(gMessageDrawStatePtr)($a1) /* C0E74 8012A774 8EE40000 */ lw $a0, ($s7) /* C0E78 8012A778 8CA20038 */ lw $v0, 0x38($a1) /* C0E7C 8012A77C 0080182D */ daddu $v1, $a0, $zero @@ -2920,8 +2920,8 @@ glabel L8012A7AC_C0EAC /* C0EB0 8012A7B0 3529FEE5 */ ori $t1, $t1, 0xfee5 /* C0EB4 8012A7B4 3C0811FC */ lui $t0, 0x11fc /* C0EB8 8012A7B8 3C030001 */ lui $v1, 1 -/* C0EBC 8012A7BC 3C068015 */ lui $a2, %hi(D_80155D74) -/* C0EC0 8012A7C0 8CC65D74 */ lw $a2, %lo(D_80155D74)($a2) +/* C0EBC 8012A7BC 3C068015 */ lui $a2, %hi(gMessageDrawStatePtr) +/* C0EC0 8012A7C0 8CC65D74 */ lw $a2, %lo(gMessageDrawStatePtr)($a2) /* C0EC4 8012A7C4 8EE50000 */ lw $a1, ($s7) /* C0EC8 8012A7C8 8CC20038 */ lw $v0, 0x38($a2) /* C0ECC 8012A7CC 00A0382D */ daddu $a3, $a1, $zero @@ -2951,8 +2951,8 @@ glabel L8012A7AC_C0EAC /* C0F2C 8012A82C 0804AFDC */ j L8012BF70_C2670 /* C0F30 8012A830 ACC20020 */ sw $v0, 0x20($a2) glabel L8012A834_C0F34 -/* C0F34 8012A834 3C058015 */ lui $a1, %hi(D_80155D74) -/* C0F38 8012A838 8CA55D74 */ lw $a1, %lo(D_80155D74)($a1) +/* C0F34 8012A834 3C058015 */ lui $a1, %hi(gMessageDrawStatePtr) +/* C0F38 8012A838 8CA55D74 */ lw $a1, %lo(gMessageDrawStatePtr)($a1) /* C0F3C 8012A83C 8CA20038 */ lw $v0, 0x38($a1) /* C0F40 8012A840 8CA40020 */ lw $a0, 0x20($a1) /* C0F44 8012A844 8CA3004C */ lw $v1, 0x4c($a1) @@ -2964,15 +2964,15 @@ glabel L8012A834_C0F34 /* C0F5C 8012A85C 0804AFDB */ j .L8012BF6C /* C0F60 8012A860 A3A300B8 */ sb $v1, 0xb8($sp) glabel L8012A864_C0F64 -/* C0F64 8012A864 3C028015 */ lui $v0, %hi(D_80155D74) -/* C0F68 8012A868 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C0F64 8012A864 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C0F68 8012A868 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C0F6C 8012A86C 8C430038 */ lw $v1, 0x38($v0) /* C0F70 8012A870 8C440020 */ lw $a0, 0x20($v0) /* C0F74 8012A874 0804AA54 */ j .L8012A950 /* C0F78 8012A878 34630040 */ ori $v1, $v1, 0x40 glabel L8012A87C_C0F7C -/* C0F7C 8012A87C 3C058015 */ lui $a1, %hi(D_80155D74) -/* C0F80 8012A880 8CA55D74 */ lw $a1, %lo(D_80155D74)($a1) +/* C0F7C 8012A87C 3C058015 */ lui $a1, %hi(gMessageDrawStatePtr) +/* C0F80 8012A880 8CA55D74 */ lw $a1, %lo(gMessageDrawStatePtr)($a1) /* C0F84 8012A884 8CA20038 */ lw $v0, 0x38($a1) /* C0F88 8012A888 8CA40020 */ lw $a0, 0x20($a1) /* C0F8C 8012A88C 8CA3004C */ lw $v1, 0x4c($a1) @@ -2984,50 +2984,50 @@ glabel L8012A87C_C0F7C /* C0FA4 8012A8A4 0804AFDB */ j .L8012BF6C /* C0FA8 8012A8A8 A7A300B6 */ sh $v1, 0xb6($sp) glabel L8012A8AC_C0FAC -/* C0FAC 8012A8AC 3C028015 */ lui $v0, %hi(D_80155D74) -/* C0FB0 8012A8B0 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C0FAC 8012A8AC 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C0FB0 8012A8B0 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C0FB4 8012A8B4 8C430038 */ lw $v1, 0x38($v0) /* C0FB8 8012A8B8 8C440020 */ lw $a0, 0x20($v0) /* C0FBC 8012A8BC 0804AA54 */ j .L8012A950 /* C0FC0 8012A8C0 34630200 */ ori $v1, $v1, 0x200 glabel L8012A8C4_C0FC4 -/* C0FC4 8012A8C4 3C028015 */ lui $v0, %hi(D_80155D74) -/* C0FC8 8012A8C8 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C0FC4 8012A8C4 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C0FC8 8012A8C8 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C0FCC 8012A8CC 8C430038 */ lw $v1, 0x38($v0) /* C0FD0 8012A8D0 8C440020 */ lw $a0, 0x20($v0) /* C0FD4 8012A8D4 0804AA54 */ j .L8012A950 /* C0FD8 8012A8D8 34630400 */ ori $v1, $v1, 0x400 glabel L8012A8DC_C0FDC -/* C0FDC 8012A8DC 3C028015 */ lui $v0, %hi(D_80155D74) -/* C0FE0 8012A8E0 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C0FDC 8012A8DC 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C0FE0 8012A8E0 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C0FE4 8012A8E4 8C430038 */ lw $v1, 0x38($v0) /* C0FE8 8012A8E8 8C440020 */ lw $a0, 0x20($v0) /* C0FEC 8012A8EC 0804AA54 */ j .L8012A950 /* C0FF0 8012A8F0 34630800 */ ori $v1, $v1, 0x800 glabel L8012A8F4_C0FF4 -/* C0FF4 8012A8F4 3C028015 */ lui $v0, %hi(D_80155D74) -/* C0FF8 8012A8F8 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C0FF4 8012A8F4 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C0FF8 8012A8F8 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C0FFC 8012A8FC 8C430038 */ lw $v1, 0x38($v0) /* C1000 8012A900 8C440020 */ lw $a0, 0x20($v0) /* C1004 8012A904 0804AA54 */ j .L8012A950 /* C1008 8012A908 34631000 */ ori $v1, $v1, 0x1000 glabel L8012A90C_C100C -/* C100C 8012A90C 3C028015 */ lui $v0, %hi(D_80155D74) -/* C1010 8012A910 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C100C 8012A90C 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C1010 8012A910 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C1014 8012A914 8C430038 */ lw $v1, 0x38($v0) /* C1018 8012A918 8C440020 */ lw $a0, 0x20($v0) /* C101C 8012A91C 0804AA54 */ j .L8012A950 /* C1020 8012A920 34632000 */ ori $v1, $v1, 0x2000 glabel L8012A924_C1024 -/* C1024 8012A924 3C028015 */ lui $v0, %hi(D_80155D74) -/* C1028 8012A928 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C1024 8012A924 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C1028 8012A928 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C102C 8012A92C 8C430038 */ lw $v1, 0x38($v0) /* C1030 8012A930 8C440020 */ lw $a0, 0x20($v0) /* C1034 8012A934 0804AA54 */ j .L8012A950 /* C1038 8012A938 34634000 */ ori $v1, $v1, 0x4000 glabel L8012A93C_C103C -/* C103C 8012A93C 3C028015 */ lui $v0, %hi(D_80155D74) -/* C1040 8012A940 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C103C 8012A93C 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C1040 8012A940 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C1044 8012A944 8C430038 */ lw $v1, 0x38($v0) /* C1048 8012A948 8C440020 */ lw $a0, 0x20($v0) /* C104C 8012A94C 34638000 */ ori $v1, $v1, 0x8000 @@ -3037,8 +3037,8 @@ glabel L8012A93C_C103C /* C1058 8012A958 0804AFDC */ j L8012BF70_C2670 /* C105C 8012A95C AC440020 */ sw $a0, 0x20($v0) glabel L8012A960_C1060 -/* C1060 8012A960 3C038015 */ lui $v1, %hi(D_80155D74) -/* C1064 8012A964 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) +/* C1060 8012A960 3C038015 */ lui $v1, %hi(gMessageDrawStatePtr) +/* C1064 8012A964 8C635D74 */ lw $v1, %lo(gMessageDrawStatePtr)($v1) /* C1068 8012A968 8C620020 */ lw $v0, 0x20($v1) /* C106C 8012A96C 8C63004C */ lw $v1, 0x4c($v1) /* C1070 8012A970 00431021 */ addu $v0, $v0, $v1 @@ -3052,56 +3052,56 @@ glabel L8012A960_C1060 /* C1090 8012A990 00400008 */ jr $v0 /* C1094 8012A994 00000000 */ nop glabel L8012A998_C1098 -/* C1098 8012A998 3C028015 */ lui $v0, %hi(D_80155D74) -/* C109C 8012A99C 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C1098 8012A998 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C109C 8012A99C 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C10A0 8012A9A0 8C430038 */ lw $v1, 0x38($v0) /* C10A4 8012A9A4 0804AAAB */ j .L8012AAAC /* C10A8 8012A9A8 2404FFFE */ addiu $a0, $zero, -2 glabel L8012A9AC_C10AC -/* C10AC 8012A9AC 3C028015 */ lui $v0, %hi(D_80155D74) -/* C10B0 8012A9B0 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C10AC 8012A9AC 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C10B0 8012A9B0 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C10B4 8012A9B4 8C430038 */ lw $v1, 0x38($v0) /* C10B8 8012A9B8 0804AAAB */ j .L8012AAAC /* C10BC 8012A9BC 2404FFFD */ addiu $a0, $zero, -3 glabel L8012A9C0_C10C0 -/* C10C0 8012A9C0 3C028015 */ lui $v0, %hi(D_80155D74) -/* C10C4 8012A9C4 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C10C0 8012A9C0 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C10C4 8012A9C4 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C10C8 8012A9C8 8C430038 */ lw $v1, 0x38($v0) /* C10CC 8012A9CC 0804AAAB */ j .L8012AAAC /* C10D0 8012A9D0 2404FFFB */ addiu $a0, $zero, -5 glabel L8012A9D4_C10D4 -/* C10D4 8012A9D4 3C048015 */ lui $a0, %hi(D_80155D74) -/* C10D8 8012A9D8 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) +/* C10D4 8012A9D4 3C048015 */ lui $a0, %hi(gMessageDrawStatePtr) +/* C10D8 8012A9D8 8C845D74 */ lw $a0, %lo(gMessageDrawStatePtr)($a0) /* C10DC 8012A9DC 3C03FFFE */ lui $v1, 0xfffe /* C10E0 8012A9E0 8C820038 */ lw $v0, 0x38($a0) /* C10E4 8012A9E4 0804AAB3 */ j .L8012AACC /* C10E8 8012A9E8 3463FFFF */ ori $v1, $v1, 0xffff glabel L8012A9EC_C10EC -/* C10EC 8012A9EC 3C028015 */ lui $v0, %hi(D_80155D74) -/* C10F0 8012A9F0 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C10EC 8012A9EC 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C10F0 8012A9F0 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C10F4 8012A9F4 8C430038 */ lw $v1, 0x38($v0) /* C10F8 8012A9F8 0804AAAB */ j .L8012AAAC /* C10FC 8012A9FC 2404FFDF */ addiu $a0, $zero, -0x21 glabel L8012AA00_C1100 -/* C1100 8012AA00 3C048015 */ lui $a0, %hi(D_80155D74) -/* C1104 8012AA04 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) +/* C1100 8012AA00 3C048015 */ lui $a0, %hi(gMessageDrawStatePtr) +/* C1104 8012AA04 8C845D74 */ lw $a0, %lo(gMessageDrawStatePtr)($a0) /* C1108 8012AA08 0804AA91 */ j .L8012AA44 /* C110C 8012AA0C 2405FFBF */ addiu $a1, $zero, -0x41 glabel L8012AA10_C1110 -/* C1110 8012AA10 3C028015 */ lui $v0, %hi(D_80155D74) -/* C1114 8012AA14 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C1110 8012AA10 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C1114 8012AA14 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C1118 8012AA18 8C430038 */ lw $v1, 0x38($v0) /* C111C 8012AA1C 0804AAAB */ j .L8012AAAC /* C1120 8012AA20 2404FF7F */ addiu $a0, $zero, -0x81 glabel L8012AA24_C1124 -/* C1124 8012AA24 3C028015 */ lui $v0, %hi(D_80155D74) -/* C1128 8012AA28 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C1124 8012AA24 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C1128 8012AA28 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C112C 8012AA2C 8C430038 */ lw $v1, 0x38($v0) /* C1130 8012AA30 0804AAAB */ j .L8012AAAC /* C1134 8012AA34 2404FDFF */ addiu $a0, $zero, -0x201 glabel L8012AA38_C1138 -/* C1138 8012AA38 3C048015 */ lui $a0, %hi(D_80155D74) -/* C113C 8012AA3C 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) +/* C1138 8012AA38 3C048015 */ lui $a0, %hi(gMessageDrawStatePtr) +/* C113C 8012AA3C 8C845D74 */ lw $a0, %lo(gMessageDrawStatePtr)($a0) /* C1140 8012AA40 2405FBFF */ addiu $a1, $zero, -0x401 .L8012AA44: /* C1144 8012AA44 8C820038 */ lw $v0, 0x38($a0) @@ -3112,26 +3112,26 @@ glabel L8012AA38_C1138 /* C1158 8012AA58 0804AAD1 */ j L8012AB44_C1244 /* C115C 8012AA5C A4830034 */ sh $v1, 0x34($a0) glabel L8012AA60_C1160 -/* C1160 8012AA60 3C028015 */ lui $v0, %hi(D_80155D74) -/* C1164 8012AA64 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C1160 8012AA60 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C1164 8012AA64 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C1168 8012AA68 8C430038 */ lw $v1, 0x38($v0) /* C116C 8012AA6C 0804AAAB */ j .L8012AAAC /* C1170 8012AA70 2404F7FF */ addiu $a0, $zero, -0x801 glabel L8012AA74_C1174 -/* C1174 8012AA74 3C028015 */ lui $v0, %hi(D_80155D74) -/* C1178 8012AA78 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C1174 8012AA74 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C1178 8012AA78 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C117C 8012AA7C 8C430038 */ lw $v1, 0x38($v0) /* C1180 8012AA80 0804AAAB */ j .L8012AAAC /* C1184 8012AA84 2404EFFF */ addiu $a0, $zero, -0x1001 glabel L8012AA88_C1188 -/* C1188 8012AA88 3C028015 */ lui $v0, %hi(D_80155D74) -/* C118C 8012AA8C 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C1188 8012AA88 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C118C 8012AA8C 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C1190 8012AA90 8C430038 */ lw $v1, 0x38($v0) /* C1194 8012AA94 0804AAAB */ j .L8012AAAC /* C1198 8012AA98 2404DFFF */ addiu $a0, $zero, -0x2001 glabel L8012AA9C_C119C -/* C119C 8012AA9C 3C028015 */ lui $v0, %hi(D_80155D74) -/* C11A0 8012AAA0 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C119C 8012AA9C 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C11A0 8012AAA0 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C11A4 8012AAA4 8C430038 */ lw $v1, 0x38($v0) /* C11A8 8012AAA8 2404BFFF */ addiu $a0, $zero, -0x4001 .L8012AAAC: @@ -3139,8 +3139,8 @@ glabel L8012AA9C_C119C /* C11B0 8012AAB0 0804AAD1 */ j L8012AB44_C1244 /* C11B4 8012AAB4 AC430038 */ sw $v1, 0x38($v0) glabel L8012AAB8_C11B8 -/* C11B8 8012AAB8 3C048015 */ lui $a0, %hi(D_80155D74) -/* C11BC 8012AABC 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) +/* C11B8 8012AAB8 3C048015 */ lui $a0, %hi(gMessageDrawStatePtr) +/* C11BC 8012AABC 8C845D74 */ lw $a0, %lo(gMessageDrawStatePtr)($a0) /* C11C0 8012AAC0 3C03FFFF */ lui $v1, 0xffff /* C11C4 8012AAC4 8C820038 */ lw $v0, 0x38($a0) /* C11C8 8012AAC8 34637FFF */ ori $v1, $v1, 0x7fff @@ -3149,8 +3149,8 @@ glabel L8012AAB8_C11B8 /* C11D0 8012AAD0 0804AAD1 */ j L8012AB44_C1244 /* C11D4 8012AAD4 AC820038 */ sw $v0, 0x38($a0) glabel L8012AAD8_C11D8 -/* C11D8 8012AAD8 3C048015 */ lui $a0, %hi(D_80155D74) -/* C11DC 8012AADC 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) +/* C11D8 8012AAD8 3C048015 */ lui $a0, %hi(gMessageDrawStatePtr) +/* C11DC 8012AADC 8C845D74 */ lw $a0, %lo(gMessageDrawStatePtr)($a0) /* C11E0 8012AAE0 8C820020 */ lw $v0, 0x20($a0) /* C11E4 8012AAE4 8C83004C */ lw $v1, 0x4c($a0) /* C11E8 8012AAE8 00431021 */ addu $v0, $v0, $v1 @@ -3158,16 +3158,16 @@ glabel L8012AAD8_C11D8 /* C11F0 8012AAF0 10400010 */ beqz $v0, .L8012AB34 /* C11F4 8012AAF4 241900FF */ addiu $t9, $zero, 0xff /* C11F8 8012AAF8 A082002E */ sb $v0, 0x2e($a0) -/* C11FC 8012AAFC 3C038015 */ lui $v1, %hi(D_80155D74) -/* C1200 8012AB00 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) +/* C11FC 8012AAFC 3C038015 */ lui $v1, %hi(gMessageDrawStatePtr) +/* C1200 8012AB00 8C635D74 */ lw $v1, %lo(gMessageDrawStatePtr)($v1) /* C1204 8012AB04 9062002E */ lbu $v0, 0x2e($v1) /* C1208 8012AB08 14590006 */ bne $v0, $t9, .L8012AB24 /* C120C 8012AB0C 00000000 */ nop /* C1210 8012AB10 97C20514 */ lhu $v0, 0x514($fp) /* C1214 8012AB14 00021042 */ srl $v0, $v0, 1 /* C1218 8012AB18 A062002E */ sb $v0, 0x2e($v1) -/* C121C 8012AB1C 3C038015 */ lui $v1, %hi(D_80155D74) -/* C1220 8012AB20 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) +/* C121C 8012AB1C 3C038015 */ lui $v1, %hi(gMessageDrawStatePtr) +/* C1220 8012AB20 8C635D74 */ lw $v1, %lo(gMessageDrawStatePtr)($v1) .L8012AB24: /* C1224 8012AB24 94620034 */ lhu $v0, 0x34($v1) /* C1228 8012AB28 344200C0 */ ori $v0, $v0, 0xc0 @@ -3180,16 +3180,16 @@ glabel L8012AAD8_C11D8 .L8012AB40: /* C1240 8012AB40 A4820034 */ sh $v0, 0x34($a0) glabel L8012AB44_C1244 -/* C1244 8012AB44 3C038015 */ lui $v1, %hi(D_80155D74) -/* C1248 8012AB48 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) +/* C1244 8012AB44 3C038015 */ lui $v1, %hi(gMessageDrawStatePtr) +/* C1248 8012AB48 8C635D74 */ lw $v1, %lo(gMessageDrawStatePtr)($v1) /* C124C 8012AB4C 8C620020 */ lw $v0, 0x20($v1) .L8012AB50: /* C1250 8012AB50 24420002 */ addiu $v0, $v0, 2 /* C1254 8012AB54 0804AFDC */ j L8012BF70_C2670 /* C1258 8012AB58 AC620020 */ sw $v0, 0x20($v1) glabel L8012AB5C_C125C -/* C125C 8012AB5C 3C028015 */ lui $v0, %hi(D_80155D74) -/* C1260 8012AB60 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C125C 8012AB5C 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C1260 8012AB60 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C1264 8012AB64 94420034 */ lhu $v0, 0x34($v0) /* C1268 8012AB68 30420002 */ andi $v0, $v0, 2 /* C126C 8012AB6C 10400010 */ beqz $v0, .L8012ABB0 @@ -3210,8 +3210,8 @@ glabel L8012AB5C_C125C /* C12A8 8012ABA8 2442C500 */ addiu $v0, $v0, %lo(D_8014C500) /* C12AC 8012ABAC AC620004 */ sw $v0, 4($v1) .L8012ABB0: -/* C12B0 8012ABB0 3C058015 */ lui $a1, %hi(D_80155D74) -/* C12B4 8012ABB4 8CA55D74 */ lw $a1, %lo(D_80155D74)($a1) +/* C12B0 8012ABB0 3C058015 */ lui $a1, %hi(gMessageDrawStatePtr) +/* C12B4 8012ABB4 8CA55D74 */ lw $a1, %lo(gMessageDrawStatePtr)($a1) /* C12B8 8012ABB8 C4A00010 */ lwc1 $f0, 0x10($a1) /* C12BC 8012ABBC 94A20034 */ lhu $v0, 0x34($a1) /* C12C0 8012ABC0 C4A20014 */ lwc1 $f2, 0x14($a1) @@ -3230,8 +3230,8 @@ glabel L8012AB5C_C125C /* C12F4 8012ABF4 00441021 */ addu $v0, $v0, $a0 /* C12F8 8012ABF8 A4A20042 */ sh $v0, 0x42($a1) .L8012ABFC: -/* C12FC 8012ABFC 3C048015 */ lui $a0, %hi(D_80155D74) -/* C1300 8012AC00 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) +/* C12FC 8012ABFC 3C048015 */ lui $a0, %hi(gMessageDrawStatePtr) +/* C1300 8012AC00 8C845D74 */ lw $a0, %lo(gMessageDrawStatePtr)($a0) /* C1304 8012AC04 94820034 */ lhu $v0, 0x34($a0) /* C1308 8012AC08 30420040 */ andi $v0, $v0, 0x40 /* C130C 8012AC0C 10400007 */ beqz $v0, .L8012AC2C @@ -3251,8 +3251,8 @@ glabel L8012AB5C_C125C /* C1340 8012AC40 00621821 */ addu $v1, $v1, $v0 /* C1344 8012AC44 00838821 */ addu $s1, $a0, $v1 .L8012AC48: -/* C1348 8012AC48 3C068015 */ lui $a2, %hi(D_80155D74) -/* C134C 8012AC4C 8CC65D74 */ lw $a2, %lo(D_80155D74)($a2) +/* C1348 8012AC48 3C068015 */ lui $a2, %hi(gMessageDrawStatePtr) +/* C134C 8012AC4C 8CC65D74 */ lw $a2, %lo(gMessageDrawStatePtr)($a2) /* C1350 8012AC50 97B8006E */ lhu $t8, 0x6e($sp) /* C1354 8012AC54 97B9007E */ lhu $t9, 0x7e($sp) /* C1358 8012AC58 94C3003C */ lhu $v1, 0x3c($a2) @@ -3262,9 +3262,9 @@ glabel L8012AB5C_C125C /* C1368 8012AC68 00441021 */ addu $v0, $v0, $a0 /* C136C 8012AC6C 00021080 */ sll $v0, $v0, 2 /* C1370 8012AC70 97C4045C */ lhu $a0, 0x45c($fp) -/* C1374 8012AC74 3C08802F */ lui $t0, %hi(D_802EB5A8) +/* C1374 8012AC74 3C08802F */ lui $t0, %hi(gMsgCharsets) /* C1378 8012AC78 01034021 */ addu $t0, $t0, $v1 -/* C137C 8012AC7C 8D08B5A8 */ lw $t0, %lo(D_802EB5A8)($t0) +/* C137C 8012AC7C 8D08B5A8 */ lw $t0, %lo(gMsgCharsets)($t0) /* C1380 8012AC80 00982021 */ addu $a0, $a0, $t8 /* C1384 8012AC84 8D030008 */ lw $v1, 8($t0) /* C1388 8012AC88 97B8008E */ lhu $t8, 0x8e($sp) @@ -3378,8 +3378,8 @@ glabel L8012AB5C_C125C /* C1530 8012AE30 34630010 */ ori $v1, $v1, 0x10 /* C1534 8012AE34 A4C30034 */ sh $v1, 0x34($a2) .L8012AE38: -/* C1538 8012AE38 3C028015 */ lui $v0, %hi(D_80155D74) -/* C153C 8012AE3C 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C1538 8012AE38 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C153C 8012AE3C 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C1540 8012AE40 8C420038 */ lw $v0, 0x38($v0) /* C1544 8012AE44 30420001 */ andi $v0, $v0, 1 /* C1548 8012AE48 10400011 */ beqz $v0, .L8012AE90 @@ -3401,8 +3401,8 @@ glabel L8012AB5C_C125C /* C1588 8012AE88 00431023 */ subu $v0, $v0, $v1 /* C158C 8012AE8C 02629821 */ addu $s3, $s3, $v0 .L8012AE90: -/* C1590 8012AE90 3C048015 */ lui $a0, %hi(D_80155D74) -/* C1594 8012AE94 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) +/* C1590 8012AE90 3C048015 */ lui $a0, %hi(gMessageDrawStatePtr) +/* C1594 8012AE94 8C845D74 */ lw $a0, %lo(gMessageDrawStatePtr)($a0) /* C1598 8012AE98 8C820038 */ lw $v0, 0x38($a0) /* C159C 8012AE9C 30420002 */ andi $v0, $v0, 2 /* C15A0 8012AEA0 10400063 */ beqz $v0, .L8012B030 @@ -3449,8 +3449,8 @@ glabel L8012AB5C_C125C /* C1644 8012AF44 00102400 */ sll $a0, $s0, 0x10 /* C1648 8012AF48 0C00A4F5 */ jal cosine /* C164C 8012AF4C 00042403 */ sra $a0, $a0, 0x10 -/* C1650 8012AF50 3C028015 */ lui $v0, %hi(D_80155D74) -/* C1654 8012AF54 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C1650 8012AF50 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C1654 8012AF54 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C1658 8012AF58 C4420010 */ lwc1 $f2, 0x10($v0) /* C165C 8012AF5C 3C013FF0 */ lui $at, 0x3ff0 /* C1660 8012AF60 44816800 */ mtc1 $at, $f13 @@ -3485,8 +3485,8 @@ glabel L8012AB5C_C125C /* C16D4 8012AFD4 44116000 */ mfc1 $s1, $f12 /* C16D8 8012AFD8 0C00A4F5 */ jal cosine /* C16DC 8012AFDC 00042403 */ sra $a0, $a0, 0x10 -/* C16E0 8012AFE0 3C028015 */ lui $v0, %hi(D_80155D74) -/* C16E4 8012AFE4 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C16E0 8012AFE0 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C16E4 8012AFE4 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C16E8 8012AFE8 C4420014 */ lwc1 $f2, 0x14($v0) /* C16EC 8012AFEC 3C013FF0 */ lui $at, 0x3ff0 /* C16F0 8012AFF0 44816800 */ mtc1 $at, $f13 @@ -3506,8 +3506,8 @@ glabel L8012AB5C_C125C /* C1728 8012B028 4620130D */ trunc.w.d $f12, $f2 /* C172C 8012B02C 44136000 */ mfc1 $s3, $f12 .L8012B030: -/* C1730 8012B030 3C038015 */ lui $v1, %hi(D_80155D74) -/* C1734 8012B034 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) +/* C1730 8012B030 3C038015 */ lui $v1, %hi(gMessageDrawStatePtr) +/* C1734 8012B034 8C635D74 */ lw $v1, %lo(gMessageDrawStatePtr)($v1) /* C1738 8012B038 8C620038 */ lw $v0, 0x38($v1) /* C173C 8012B03C 30420200 */ andi $v0, $v0, 0x200 /* C1740 8012B040 1040005A */ beqz $v0, .L8012B1AC @@ -3545,8 +3545,8 @@ glabel L8012AB5C_C125C /* C17C0 8012B0C0 00102400 */ sll $a0, $s0, 0x10 /* C17C4 8012B0C4 0C00A4F5 */ jal cosine /* C17C8 8012B0C8 00042403 */ sra $a0, $a0, 0x10 -/* C17CC 8012B0CC 3C028015 */ lui $v0, %hi(D_80155D74) -/* C17D0 8012B0D0 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C17CC 8012B0CC 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C17D0 8012B0D0 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C17D4 8012B0D4 C4420010 */ lwc1 $f2, 0x10($v0) /* C17D8 8012B0D8 3C013FF0 */ lui $at, 0x3ff0 /* C17DC 8012B0DC 44816800 */ mtc1 $at, $f13 @@ -3581,8 +3581,8 @@ glabel L8012AB5C_C125C /* C1850 8012B150 44116000 */ mfc1 $s1, $f12 /* C1854 8012B154 0C00A4F5 */ jal cosine /* C1858 8012B158 00042403 */ sra $a0, $a0, 0x10 -/* C185C 8012B15C 3C028015 */ lui $v0, %hi(D_80155D74) -/* C1860 8012B160 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C185C 8012B15C 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C1860 8012B160 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C1864 8012B164 C4420014 */ lwc1 $f2, 0x14($v0) /* C1868 8012B168 3C013FF0 */ lui $at, 0x3ff0 /* C186C 8012B16C 44816800 */ mtc1 $at, $f13 @@ -3602,8 +3602,8 @@ glabel L8012AB5C_C125C /* C18A4 8012B1A4 4620130D */ trunc.w.d $f12, $f2 /* C18A8 8012B1A8 44136000 */ mfc1 $s3, $f12 .L8012B1AC: -/* C18AC 8012B1AC 3C058015 */ lui $a1, %hi(D_80155D74) -/* C18B0 8012B1B0 8CA55D74 */ lw $a1, %lo(D_80155D74)($a1) +/* C18AC 8012B1AC 3C058015 */ lui $a1, %hi(gMessageDrawStatePtr) +/* C18B0 8012B1B0 8CA55D74 */ lw $a1, %lo(gMessageDrawStatePtr)($a1) /* C18B4 8012B1B4 8CA60038 */ lw $a2, 0x38($a1) /* C18B8 8012B1B8 30C20040 */ andi $v0, $a2, 0x40 /* C18BC 8012B1BC 10400019 */ beqz $v0, .L8012B224 @@ -3698,8 +3698,8 @@ glabel L8012AB5C_C125C /* C1A10 8012B310 4620230D */ trunc.w.d $f12, $f4 /* C1A14 8012B314 44126000 */ mfc1 $s2, $f12 .L8012B318: -/* C1A18 8012B318 3C028015 */ lui $v0, %hi(D_80155D74) -/* C1A1C 8012B31C 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) +/* C1A18 8012B318 3C028015 */ lui $v0, %hi(gMessageDrawStatePtr) +/* C1A1C 8012B31C 8C425D74 */ lw $v0, %lo(gMessageDrawStatePtr)($v0) /* C1A20 8012B320 94420034 */ lhu $v0, 0x34($v0) /* C1A24 8012B324 30420002 */ andi $v0, $v0, 2 /* C1A28 8012B328 14400005 */ bnez $v0, .L8012B340 @@ -3817,8 +3817,8 @@ glabel L8012AB5C_C125C .L8012B4C8: /* C1BC8 8012B4C8 18400288 */ blez $v0, .L8012BEEC /* C1BCC 8012B4CC 00000000 */ nop -/* C1BD0 8012B4D0 3C068015 */ lui $a2, %hi(D_80155D74) -/* C1BD4 8012B4D4 8CC65D74 */ lw $a2, %lo(D_80155D74)($a2) +/* C1BD0 8012B4D0 3C068015 */ lui $a2, %hi(gMessageDrawStatePtr) +/* C1BD4 8012B4D4 8CC65D74 */ lw $a2, %lo(gMessageDrawStatePtr)($a2) /* C1BD8 8012B4D8 8CC30038 */ lw $v1, 0x38($a2) /* C1BDC 8012B4DC 30620800 */ andi $v0, $v1, 0x800 /* C1BE0 8012B4E0 10400092 */ beqz $v0, .L8012B72C @@ -3878,8 +3878,8 @@ glabel L8012AB5C_C125C /* C1CB8 8012B5B8 0804ADC5 */ j .L8012B714 /* C1CBC 8012B5BC E4C6001C */ swc1 $f6, 0x1c($a2) .L8012B5C0: -/* C1CC0 8012B5C0 3C048015 */ lui $a0, %hi(D_80155D74) -/* C1CC4 8012B5C4 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) +/* C1CC0 8012B5C0 3C048015 */ lui $a0, %hi(gMessageDrawStatePtr) +/* C1CC4 8012B5C4 8C845D74 */ lw $a0, %lo(gMessageDrawStatePtr)($a0) /* C1CC8 8012B5C8 8C820020 */ lw $v0, 0x20($a0) /* C1CCC 8012B5CC 8C83004C */ lw $v1, 0x4c($a0) /* C1CD0 8012B5D0 00431021 */ addu $v0, $v0, $v1 @@ -4013,8 +4013,8 @@ glabel L8012AB5C_C125C /* C1EC4 8012B7C4 0804AEF7 */ j .L8012BBDC /* C1EC8 8012B7C8 E4C2001C */ swc1 $f2, 0x1c($a2) .L8012B7CC: -/* C1ECC 8012B7CC 3C048015 */ lui $a0, %hi(D_80155D74) -/* C1ED0 8012B7D0 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) +/* C1ECC 8012B7CC 3C048015 */ lui $a0, %hi(gMessageDrawStatePtr) +/* C1ED0 8012B7D0 8C845D74 */ lw $a0, %lo(gMessageDrawStatePtr)($a0) /* C1ED4 8012B7D4 8C820020 */ lw $v0, 0x20($a0) /* C1ED8 8012B7D8 8C83004C */ lw $v1, 0x4c($a0) /* C1EDC 8012B7DC 00431021 */ addu $v0, $v0, $v1 @@ -4128,8 +4128,8 @@ glabel L8012AB5C_C125C /* C2084 8012B984 00000000 */ nop /* C2088 8012B988 46241102 */ mul.d $f4, $f2, $f4 /* C208C 8012B98C 00000000 */ nop -/* C2090 8012B990 3C038015 */ lui $v1, %hi(D_80155D74) -/* C2094 8012B994 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) +/* C2090 8012B990 3C038015 */ lui $v1, %hi(gMessageDrawStatePtr) +/* C2094 8012B994 8C635D74 */ lw $v1, %lo(gMessageDrawStatePtr)($v1) /* C2098 8012B998 C4600010 */ lwc1 $f0, 0x10($v1) /* C209C 8012B99C 46080002 */ mul.s $f0, $f0, $f8 /* C20A0 8012B9A0 00000000 */ nop @@ -4203,8 +4203,8 @@ glabel L8012AB5C_C125C /* C21AC 8012BAAC 00000000 */ nop /* C21B0 8012BAB0 46241102 */ mul.d $f4, $f2, $f4 /* C21B4 8012BAB4 00000000 */ nop -/* C21B8 8012BAB8 3C038015 */ lui $v1, %hi(D_80155D74) -/* C21BC 8012BABC 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) +/* C21B8 8012BAB8 3C038015 */ lui $v1, %hi(gMessageDrawStatePtr) +/* C21BC 8012BABC 8C635D74 */ lw $v1, %lo(gMessageDrawStatePtr)($v1) /* C21C0 8012BAC0 C4600010 */ lwc1 $f0, 0x10($v1) /* C21C4 8012BAC4 46080002 */ mul.s $f0, $f0, $f8 /* C21C8 8012BAC8 00000000 */ nop @@ -4248,8 +4248,8 @@ glabel L8012AB5C_C125C /* C225C 8012BB5C 00000000 */ nop /* C2260 8012BB60 462C0002 */ mul.d $f0, $f0, $f12 /* C2264 8012BB64 00000000 */ nop -/* C2268 8012BB68 3C038015 */ lui $v1, %hi(D_80155D74) -/* C226C 8012BB6C 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) +/* C2268 8012BB68 3C038015 */ lui $v1, %hi(gMessageDrawStatePtr) +/* C226C 8012BB6C 8C635D74 */ lw $v1, %lo(gMessageDrawStatePtr)($v1) /* C2270 8012BB70 C4620010 */ lwc1 $f2, 0x10($v1) /* C2274 8012BB74 46081082 */ mul.s $f2, $f2, $f8 /* C2278 8012BB78 00000000 */ nop @@ -4329,15 +4329,15 @@ glabel L8012BC6C_C236C /* C2378 8012BC78 00191400 */ sll $v0, $t9, 0x10 /* C237C 8012BC7C 10620007 */ beq $v1, $v0, .L8012BC9C /* C2380 8012BC80 00033C03 */ sra $a3, $v1, 0x10 -/* C2384 8012BC84 3C038015 */ lui $v1, %hi(D_80155D74) -/* C2388 8012BC88 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) +/* C2384 8012BC84 3C038015 */ lui $v1, %hi(gMessageDrawStatePtr) +/* C2388 8012BC88 8C635D74 */ lw $v1, %lo(gMessageDrawStatePtr)($v1) /* C238C 8012BC8C 94620034 */ lhu $v0, 0x34($v1) /* C2390 8012BC90 A7B8009E */ sh $t8, 0x9e($sp) /* C2394 8012BC94 34420010 */ ori $v0, $v0, 0x10 /* C2398 8012BC98 A4620034 */ sh $v0, 0x34($v1) .L8012BC9C: -/* C239C 8012BC9C 3C058015 */ lui $a1, %hi(D_80155D74) -/* C23A0 8012BCA0 8CA55D74 */ lw $a1, %lo(D_80155D74)($a1) +/* C239C 8012BC9C 3C058015 */ lui $a1, %hi(gMessageDrawStatePtr) +/* C23A0 8012BCA0 8CA55D74 */ lw $a1, %lo(gMessageDrawStatePtr)($a1) /* C23A4 8012BCA4 8CA20038 */ lw $v0, 0x38($a1) /* C23A8 8012BCA8 30428000 */ andi $v0, $v0, 0x8000 /* C23AC 8012BCAC 10400047 */ beqz $v0, .L8012BDCC @@ -4410,8 +4410,8 @@ glabel L8012BC6C_C236C /* C24B8 8012BDB8 AEE20000 */ sw $v0, ($s7) /* C24BC 8012BDBC AC660008 */ sw $a2, 8($v1) /* C24C0 8012BDC0 AC65000C */ sw $a1, 0xc($v1) -/* C24C4 8012BDC4 3C058015 */ lui $a1, %hi(D_80155D74) -/* C24C8 8012BDC8 8CA55D74 */ lw $a1, %lo(D_80155D74)($a1) +/* C24C4 8012BDC4 3C058015 */ lui $a1, %hi(gMessageDrawStatePtr) +/* C24C8 8012BDC8 8CA55D74 */ lw $a1, %lo(gMessageDrawStatePtr)($a1) .L8012BDCC: /* C24CC 8012BDCC 8CA20038 */ lw $v0, 0x38($a1) /* C24D0 8012BDD0 30420020 */ andi $v0, $v0, 0x20 @@ -4456,8 +4456,8 @@ glabel L8012BC6C_C236C /* C2564 8012BE64 03C0202D */ daddu $a0, $fp, $zero .L8012BE68: /* C2568 8012BE68 26520001 */ addiu $s2, $s2, 1 -/* C256C 8012BE6C 3C058015 */ lui $a1, %hi(D_80155D74) -/* C2570 8012BE70 8CA55D74 */ lw $a1, %lo(D_80155D74)($a1) +/* C256C 8012BE6C 3C058015 */ lui $a1, %hi(gMessageDrawStatePtr) +/* C2570 8012BE70 8CA55D74 */ lw $a1, %lo(gMessageDrawStatePtr)($a1) /* C2574 8012BE74 97B900A6 */ lhu $t9, 0xa6($sp) /* C2578 8012BE78 8CA2004C */ lw $v0, 0x4c($a1) /* C257C 8012BE7C 8CA30020 */ lw $v1, 0x20($a1) @@ -4490,16 +4490,16 @@ glabel L8012BC6C_C236C /* C25E4 8012BEE4 0C04B0C9 */ jal msg_draw_char /* C25E8 8012BEE8 AFA20014 */ sw $v0, 0x14($sp) .L8012BEEC: -/* C25EC 8012BEEC 3C048015 */ lui $a0, %hi(D_80155D74) -/* C25F0 8012BEF0 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) +/* C25EC 8012BEEC 3C048015 */ lui $a0, %hi(gMessageDrawStatePtr) +/* C25F0 8012BEF0 8C845D74 */ lw $a0, %lo(gMessageDrawStatePtr)($a0) /* C25F4 8012BEF4 94830034 */ lhu $v1, 0x34($a0) /* C25F8 8012BEF8 30620002 */ andi $v0, $v1, 2 /* C25FC 8012BEFC 10400002 */ beqz $v0, .L8012BF08 /* C2600 8012BF00 3062FFFD */ andi $v0, $v1, 0xfffd /* C2604 8012BF04 A4820034 */ sh $v0, 0x34($a0) .L8012BF08: -/* C2608 8012BF08 3C038015 */ lui $v1, %hi(D_80155D74) -/* C260C 8012BF0C 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) +/* C2608 8012BF08 3C038015 */ lui $v1, %hi(gMessageDrawStatePtr) +/* C260C 8012BF0C 8C635D74 */ lw $v1, %lo(gMessageDrawStatePtr)($v1) /* C2610 8012BF10 8C620030 */ lw $v0, 0x30($v1) /* C2614 8012BF14 8C64004C */ lw $a0, 0x4c($v1) /* C2618 8012BF18 8C650020 */ lw $a1, 0x20($v1) @@ -4517,8 +4517,8 @@ glabel L8012BC6C_C236C .L8012BF48: /* C2648 8012BF48 0C04977D */ jal msg_get_draw_char_width /* C264C 8012BF4C 00000000 */ nop -/* C2650 8012BF50 3C058015 */ lui $a1, %hi(D_80155D74) -/* C2654 8012BF54 8CA55D74 */ lw $a1, %lo(D_80155D74)($a1) +/* C2650 8012BF50 3C058015 */ lui $a1, %hi(gMessageDrawStatePtr) +/* C2654 8012BF54 8CA55D74 */ lw $a1, %lo(gMessageDrawStatePtr)($a1) /* C2658 8012BF58 94A30042 */ lhu $v1, 0x42($a1) /* C265C 8012BF5C 8CA40020 */ lw $a0, 0x20($a1) /* C2660 8012BF60 00621821 */ addu $v1, $v1, $v0 diff --git a/ver/us/asm/nonmatchings/msg/appendGfx_msg_prim_rect.s b/ver/us/asm/nonmatchings/msg/appendGfx_msg_prim_rect.s deleted file mode 100644 index d06a978b7a..0000000000 --- a/ver/us/asm/nonmatchings/msg/appendGfx_msg_prim_rect.s +++ /dev/null @@ -1,137 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel appendGfx_msg_prim_rect -/* C3108 8012CA08 0080502D */ daddu $t2, $a0, $zero -/* C310C 8012CA0C 00A0582D */ daddu $t3, $a1, $zero -/* C3110 8012CA10 3C09800A */ lui $t1, %hi(gMasterGfxPos) -/* C3114 8012CA14 2529A66C */ addiu $t1, $t1, %lo(gMasterGfxPos) -/* C3118 8012CA18 3C02E700 */ lui $v0, 0xe700 -/* C311C 8012CA1C 8D280000 */ lw $t0, ($t1) -/* C3120 8012CA20 97AF0012 */ lhu $t7, 0x12($sp) -/* C3124 8012CA24 97B80016 */ lhu $t8, 0x16($sp) -/* C3128 8012CA28 97AD001A */ lhu $t5, 0x1a($sp) -/* C312C 8012CA2C 97AE001E */ lhu $t6, 0x1e($sp) -/* C3130 8012CA30 0100182D */ daddu $v1, $t0, $zero -/* C3134 8012CA34 25080008 */ addiu $t0, $t0, 8 -/* C3138 8012CA38 AD280000 */ sw $t0, ($t1) -/* C313C 8012CA3C AC620000 */ sw $v0, ($v1) -/* C3140 8012CA40 AC600004 */ sw $zero, 4($v1) -/* C3144 8012CA44 30E300FF */ andi $v1, $a3, 0xff -/* C3148 8012CA48 240200FF */ addiu $v0, $zero, 0xff -/* C314C 8012CA4C 1462000A */ bne $v1, $v0, .L8012CA78 -/* C3150 8012CA50 00C0602D */ daddu $t4, $a2, $zero -/* C3154 8012CA54 3C04FCFF */ lui $a0, 0xfcff -/* C3158 8012CA58 3484FFFF */ ori $a0, $a0, 0xffff -/* C315C 8012CA5C 3C03FFFD */ lui $v1, 0xfffd -/* C3160 8012CA60 3463FCFE */ ori $v1, $v1, 0xfcfe -/* C3164 8012CA64 25020008 */ addiu $v0, $t0, 8 -/* C3168 8012CA68 AD220000 */ sw $v0, ($t1) -/* C316C 8012CA6C AD040000 */ sw $a0, ($t0) -/* C3170 8012CA70 0804B2AE */ j .L8012CAB8 -/* C3174 8012CA74 AD030004 */ sw $v1, 4($t0) -.L8012CA78: -/* C3178 8012CA78 3C05E200 */ lui $a1, 0xe200 -/* C317C 8012CA7C 34A5001C */ ori $a1, $a1, 0x1c -/* C3180 8012CA80 3C030050 */ lui $v1, 0x50 -/* C3184 8012CA84 34634240 */ ori $v1, $v1, 0x4240 -/* C3188 8012CA88 3C06FCFF */ lui $a2, 0xfcff -/* C318C 8012CA8C 34C6FFFF */ ori $a2, $a2, 0xffff -/* C3190 8012CA90 3C04FFFD */ lui $a0, 0xfffd -/* C3194 8012CA94 3484F6FB */ ori $a0, $a0, 0xf6fb -/* C3198 8012CA98 25020008 */ addiu $v0, $t0, 8 -/* C319C 8012CA9C AD220000 */ sw $v0, ($t1) -/* C31A0 8012CAA0 25020010 */ addiu $v0, $t0, 0x10 -/* C31A4 8012CAA4 AD050000 */ sw $a1, ($t0) -/* C31A8 8012CAA8 AD030004 */ sw $v1, 4($t0) -/* C31AC 8012CAAC AD220000 */ sw $v0, ($t1) -/* C31B0 8012CAB0 AD060008 */ sw $a2, 8($t0) -/* C31B4 8012CAB4 AD04000C */ sw $a0, 0xc($t0) -.L8012CAB8: -/* C31B8 8012CAB8 3C06E200 */ lui $a2, 0xe200 -/* C31BC 8012CABC 34C6001C */ ori $a2, $a2, 0x1c -/* C31C0 8012CAC0 3C050F0A */ lui $a1, 0xf0a -/* C31C4 8012CAC4 3C09800A */ lui $t1, %hi(gMasterGfxPos) -/* C31C8 8012CAC8 2529A66C */ addiu $t1, $t1, %lo(gMasterGfxPos) -/* C31CC 8012CACC 34A57008 */ ori $a1, $a1, 0x7008 -/* C31D0 8012CAD0 3C02FA00 */ lui $v0, 0xfa00 -/* C31D4 8012CAD4 8D280000 */ lw $t0, ($t1) -/* C31D8 8012CAD8 000A1E00 */ sll $v1, $t2, 0x18 -/* C31DC 8012CADC 0100202D */ daddu $a0, $t0, $zero -/* C31E0 8012CAE0 25080008 */ addiu $t0, $t0, 8 -/* C31E4 8012CAE4 AD280000 */ sw $t0, ($t1) -/* C31E8 8012CAE8 AC820000 */ sw $v0, ($a0) -/* C31EC 8012CAEC 316200FF */ andi $v0, $t3, 0xff -/* C31F0 8012CAF0 00021400 */ sll $v0, $v0, 0x10 -/* C31F4 8012CAF4 00621825 */ or $v1, $v1, $v0 -/* C31F8 8012CAF8 318200FF */ andi $v0, $t4, 0xff -/* C31FC 8012CAFC 00021200 */ sll $v0, $v0, 8 -/* C3200 8012CB00 00621825 */ or $v1, $v1, $v0 -/* C3204 8012CB04 30E200FF */ andi $v0, $a3, 0xff -/* C3208 8012CB08 00621825 */ or $v1, $v1, $v0 -/* C320C 8012CB0C 25020008 */ addiu $v0, $t0, 8 -/* C3210 8012CB10 AC830004 */ sw $v1, 4($a0) -/* C3214 8012CB14 31A403FF */ andi $a0, $t5, 0x3ff -/* C3218 8012CB18 00042380 */ sll $a0, $a0, 0xe -/* C321C 8012CB1C AD220000 */ sw $v0, ($t1) -/* C3220 8012CB20 31C203FF */ andi $v0, $t6, 0x3ff -/* C3224 8012CB24 00021080 */ sll $v0, $v0, 2 -/* C3228 8012CB28 3C03F600 */ lui $v1, 0xf600 -/* C322C 8012CB2C 00431025 */ or $v0, $v0, $v1 -/* C3230 8012CB30 00822025 */ or $a0, $a0, $v0 -/* C3234 8012CB34 31E303FF */ andi $v1, $t7, 0x3ff -/* C3238 8012CB38 00031B80 */ sll $v1, $v1, 0xe -/* C323C 8012CB3C 330203FF */ andi $v0, $t8, 0x3ff -/* C3240 8012CB40 00021080 */ sll $v0, $v0, 2 -/* C3244 8012CB44 00621825 */ or $v1, $v1, $v0 -/* C3248 8012CB48 25020010 */ addiu $v0, $t0, 0x10 -/* C324C 8012CB4C AD040000 */ sw $a0, ($t0) -/* C3250 8012CB50 AD030004 */ sw $v1, 4($t0) -/* C3254 8012CB54 AD220000 */ sw $v0, ($t1) -/* C3258 8012CB58 3C038015 */ lui $v1, %hi(D_80155D74) -/* C325C 8012CB5C 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) -/* C3260 8012CB60 3C02E700 */ lui $v0, 0xe700 -/* C3264 8012CB64 AD020008 */ sw $v0, 8($t0) -/* C3268 8012CB68 25020018 */ addiu $v0, $t0, 0x18 -/* C326C 8012CB6C AD00000C */ sw $zero, 0xc($t0) -/* C3270 8012CB70 AD220000 */ sw $v0, ($t1) -/* C3274 8012CB74 AD060010 */ sw $a2, 0x10($t0) -/* C3278 8012CB78 AD050014 */ sw $a1, 0x14($t0) -/* C327C 8012CB7C 90630029 */ lbu $v1, 0x29($v1) -/* C3280 8012CB80 10600005 */ beqz $v1, .L8012CB98 -/* C3284 8012CB84 24020001 */ addiu $v0, $zero, 1 -/* C3288 8012CB88 1062000C */ beq $v1, $v0, .L8012CBBC -/* C328C 8012CB8C 3C06FCFF */ lui $a2, 0xfcff -/* C3290 8012CB90 0804B2F7 */ j .L8012CBDC -/* C3294 8012CB94 34C6FFFF */ ori $a2, $a2, 0xffff -.L8012CB98: -/* C3298 8012CB98 3C04FCFF */ lui $a0, 0xfcff -/* C329C 8012CB9C 3484FFFF */ ori $a0, $a0, 0xffff -/* C32A0 8012CBA0 3C03FFFC */ lui $v1, 0xfffc -/* C32A4 8012CBA4 3463F279 */ ori $v1, $v1, 0xf279 -/* C32A8 8012CBA8 25020020 */ addiu $v0, $t0, 0x20 -/* C32AC 8012CBAC AD220000 */ sw $v0, ($t1) -/* C32B0 8012CBB0 AD040018 */ sw $a0, 0x18($t0) -/* C32B4 8012CBB4 03E00008 */ jr $ra -/* C32B8 8012CBB8 AD03001C */ sw $v1, 0x1c($t0) -.L8012CBBC: -/* C32BC 8012CBBC 3C02FC11 */ lui $v0, 0xfc11 -/* C32C0 8012CBC0 3442FE23 */ ori $v0, $v0, 0xfe23 -/* C32C4 8012CBC4 25030020 */ addiu $v1, $t0, 0x20 -/* C32C8 8012CBC8 AD230000 */ sw $v1, ($t1) -/* C32CC 8012CBCC AD020018 */ sw $v0, 0x18($t0) -/* C32D0 8012CBD0 2402F3F9 */ addiu $v0, $zero, -0xc07 -/* C32D4 8012CBD4 03E00008 */ jr $ra -/* C32D8 8012CBD8 AD02001C */ sw $v0, 0x1c($t0) -.L8012CBDC: -/* C32DC 8012CBDC 3C05FFFC */ lui $a1, 0xfffc -/* C32E0 8012CBE0 3C04800A */ lui $a0, %hi(gMasterGfxPos) -/* C32E4 8012CBE4 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) -/* C32E8 8012CBE8 8C820000 */ lw $v0, ($a0) -/* C32EC 8012CBEC 34A5F279 */ ori $a1, $a1, 0xf279 -/* C32F0 8012CBF0 0040182D */ daddu $v1, $v0, $zero -/* C32F4 8012CBF4 24420008 */ addiu $v0, $v0, 8 -/* C32F8 8012CBF8 AC820000 */ sw $v0, ($a0) -/* C32FC 8012CBFC AC660000 */ sw $a2, ($v1) -/* C3300 8012CC00 03E00008 */ jr $ra -/* C3304 8012CC04 AC650004 */ sw $a1, 4($v1) diff --git a/ver/us/asm/nonmatchings/msg/draw_digit.s b/ver/us/asm/nonmatchings/msg/draw_digit.s index 1b18856b77..213bb32db9 100644 --- a/ver/us/asm/nonmatchings/msg/draw_digit.s +++ b/ver/us/asm/nonmatchings/msg/draw_digit.s @@ -4,8 +4,8 @@ glabel draw_digit /* BDBC0 801274C0 3C0A800A */ lui $t2, %hi(gMasterGfxPos) /* BDBC4 801274C4 254AA66C */ addiu $t2, $t2, %lo(gMasterGfxPos) -/* BDBC8 801274C8 3C028015 */ lui $v0, %hi(D_8014C340) -/* BDBCC 801274CC 2442C340 */ addiu $v0, $v0, %lo(D_8014C340) +/* BDBC8 801274C8 3C028015 */ lui $v0, %hi(gMsgNumbers) +/* BDBCC 801274CC 2442C340 */ addiu $v0, $v0, %lo(gMsgNumbers) /* BDBD0 801274D0 00054880 */ sll $t1, $a1, 2 /* BDBD4 801274D4 01254821 */ addu $t1, $t1, $a1 /* BDBD8 801274D8 00094880 */ sll $t1, $t1, 2 diff --git a/ver/us/asm/nonmatchings/msg/draw_message_window.s b/ver/us/asm/nonmatchings/msg/draw_message_window.s deleted file mode 100644 index cdd0cb1a99..0000000000 --- a/ver/us/asm/nonmatchings/msg/draw_message_window.s +++ /dev/null @@ -1,134 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel draw_message_window -/* BE2A4 80127BA4 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* BE2A8 80127BA8 0080402D */ daddu $t0, $a0, $zero -/* BE2AC 80127BAC 2402000D */ addiu $v0, $zero, 0xd -/* BE2B0 80127BB0 AFBF0050 */ sw $ra, 0x50($sp) -/* BE2B4 80127BB4 910304F8 */ lbu $v1, 0x4f8($t0) -/* BE2B8 80127BB8 3C013F80 */ lui $at, 0x3f80 -/* BE2BC 80127BBC 44810000 */ mtc1 $at, $f0 -/* BE2C0 80127BC0 10620006 */ beq $v1, $v0, .L80127BDC -/* BE2C4 80127BC4 0000482D */ daddu $t1, $zero, $zero -/* BE2C8 80127BC8 2402000E */ addiu $v0, $zero, 0xe -/* BE2CC 80127BCC 1062001D */ beq $v1, $v0, .L80127C44 -/* BE2D0 80127BD0 2862000F */ slti $v0, $v1, 0xf -/* BE2D4 80127BD4 08049F2B */ j .L80127CAC -/* BE2D8 80127BD8 00000000 */ nop -.L80127BDC: -/* BE2DC 80127BDC 24050004 */ addiu $a1, $zero, 4 -/* BE2E0 80127BE0 91030509 */ lbu $v1, 0x509($t0) -/* BE2E4 80127BE4 3C014059 */ lui $at, 0x4059 -/* BE2E8 80127BE8 44811800 */ mtc1 $at, $f3 -/* BE2EC 80127BEC 44801000 */ mtc1 $zero, $f2 -/* BE2F0 80127BF0 00A32023 */ subu $a0, $a1, $v1 -/* BE2F4 80127BF4 00041040 */ sll $v0, $a0, 1 -/* BE2F8 80127BF8 00444821 */ addu $t1, $v0, $a0 -/* BE2FC 80127BFC 3C028015 */ lui $v0, %hi(D_8014C580) -/* BE300 80127C00 00431021 */ addu $v0, $v0, $v1 -/* BE304 80127C04 9042C580 */ lbu $v0, %lo(D_8014C580)($v0) -/* BE308 80127C08 24630001 */ addiu $v1, $v1, 1 -/* BE30C 80127C0C A1030509 */ sb $v1, 0x509($t0) -/* BE310 80127C10 44820000 */ mtc1 $v0, $f0 -/* BE314 80127C14 00000000 */ nop -/* BE318 80127C18 46800020 */ cvt.s.w $f0, $f0 -/* BE31C 80127C1C 46000021 */ cvt.d.s $f0, $f0 -/* BE320 80127C20 306200FF */ andi $v0, $v1, 0xff -/* BE324 80127C24 46220003 */ div.d $f0, $f0, $f2 -/* BE328 80127C28 3C018015 */ lui $at, %hi(D_8014C580) -/* BE32C 80127C2C 00220821 */ addu $at, $at, $v0 -/* BE330 80127C30 9022C580 */ lbu $v0, %lo(D_8014C580)($at) -/* BE334 80127C34 1440001B */ bnez $v0, .L80127CA4 -/* BE338 80127C38 46200020 */ cvt.s.d $f0, $f0 -/* BE33C 80127C3C 08049F29 */ j .L80127CA4 -/* BE340 80127C40 A10504F8 */ sb $a1, 0x4f8($t0) -.L80127C44: -/* BE344 80127C44 91020512 */ lbu $v0, 0x512($t0) -/* BE348 80127C48 3C014059 */ lui $at, 0x4059 -/* BE34C 80127C4C 44811800 */ mtc1 $at, $f3 -/* BE350 80127C50 44801000 */ mtc1 $zero, $f2 -/* BE354 80127C54 00024823 */ negu $t1, $v0 -/* BE358 80127C58 3C038015 */ lui $v1, %hi(D_8014C588) -/* BE35C 80127C5C 00621821 */ addu $v1, $v1, $v0 -/* BE360 80127C60 9063C588 */ lbu $v1, %lo(D_8014C588)($v1) -/* BE364 80127C64 24420001 */ addiu $v0, $v0, 1 -/* BE368 80127C68 A1020512 */ sb $v0, 0x512($t0) -/* BE36C 80127C6C 304200FF */ andi $v0, $v0, 0xff -/* BE370 80127C70 3C018015 */ lui $at, %hi(D_8014C588) -/* BE374 80127C74 00220821 */ addu $at, $at, $v0 -/* BE378 80127C78 9022C588 */ lbu $v0, %lo(D_8014C588)($at) -/* BE37C 80127C7C 44830000 */ mtc1 $v1, $f0 -/* BE380 80127C80 00000000 */ nop -/* BE384 80127C84 46800020 */ cvt.s.w $f0, $f0 -/* BE388 80127C88 46000021 */ cvt.d.s $f0, $f0 -/* BE38C 80127C8C 46220003 */ div.d $f0, $f0, $f2 -/* BE390 80127C90 14400004 */ bnez $v0, .L80127CA4 -/* BE394 80127C94 46200020 */ cvt.s.d $f0, $f0 -/* BE398 80127C98 8D0204FC */ lw $v0, 0x4fc($t0) -/* BE39C 80127C9C 34420001 */ ori $v0, $v0, 1 -/* BE3A0 80127CA0 AD0204FC */ sw $v0, 0x4fc($t0) -.L80127CA4: -/* BE3A4 80127CA4 910304F8 */ lbu $v1, 0x4f8($t0) -/* BE3A8 80127CA8 2862000F */ slti $v0, $v1, 0xf -.L80127CAC: -/* BE3AC 80127CAC 1040002B */ beqz $v0, .L80127D5C -/* BE3B0 80127CB0 2862000D */ slti $v0, $v1, 0xd -/* BE3B4 80127CB4 1440002A */ bnez $v0, .L80127D60 -/* BE3B8 80127CB8 0100202D */ daddu $a0, $t0, $zero -/* BE3BC 80127CBC 24040001 */ addiu $a0, $zero, 1 -/* BE3C0 80127CC0 24070038 */ addiu $a3, $zero, 0x38 -/* BE3C4 80127CC4 95030514 */ lhu $v1, 0x514($t0) -/* BE3C8 80127CC8 240200A0 */ addiu $v0, $zero, 0xa0 -/* BE3CC 80127CCC 00831806 */ srlv $v1, $v1, $a0 -/* BE3D0 80127CD0 00431023 */ subu $v0, $v0, $v1 -/* BE3D4 80127CD4 A502045A */ sh $v0, 0x45a($t0) -/* BE3D8 80127CD8 8506045A */ lh $a2, 0x45a($t0) -/* BE3DC 80127CDC 00E0102D */ daddu $v0, $a3, $zero -/* BE3E0 80127CE0 A502045C */ sh $v0, 0x45c($t0) -/* BE3E4 80127CE4 AFA00010 */ sw $zero, 0x10($sp) -/* BE3E8 80127CE8 95020514 */ lhu $v0, 0x514($t0) -/* BE3EC 80127CEC 0000282D */ daddu $a1, $zero, $zero -/* BE3F0 80127CF0 AFA20014 */ sw $v0, 0x14($sp) -/* BE3F4 80127CF4 95030516 */ lhu $v1, 0x516($t0) -/* BE3F8 80127CF8 240200FF */ addiu $v0, $zero, 0xff -/* BE3FC 80127CFC E7A00024 */ swc1 $f0, 0x24($sp) -/* BE400 80127D00 E7A00028 */ swc1 $f0, 0x28($sp) -/* BE404 80127D04 44890000 */ mtc1 $t1, $f0 -/* BE408 80127D08 00000000 */ nop -/* BE40C 80127D0C 46800020 */ cvt.s.w $f0, $f0 -/* BE410 80127D10 AFA2001C */ sw $v0, 0x1c($sp) -/* BE414 80127D14 3C028012 */ lui $v0, %hi(drawbox_message_delegate) -/* BE418 80127D18 24427B70 */ addiu $v0, $v0, %lo(drawbox_message_delegate) -/* BE41C 80127D1C AFA20038 */ sw $v0, 0x38($sp) -/* BE420 80127D20 24020140 */ addiu $v0, $zero, 0x140 -/* BE424 80127D24 AFA20044 */ sw $v0, 0x44($sp) -/* BE428 80127D28 240200F0 */ addiu $v0, $zero, 0xf0 -/* BE42C 80127D2C AFA00020 */ sw $zero, 0x20($sp) -/* BE430 80127D30 AFA0002C */ sw $zero, 0x2c($sp) -/* BE434 80127D34 AFA00030 */ sw $zero, 0x30($sp) -/* BE438 80127D38 E7A00034 */ swc1 $f0, 0x34($sp) -/* BE43C 80127D3C AFA8003C */ sw $t0, 0x3c($sp) -/* BE440 80127D40 AFA00040 */ sw $zero, 0x40($sp) -/* BE444 80127D44 AFA20048 */ sw $v0, 0x48($sp) -/* BE448 80127D48 AFA0004C */ sw $zero, 0x4c($sp) -/* BE44C 80127D4C 0C03D4B8 */ jal draw_box -/* BE450 80127D50 AFA30018 */ sw $v1, 0x18($sp) -/* BE454 80127D54 08049F61 */ j .L80127D84 -/* BE458 80127D58 00000000 */ nop -.L80127D5C: -/* BE45C 80127D5C 0100202D */ daddu $a0, $t0, $zero -.L80127D60: -/* BE460 80127D60 84850456 */ lh $a1, 0x456($a0) -/* BE464 80127D64 84860458 */ lh $a2, 0x458($a0) -/* BE468 80127D68 9487046E */ lhu $a3, 0x46e($a0) -/* BE46C 80127D6C 94830462 */ lhu $v1, 0x462($a0) -/* BE470 80127D70 24020004 */ addiu $v0, $zero, 4 -/* BE474 80127D74 AFA20014 */ sw $v0, 0x14($sp) -/* BE478 80127D78 AFA00018 */ sw $zero, 0x18($sp) -/* BE47C 80127D7C 0C049F64 */ jal appendGfx_message -/* BE480 80127D80 AFA30010 */ sw $v1, 0x10($sp) -.L80127D84: -/* BE484 80127D84 8FBF0050 */ lw $ra, 0x50($sp) -/* BE488 80127D88 03E00008 */ jr $ra -/* BE48C 80127D8C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/msg/draw_number.s b/ver/us/asm/nonmatchings/msg/draw_number.s index 7a0eab5850..73f5c2a3ae 100644 --- a/ver/us/asm/nonmatchings/msg/draw_number.s +++ b/ver/us/asm/nonmatchings/msg/draw_number.s @@ -6,8 +6,8 @@ glabel draw_number /* BDDA0 801276A0 AFB200A8 */ sw $s2, 0xa8($sp) /* BDDA4 801276A4 AFB500B4 */ sw $s5, 0xb4($sp) /* BDDA8 801276A8 00E0A82D */ daddu $s5, $a3, $zero -/* BDDAC 801276AC 3C028015 */ lui $v0, %hi(D_8014C340) -/* BDDB0 801276B0 2442C340 */ addiu $v0, $v0, %lo(D_8014C340) +/* BDDAC 801276AC 3C028015 */ lui $v0, %hi(gMsgNumbers) +/* BDDB0 801276B0 2442C340 */ addiu $v0, $v0, %lo(gMsgNumbers) /* BDDB4 801276B4 00151880 */ sll $v1, $s5, 2 /* BDDB8 801276B8 00751821 */ addu $v1, $v1, $s5 /* BDDBC 801276BC 00031880 */ sll $v1, $v1, 2 @@ -69,8 +69,8 @@ glabel draw_number /* BDE90 80127790 06000035 */ bltz $s0, .L80127868 /* BDE94 80127794 00151080 */ sll $v0, $s5, 2 /* BDE98 80127798 32290002 */ andi $t1, $s1, 2 -/* BDE9C 8012779C 3C058015 */ lui $a1, %hi(D_8014C340) -/* BDEA0 801277A0 24A5C340 */ addiu $a1, $a1, %lo(D_8014C340) +/* BDE9C 8012779C 3C058015 */ lui $a1, %hi(gMsgNumbers) +/* BDEA0 801277A0 24A5C340 */ addiu $a1, $a1, %lo(gMsgNumbers) /* BDEA4 801277A4 00551021 */ addu $v0, $v0, $s5 /* BDEA8 801277A8 00022080 */ sll $a0, $v0, 2 /* BDEAC 801277AC 00854021 */ addu $t0, $a0, $a1 @@ -101,8 +101,8 @@ glabel draw_number /* BDF00 80127800 1A600019 */ blez $s3, .L80127868 /* BDF04 80127804 0000802D */ daddu $s0, $zero, $zero /* BDF08 80127808 32290002 */ andi $t1, $s1, 2 -/* BDF0C 8012780C 3C058015 */ lui $a1, %hi(D_8014C340) -/* BDF10 80127810 24A5C340 */ addiu $a1, $a1, %lo(D_8014C340) +/* BDF0C 8012780C 3C058015 */ lui $a1, %hi(gMsgNumbers) +/* BDF10 80127810 24A5C340 */ addiu $a1, $a1, %lo(gMsgNumbers) /* BDF14 80127814 00151080 */ sll $v0, $s5, 2 /* BDF18 80127818 00551021 */ addu $v0, $v0, $s5 /* BDF1C 8012781C 00022080 */ sll $a0, $v0, 2 diff --git a/ver/us/asm/nonmatchings/msg/get_string_properties.s b/ver/us/asm/nonmatchings/msg/get_string_properties.s index b0d06a0144..03614e08e2 100644 --- a/ver/us/asm/nonmatchings/msg/get_string_properties.s +++ b/ver/us/asm/nonmatchings/msg/get_string_properties.s @@ -240,8 +240,8 @@ glabel L80126268_BC968 /* BC96C 8012626C 26100001 */ addiu $s0, $s0, 1 /* BC970 80126270 90440000 */ lbu $a0, ($v0) /* BC974 80126274 0000282D */ daddu $a1, $zero, $zero -/* BC978 80126278 3C098015 */ lui $t1, %hi(D_80155C38) -/* BC97C 8012627C 25295C38 */ addiu $t1, $t1, %lo(D_80155C38) +/* BC978 80126278 3C098015 */ lui $t1, %hi(gMessageStringVars) +/* BC97C 8012627C 25295C38 */ addiu $t1, $t1, %lo(gMessageStringVars) /* BC980 80126280 00042140 */ sll $a0, $a0, 5 /* BC984 80126284 0C04991D */ jal get_string_width /* BC988 80126288 00892021 */ addu $a0, $a0, $t1 @@ -340,9 +340,9 @@ glabel L801262E8_BC9E8 /* BCAC0 801263C0 00000000 */ nop /* BCAC4 801263C4 97A900EE */ lhu $t1, 0xee($sp) /* BCAC8 801263C8 00091080 */ sll $v0, $t1, 2 -/* BCACC 801263CC 3C01802F */ lui $at, %hi(D_802EB5A8) +/* BCACC 801263CC 3C01802F */ lui $at, %hi(gMsgCharsets) /* BCAD0 801263D0 00220821 */ addu $at, $at, $v0 -/* BCAD4 801263D4 8C22B5A8 */ lw $v0, %lo(D_802EB5A8)($at) +/* BCAD4 801263D4 8C22B5A8 */ lw $v0, %lo(gMsgCharsets)($at) /* BCAD8 801263D8 8FA800D8 */ lw $t0, 0xd8($sp) /* BCADC 801263DC 90420003 */ lbu $v0, 3($v0) /* BCAE0 801263E0 01020018 */ mult $t0, $v0 diff --git a/ver/us/asm/nonmatchings/msg/load_message_to_buffer.s b/ver/us/asm/nonmatchings/msg/load_message_to_buffer.s deleted file mode 100644 index 09405df7ce..0000000000 --- a/ver/us/asm/nonmatchings/msg/load_message_to_buffer.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel load_message_to_buffer -/* BBF8C 8012588C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BBF90 80125890 AFB10014 */ sw $s1, 0x14($sp) -/* BBF94 80125894 3C118015 */ lui $s1, %hi(gNextMessageBuffer) -/* BBF98 80125898 2631C296 */ addiu $s1, $s1, %lo(gNextMessageBuffer) -/* BBF9C 8012589C AFBF0018 */ sw $ra, 0x18($sp) -/* BBFA0 801258A0 AFB00010 */ sw $s0, 0x10($sp) -/* BBFA4 801258A4 86250000 */ lh $a1, ($s1) -/* BBFA8 801258A8 3C108015 */ lui $s0, %hi(gMessageBufferA) -/* BBFAC 801258AC 26104430 */ addiu $s0, $s0, %lo(gMessageBufferA) -/* BBFB0 801258B0 00052A80 */ sll $a1, $a1, 0xa -/* BBFB4 801258B4 0C049601 */ jal dma_load_string -/* BBFB8 801258B8 00B02821 */ addu $a1, $a1, $s0 -/* BBFBC 801258BC 96220000 */ lhu $v0, ($s1) -/* BBFC0 801258C0 86230000 */ lh $v1, ($s1) -/* BBFC4 801258C4 24420001 */ addiu $v0, $v0, 1 -/* BBFC8 801258C8 00031A80 */ sll $v1, $v1, 0xa -/* BBFCC 801258CC A6220000 */ sh $v0, ($s1) -/* BBFD0 801258D0 00021400 */ sll $v0, $v0, 0x10 -/* BBFD4 801258D4 00021403 */ sra $v0, $v0, 0x10 -/* BBFD8 801258D8 28420002 */ slti $v0, $v0, 2 -/* BBFDC 801258DC 14400002 */ bnez $v0, .L801258E8 -/* BBFE0 801258E0 00701821 */ addu $v1, $v1, $s0 -/* BBFE4 801258E4 A6200000 */ sh $zero, ($s1) -.L801258E8: -/* BBFE8 801258E8 8FBF0018 */ lw $ra, 0x18($sp) -/* BBFEC 801258EC 8FB10014 */ lw $s1, 0x14($sp) -/* BBFF0 801258F0 8FB00010 */ lw $s0, 0x10($sp) -/* BBFF4 801258F4 0060102D */ daddu $v0, $v1, $zero -/* BBFF8 801258F8 03E00008 */ jr $ra -/* BBFFC 801258FC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/msg/msg_copy_to_print_buffer.s b/ver/us/asm/nonmatchings/msg/msg_copy_to_print_buffer.s index 904af2faf2..3aedeafcc0 100644 --- a/ver/us/asm/nonmatchings/msg/msg_copy_to_print_buffer.s +++ b/ver/us/asm/nonmatchings/msg/msg_copy_to_print_buffer.s @@ -163,9 +163,9 @@ glabel L80124730_BAE30 /* BAE6C 8012476C 92830508 */ lbu $v1, 0x508($s4) /* BAE70 80124770 00021080 */ sll $v0, $v0, 2 /* BAE74 80124774 00031840 */ sll $v1, $v1, 1 -/* BAE78 80124778 3C01802F */ lui $at, %hi(D_802EB5A8) +/* BAE78 80124778 3C01802F */ lui $at, %hi(gMsgCharsets) /* BAE7C 8012477C 00220821 */ addu $at, $at, $v0 -/* BAE80 80124780 8C22B5A8 */ lw $v0, %lo(D_802EB5A8)($at) +/* BAE80 80124780 8C22B5A8 */ lw $v0, %lo(gMsgCharsets)($at) /* BAE84 80124784 3C01802F */ lui $at, %hi(D_802EB644) /* BAE88 80124788 00230821 */ addu $at, $at, $v1 /* BAE8C 8012478C 8423B644 */ lh $v1, %lo(D_802EB644)($at) @@ -520,9 +520,9 @@ glabel L80124C54_BB354 /* BB38C 80124C8C 92830508 */ lbu $v1, 0x508($s4) /* BB390 80124C90 00021080 */ sll $v0, $v0, 2 /* BB394 80124C94 00031840 */ sll $v1, $v1, 1 -/* BB398 80124C98 3C01802F */ lui $at, %hi(D_802EB5A8) +/* BB398 80124C98 3C01802F */ lui $at, %hi(gMsgCharsets) /* BB39C 80124C9C 00220821 */ addu $at, $at, $v0 -/* BB3A0 80124CA0 8C22B5A8 */ lw $v0, %lo(D_802EB5A8)($at) +/* BB3A0 80124CA0 8C22B5A8 */ lw $v0, %lo(gMsgCharsets)($at) /* BB3A4 80124CA4 3C01802F */ lui $at, %hi(D_802EB644) /* BB3A8 80124CA8 00230821 */ addu $at, $at, $v1 /* BB3AC 80124CAC 8423B644 */ lh $v1, %lo(D_802EB644)($at) @@ -936,8 +936,8 @@ glabel L80125244_BB944 /* BB96C 8012526C 27A60010 */ addiu $a2, $sp, 0x10 .L80125270: /* BB970 80125270 96820528 */ lhu $v0, 0x528($s4) -/* BB974 80125274 3C088015 */ lui $t0, %hi(D_80155C38) -/* BB978 80125278 25085C38 */ addiu $t0, $t0, %lo(D_80155C38) +/* BB974 80125274 3C088015 */ lui $t0, %hi(gMessageStringVars) +/* BB978 80125278 25085C38 */ addiu $t0, $t0, %lo(gMessageStringVars) /* BB97C 8012527C 24430001 */ addiu $v1, $v0, 1 /* BB980 80125280 3042FFFF */ andi $v0, $v0, 0xffff /* BB984 80125284 00501021 */ addu $v0, $v0, $s0 @@ -959,8 +959,8 @@ glabel L80125244_BB944 /* BB9C4 801252C4 00400008 */ jr $v0 /* BB9C8 801252C8 00000000 */ nop /* BB9CC 801252CC 96820528 */ lhu $v0, 0x528($s4) -/* BB9D0 801252D0 3C088015 */ lui $t0, %hi(D_80155C38) -/* BB9D4 801252D4 25085C38 */ addiu $t0, $t0, %lo(D_80155C38) +/* BB9D0 801252D0 3C088015 */ lui $t0, %hi(gMessageStringVars) +/* BB9D4 801252D4 25085C38 */ addiu $t0, $t0, %lo(gMessageStringVars) /* BB9D8 801252D8 00501021 */ addu $v0, $v0, $s0 /* BB9DC 801252DC 00481021 */ addu $v0, $v0, $t0 /* BB9E0 801252E0 90420000 */ lbu $v0, ($v0) @@ -982,8 +982,8 @@ glabel L80125244_BB944 /* BBA1C 8012531C A3A20010 */ sb $v0, 0x10($sp) /* BBA20 80125320 A3B60010 */ sb $s6, 0x10($sp) /* BBA24 80125324 96820528 */ lhu $v0, 0x528($s4) -/* BBA28 80125328 3C088015 */ lui $t0, %hi(D_80155C38) -/* BBA2C 8012532C 25085C38 */ addiu $t0, $t0, %lo(D_80155C38) +/* BBA28 80125328 3C088015 */ lui $t0, %hi(gMessageStringVars) +/* BBA2C 8012532C 25085C38 */ addiu $t0, $t0, %lo(gMessageStringVars) /* BBA30 80125330 24430001 */ addiu $v1, $v0, 1 /* BBA34 80125334 3042FFFF */ andi $v0, $v0, 0xffff /* BBA38 80125338 00501021 */ addu $v0, $v0, $s0 @@ -1009,8 +1009,8 @@ glabel L80125244_BB944 /* BBA80 80125380 24020004 */ addiu $v0, $zero, 4 /* BBA84 80125384 A3A20011 */ sb $v0, 0x11($sp) /* BBA88 80125388 96820528 */ lhu $v0, 0x528($s4) -/* BBA8C 8012538C 3C088015 */ lui $t0, %hi(D_80155C38) -/* BBA90 80125390 25085C38 */ addiu $t0, $t0, %lo(D_80155C38) +/* BBA8C 8012538C 3C088015 */ lui $t0, %hi(gMessageStringVars) +/* BBA90 80125390 25085C38 */ addiu $t0, $t0, %lo(gMessageStringVars) /* BBA94 80125394 24430001 */ addiu $v1, $v0, 1 /* BBA98 80125398 3042FFFF */ andi $v0, $v0, 0xffff /* BBA9C 8012539C 00501021 */ addu $v0, $v0, $s0 @@ -1047,8 +1047,8 @@ glabel L80125244_BB944 /* BBAFC 801253FC 26520001 */ addiu $s2, $s2, 1 .L80125400: /* BBB00 80125400 96820528 */ lhu $v0, 0x528($s4) -/* BBB04 80125404 3C088015 */ lui $t0, %hi(D_80155C38) -/* BBB08 80125408 25085C38 */ addiu $t0, $t0, %lo(D_80155C38) +/* BBB04 80125404 3C088015 */ lui $t0, %hi(gMessageStringVars) +/* BBB08 80125408 25085C38 */ addiu $t0, $t0, %lo(gMessageStringVars) /* BBB0C 8012540C 00501021 */ addu $v0, $v0, $s0 /* BBB10 80125410 00481021 */ addu $v0, $v0, $t0 /* BBB14 80125414 90420000 */ lbu $v0, ($v0) diff --git a/ver/us/asm/nonmatchings/msg/msg_draw_char.s b/ver/us/asm/nonmatchings/msg/msg_draw_char.s index 11947381ff..80c7b7d97c 100644 --- a/ver/us/asm/nonmatchings/msg/msg_draw_char.s +++ b/ver/us/asm/nonmatchings/msg/msg_draw_char.s @@ -16,9 +16,9 @@ glabel msg_draw_char /* C2A50 8012C350 C542001C */ lwc1 $f2, 0x1c($t2) /* C2A54 8012C354 8FA60028 */ lw $a2, 0x28($sp) /* C2A58 8012C358 00021080 */ sll $v0, $v0, 2 -/* C2A5C 8012C35C 3C09802F */ lui $t1, %hi(D_802EB5A8) +/* C2A5C 8012C35C 3C09802F */ lui $t1, %hi(gMsgCharsets) /* C2A60 8012C360 01224821 */ addu $t1, $t1, $v0 -/* C2A64 8012C364 8D29B5A8 */ lw $t1, %lo(D_802EB5A8)($t1) +/* C2A64 8012C364 8D29B5A8 */ lw $t1, %lo(gMsgCharsets)($t1) /* C2A68 8012C368 8FA3002C */ lw $v1, 0x2c($sp) /* C2A6C 8012C36C 91220000 */ lbu $v0, ($t1) /* C2A70 8012C370 8D4B0004 */ lw $t3, 4($t2) diff --git a/ver/us/asm/nonmatchings/msg/msg_draw_prim_rect.s b/ver/us/asm/nonmatchings/msg/msg_draw_prim_rect.s deleted file mode 100644 index 85dd1a60eb..0000000000 --- a/ver/us/asm/nonmatchings/msg/msg_draw_prim_rect.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel msg_draw_prim_rect -/* C30A8 8012C9A8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C30AC 8012C9AC 308400FF */ andi $a0, $a0, 0xff -/* C30B0 8012C9B0 30A500FF */ andi $a1, $a1, 0xff -/* C30B4 8012C9B4 30C600FF */ andi $a2, $a2, 0xff -/* C30B8 8012C9B8 8FA20038 */ lw $v0, 0x38($sp) -/* C30BC 8012C9BC 8FA8003C */ lw $t0, 0x3c($sp) -/* C30C0 8012C9C0 8FA30040 */ lw $v1, 0x40($sp) -/* C30C4 8012C9C4 8FA90044 */ lw $t1, 0x44($sp) -/* C30C8 8012C9C8 30E700FF */ andi $a3, $a3, 0xff -/* C30CC 8012C9CC AFBF0020 */ sw $ra, 0x20($sp) -/* C30D0 8012C9D0 00431821 */ addu $v1, $v0, $v1 -/* C30D4 8012C9D4 01094821 */ addu $t1, $t0, $t1 -/* C30D8 8012C9D8 3042FFFF */ andi $v0, $v0, 0xffff -/* C30DC 8012C9DC 3108FFFF */ andi $t0, $t0, 0xffff -/* C30E0 8012C9E0 3063FFFF */ andi $v1, $v1, 0xffff -/* C30E4 8012C9E4 3129FFFF */ andi $t1, $t1, 0xffff -/* C30E8 8012C9E8 AFA20010 */ sw $v0, 0x10($sp) -/* C30EC 8012C9EC AFA80014 */ sw $t0, 0x14($sp) -/* C30F0 8012C9F0 AFA30018 */ sw $v1, 0x18($sp) -/* C30F4 8012C9F4 0C04B282 */ jal appendGfx_msg_prim_rect -/* C30F8 8012C9F8 AFA9001C */ sw $t1, 0x1c($sp) -/* C30FC 8012C9FC 8FBF0020 */ lw $ra, 0x20($sp) -/* C3100 8012CA00 03E00008 */ jr $ra -/* C3104 8012CA04 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/msg/msg_draw_rewind_arrow.s b/ver/us/asm/nonmatchings/msg/msg_draw_rewind_arrow.s deleted file mode 100644 index b5e63adc66..0000000000 --- a/ver/us/asm/nonmatchings/msg/msg_draw_rewind_arrow.s +++ /dev/null @@ -1,57 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel msg_draw_rewind_arrow -/* BD5AC 80126EAC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* BD5B0 80126EB0 3C058015 */ lui $a1, %hi(gMessagePrinters) -/* BD5B4 80126EB4 24A54C30 */ addiu $a1, $a1, %lo(gMessagePrinters) -/* BD5B8 80126EB8 00041080 */ sll $v0, $a0, 2 -/* BD5BC 80126EBC 00441021 */ addu $v0, $v0, $a0 -/* BD5C0 80126EC0 00021080 */ sll $v0, $v0, 2 -/* BD5C4 80126EC4 00441023 */ subu $v0, $v0, $a0 -/* BD5C8 80126EC8 000218C0 */ sll $v1, $v0, 3 -/* BD5CC 80126ECC 00431021 */ addu $v0, $v0, $v1 -/* BD5D0 80126ED0 000210C0 */ sll $v0, $v0, 3 -/* BD5D4 80126ED4 AFB00038 */ sw $s0, 0x38($sp) -/* BD5D8 80126ED8 00458021 */ addu $s0, $v0, $a1 -/* BD5DC 80126EDC AFBF003C */ sw $ra, 0x3c($sp) -/* BD5E0 80126EE0 8602047E */ lh $v0, 0x47e($s0) -/* BD5E4 80126EE4 28420006 */ slti $v0, $v0, 6 -/* BD5E8 80126EE8 10400017 */ beqz $v0, .L80126F48 -/* BD5EC 80126EEC 24050018 */ addiu $a1, $zero, 0x18 -/* BD5F0 80126EF0 3C02802F */ lui $v0, %hi(D_802ED670) -/* BD5F4 80126EF4 2442D670 */ addiu $v0, $v0, %lo(D_802ED670) -/* BD5F8 80126EF8 3C04802F */ lui $a0, %hi(D_802ED550) -/* BD5FC 80126EFC 2484D550 */ addiu $a0, $a0, %lo(D_802ED550) -/* BD600 80126F00 00A0302D */ daddu $a2, $a1, $zero -/* BD604 80126F04 AFA00010 */ sw $zero, 0x10($sp) -/* BD608 80126F08 AFA20014 */ sw $v0, 0x14($sp) -/* BD60C 80126F0C 86020482 */ lh $v0, 0x482($s0) -/* BD610 80126F10 24070002 */ addiu $a3, $zero, 2 -/* BD614 80126F14 AFA20018 */ sw $v0, 0x18($sp) -/* BD618 80126F18 86030484 */ lh $v1, 0x484($s0) -/* BD61C 80126F1C 2402000A */ addiu $v0, $zero, 0xa -/* BD620 80126F20 AFA20020 */ sw $v0, 0x20($sp) -/* BD624 80126F24 AFA20024 */ sw $v0, 0x24($sp) -/* BD628 80126F28 2402012C */ addiu $v0, $zero, 0x12c -/* BD62C 80126F2C AFA20028 */ sw $v0, 0x28($sp) -/* BD630 80126F30 240200DC */ addiu $v0, $zero, 0xdc -/* BD634 80126F34 AFA2002C */ sw $v0, 0x2c($sp) -/* BD638 80126F38 240200FF */ addiu $v0, $zero, 0xff -/* BD63C 80126F3C AFA20030 */ sw $v0, 0x30($sp) -/* BD640 80126F40 0C04BA68 */ jal draw_ci_image_with_clipping -/* BD644 80126F44 AFA3001C */ sw $v1, 0x1c($sp) -.L80126F48: -/* BD648 80126F48 9602047E */ lhu $v0, 0x47e($s0) -/* BD64C 80126F4C 24420001 */ addiu $v0, $v0, 1 -/* BD650 80126F50 A602047E */ sh $v0, 0x47e($s0) -/* BD654 80126F54 00021400 */ sll $v0, $v0, 0x10 -/* BD658 80126F58 00021403 */ sra $v0, $v0, 0x10 -/* BD65C 80126F5C 2842000C */ slti $v0, $v0, 0xc -/* BD660 80126F60 50400001 */ beql $v0, $zero, .L80126F68 -/* BD664 80126F64 A600047E */ sh $zero, 0x47e($s0) -.L80126F68: -/* BD668 80126F68 8FBF003C */ lw $ra, 0x3c($sp) -/* BD66C 80126F6C 8FB00038 */ lw $s0, 0x38($sp) -/* BD670 80126F70 03E00008 */ jr $ra -/* BD674 80126F74 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/msg/msg_draw_speech_bubble.s b/ver/us/asm/nonmatchings/msg/msg_draw_speech_bubble.s index 46f3983964..effbb62954 100644 --- a/ver/us/asm/nonmatchings/msg/msg_draw_speech_bubble.s +++ b/ver/us/asm/nonmatchings/msg/msg_draw_speech_bubble.s @@ -338,8 +338,8 @@ glabel msg_draw_speech_bubble /* C381C 8012D11C ACA30004 */ sw $v1, 4($a1) /* C3820 8012D120 24430008 */ addiu $v1, $v0, 8 /* C3824 8012D124 AC830000 */ sw $v1, ($a0) -/* C3828 8012D128 3C058015 */ lui $a1, %hi(D_80155D74) -/* C382C 8012D12C 8CA55D74 */ lw $a1, %lo(D_80155D74)($a1) +/* C3828 8012D128 3C058015 */ lui $a1, %hi(gMessageDrawStatePtr) +/* C382C 8012D12C 8CA55D74 */ lw $a1, %lo(gMessageDrawStatePtr)($a1) /* C3830 8012D130 3C03FD10 */ lui $v1, 0xfd10 /* C3834 8012D134 AC430000 */ sw $v1, ($v0) /* C3838 8012D138 90A5002B */ lbu $a1, 0x2b($a1) diff --git a/ver/us/asm/nonmatchings/msg/msg_get_draw_char_width.s b/ver/us/asm/nonmatchings/msg/msg_get_draw_char_width.s index e42652c828..923ea78f90 100644 --- a/ver/us/asm/nonmatchings/msg/msg_get_draw_char_width.s +++ b/ver/us/asm/nonmatchings/msg/msg_get_draw_char_width.s @@ -30,9 +30,9 @@ glabel msg_get_draw_char_width /* BC534 80125E34 10400015 */ beqz $v0, .L80125E8C /* BC538 80125E38 00051880 */ sll $v1, $a1, 2 /* BC53C 80125E3C 00061040 */ sll $v0, $a2, 1 -/* BC540 80125E40 3C01802F */ lui $at, %hi(D_802EB5A8) +/* BC540 80125E40 3C01802F */ lui $at, %hi(gMsgCharsets) /* BC544 80125E44 00230821 */ addu $at, $at, $v1 -/* BC548 80125E48 8C23B5A8 */ lw $v1, %lo(D_802EB5A8)($at) +/* BC548 80125E48 8C23B5A8 */ lw $v1, %lo(gMsgCharsets)($at) /* BC54C 80125E4C 00461021 */ addu $v0, $v0, $a2 /* BC550 80125E50 8C630008 */ lw $v1, 8($v1) /* BC554 80125E54 00021080 */ sll $v0, $v0, 2 @@ -52,9 +52,9 @@ glabel msg_get_draw_char_width .L80125E8C: /* BC58C 80125E8C 00051880 */ sll $v1, $a1, 2 /* BC590 80125E90 00061040 */ sll $v0, $a2, 1 -/* BC594 80125E94 3C01802F */ lui $at, %hi(D_802EB5A8) +/* BC594 80125E94 3C01802F */ lui $at, %hi(gMsgCharsets) /* BC598 80125E98 00230821 */ addu $at, $at, $v1 -/* BC59C 80125E9C 8C23B5A8 */ lw $v1, %lo(D_802EB5A8)($at) +/* BC59C 80125E9C 8C23B5A8 */ lw $v1, %lo(gMsgCharsets)($at) /* BC5A0 80125EA0 00461021 */ addu $v0, $v0, $a2 /* BC5A4 80125EA4 8C630008 */ lw $v1, 8($v1) /* BC5A8 80125EA8 00021080 */ sll $v0, $v0, 2 diff --git a/ver/us/asm/nonmatchings/msg/msg_get_glyph.s b/ver/us/asm/nonmatchings/msg/msg_get_glyph.s index b504453c9a..778e54728b 100644 --- a/ver/us/asm/nonmatchings/msg/msg_get_glyph.s +++ b/ver/us/asm/nonmatchings/msg/msg_get_glyph.s @@ -6,8 +6,8 @@ glabel msg_get_glyph /* C4FE4 8012E8E4 0080502D */ daddu $t2, $a0, $zero /* C4FE8 8012E8E8 00A0482D */ daddu $t1, $a1, $zero /* C4FEC 8012E8EC 00C0202D */ daddu $a0, $a2, $zero -/* C4FF0 8012E8F0 3C02802F */ lui $v0, %hi(D_802EB5A8) -/* C4FF4 8012E8F4 2442B5A8 */ addiu $v0, $v0, %lo(D_802EB5A8) +/* C4FF0 8012E8F0 3C02802F */ lui $v0, %hi(gMsgCharsets) +/* C4FF4 8012E8F4 2442B5A8 */ addiu $v0, $v0, %lo(gMsgCharsets) /* C4FF8 8012E8F8 000A2880 */ sll $a1, $t2, 2 /* C4FFC 8012E8FC 00A22821 */ addu $a1, $a1, $v0 /* C5000 8012E900 00091040 */ sll $v0, $t1, 1 diff --git a/ver/us/asm/nonmatchings/msg/msg_get_print_char_width.s b/ver/us/asm/nonmatchings/msg/msg_get_print_char_width.s index 51be89cd4c..1f8ace0bb4 100644 --- a/ver/us/asm/nonmatchings/msg/msg_get_print_char_width.s +++ b/ver/us/asm/nonmatchings/msg/msg_get_print_char_width.s @@ -29,9 +29,9 @@ glabel msg_get_print_char_width /* BC3C0 80125CC0 10600015 */ beqz $v1, .L80125D18 /* BC3C4 80125CC4 00051880 */ sll $v1, $a1, 2 /* BC3C8 80125CC8 00061040 */ sll $v0, $a2, 1 -/* BC3CC 80125CCC 3C01802F */ lui $at, %hi(D_802EB5A8) +/* BC3CC 80125CCC 3C01802F */ lui $at, %hi(gMsgCharsets) /* BC3D0 80125CD0 00230821 */ addu $at, $at, $v1 -/* BC3D4 80125CD4 8C23B5A8 */ lw $v1, %lo(D_802EB5A8)($at) +/* BC3D4 80125CD4 8C23B5A8 */ lw $v1, %lo(gMsgCharsets)($at) /* BC3D8 80125CD8 00461021 */ addu $v0, $v0, $a2 /* BC3DC 80125CDC 8C630008 */ lw $v1, 8($v1) /* BC3E0 80125CE0 00021080 */ sll $v0, $v0, 2 @@ -51,9 +51,9 @@ glabel msg_get_print_char_width .L80125D18: /* BC418 80125D18 00051880 */ sll $v1, $a1, 2 /* BC41C 80125D1C 00061040 */ sll $v0, $a2, 1 -/* BC420 80125D20 3C01802F */ lui $at, %hi(D_802EB5A8) +/* BC420 80125D20 3C01802F */ lui $at, %hi(gMsgCharsets) /* BC424 80125D24 00230821 */ addu $at, $at, $v1 -/* BC428 80125D28 8C23B5A8 */ lw $v1, %lo(D_802EB5A8)($at) +/* BC428 80125D28 8C23B5A8 */ lw $v1, %lo(gMsgCharsets)($at) /* BC42C 80125D2C 00461021 */ addu $v0, $v0, $a2 /* BC430 80125D30 8C630008 */ lw $v1, 8($v1) /* BC434 80125D34 00021080 */ sll $v0, $v0, 2 diff --git a/ver/us/asm/nonmatchings/msg/msg_printer_load_string.s b/ver/us/asm/nonmatchings/msg/msg_printer_load_string.s deleted file mode 100644 index d853c3a1eb..0000000000 --- a/ver/us/asm/nonmatchings/msg/msg_printer_load_string.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel msg_printer_load_string -/* BC168 80125A68 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BC16C 80125A6C 0080102D */ daddu $v0, $a0, $zero -/* BC170 80125A70 AFB00010 */ sw $s0, 0x10($sp) -/* BC174 80125A74 00A0802D */ daddu $s0, $a1, $zero -/* BC178 80125A78 04400003 */ bltz $v0, .L80125A88 -/* BC17C 80125A7C AFBF0014 */ sw $ra, 0x14($sp) -/* BC180 80125A80 0C049623 */ jal load_message_to_buffer -/* BC184 80125A84 00000000 */ nop -.L80125A88: -/* BC188 80125A88 0040202D */ daddu $a0, $v0, $zero -/* BC18C 80125A8C 8E0304FC */ lw $v1, 0x4fc($s0) -/* BC190 80125A90 AE040000 */ sw $a0, ($s0) -/* BC194 80125A94 2404FFBF */ addiu $a0, $zero, -0x41 -/* BC198 80125A98 A600000C */ sh $zero, 0xc($s0) -/* BC19C 80125A9C 00641824 */ and $v1, $v1, $a0 -/* BC1A0 80125AA0 AE0304FC */ sw $v1, 0x4fc($s0) -/* BC1A4 80125AA4 8FBF0014 */ lw $ra, 0x14($sp) -/* BC1A8 80125AA8 8FB00010 */ lw $s0, 0x10($sp) -/* BC1AC 80125AAC 24020001 */ addiu $v0, $zero, 1 -/* BC1B0 80125AB0 03E00008 */ jr $ra -/* BC1B4 80125AB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/msg/render_messages.s b/ver/us/asm/nonmatchings/msg/render_messages.s deleted file mode 100644 index efe91124ff..0000000000 --- a/ver/us/asm/nonmatchings/msg/render_messages.s +++ /dev/null @@ -1,152 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel render_messages -/* BA904 80124204 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BA908 80124208 AFB10024 */ sw $s1, 0x24($sp) -/* BA90C 8012420C 0000882D */ daddu $s1, $zero, $zero -/* BA910 80124210 AFB00020 */ sw $s0, 0x20($sp) -/* BA914 80124214 3C10800A */ lui $s0, %hi(gMasterGfxPos) -/* BA918 80124218 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) -/* BA91C 8012421C 3C058015 */ lui $a1, %hi(gMessagePrinters) -/* BA920 80124220 24A54C30 */ addiu $a1, $a1, %lo(gMessagePrinters) -/* BA924 80124224 44803000 */ mtc1 $zero, $f6 -/* BA928 80124228 3C028007 */ lui $v0, %hi(gCurrentDisplayContextIndex) -/* BA92C 8012422C 8C4241F4 */ lw $v0, %lo(gCurrentDisplayContextIndex)($v0) -/* BA930 80124230 3C038015 */ lui $v1, %hi(D_80155CA0) -/* BA934 80124234 24635CA0 */ addiu $v1, $v1, %lo(D_80155CA0) -/* BA938 80124238 AFBF002C */ sw $ra, 0x2c($sp) -/* BA93C 8012423C AFB20028 */ sw $s2, 0x28($sp) -/* BA940 80124240 00021180 */ sll $v0, $v0, 6 -/* BA944 80124244 00432021 */ addu $a0, $v0, $v1 -/* BA948 80124248 3C028000 */ lui $v0, 0x8000 -/* BA94C 8012424C 00829021 */ addu $s2, $a0, $v0 -.L80124250: -/* BA950 80124250 8CA204FC */ lw $v0, 0x4fc($a1) -/* BA954 80124254 30420002 */ andi $v0, $v0, 2 -/* BA958 80124258 1040003B */ beqz $v0, .L80124348 -/* BA95C 8012425C 3C03DC08 */ lui $v1, 0xdc08 -/* BA960 80124260 34630008 */ ori $v1, $v1, 8 -/* BA964 80124264 8E020000 */ lw $v0, ($s0) -/* BA968 80124268 3C01C3FA */ lui $at, 0xc3fa -/* BA96C 8012426C 44810000 */ mtc1 $at, $f0 -/* BA970 80124270 3C0143FA */ lui $at, 0x43fa -/* BA974 80124274 44811000 */ mtc1 $at, $f2 -/* BA978 80124278 3C013F80 */ lui $at, 0x3f80 -/* BA97C 8012427C 44812000 */ mtc1 $at, $f4 -/* BA980 80124280 44053000 */ mfc1 $a1, $f6 -/* BA984 80124284 3C06439F */ lui $a2, 0x439f -/* BA988 80124288 34C68000 */ ori $a2, $a2, 0x8000 -/* BA98C 8012428C 3C07C370 */ lui $a3, 0xc370 -/* BA990 80124290 0040402D */ daddu $t0, $v0, $zero -/* BA994 80124294 24420008 */ addiu $v0, $v0, 8 -/* BA998 80124298 AE020000 */ sw $v0, ($s0) -/* BA99C 8012429C 3C028015 */ lui $v0, %hi(D_8014C280) -/* BA9A0 801242A0 2442C280 */ addiu $v0, $v0, %lo(D_8014C280) -/* BA9A4 801242A4 AD030000 */ sw $v1, ($t0) -/* BA9A8 801242A8 AD020004 */ sw $v0, 4($t0) -/* BA9AC 801242AC AFA50010 */ sw $a1, 0x10($sp) -/* BA9B0 801242B0 E7A00014 */ swc1 $f0, 0x14($sp) -/* BA9B4 801242B4 E7A20018 */ swc1 $f2, 0x18($sp) -/* BA9B8 801242B8 0C018E90 */ jal guOrtho -/* BA9BC 801242BC E7A4001C */ swc1 $f4, 0x1c($sp) -/* BA9C0 801242C0 3C04DA38 */ lui $a0, 0xda38 -/* BA9C4 801242C4 34840007 */ ori $a0, $a0, 7 -/* BA9C8 801242C8 3C05E300 */ lui $a1, 0xe300 -/* BA9CC 801242CC 34A50A01 */ ori $a1, $a1, 0xa01 -/* BA9D0 801242D0 3C06D9C0 */ lui $a2, 0xd9c0 -/* BA9D4 801242D4 34C6F9FB */ ori $a2, $a2, 0xf9fb -/* BA9D8 801242D8 3C08D9FF */ lui $t0, 0xd9ff -/* BA9DC 801242DC 3508FFFF */ ori $t0, $t0, 0xffff -/* BA9E0 801242E0 3C070020 */ lui $a3, 0x20 -/* BA9E4 801242E4 8E030000 */ lw $v1, ($s0) -/* BA9E8 801242E8 34E70004 */ ori $a3, $a3, 4 -/* BA9EC 801242EC 0060102D */ daddu $v0, $v1, $zero -/* BA9F0 801242F0 24630008 */ addiu $v1, $v1, 8 -/* BA9F4 801242F4 AE030000 */ sw $v1, ($s0) -/* BA9F8 801242F8 AC440000 */ sw $a0, ($v0) -/* BA9FC 801242FC AC520004 */ sw $s2, 4($v0) -/* BAA00 80124300 24620008 */ addiu $v0, $v1, 8 -/* BAA04 80124304 AE020000 */ sw $v0, ($s0) -/* BAA08 80124308 3C02E700 */ lui $v0, 0xe700 -/* BAA0C 8012430C AC620000 */ sw $v0, ($v1) -/* BAA10 80124310 24620010 */ addiu $v0, $v1, 0x10 -/* BAA14 80124314 AC600004 */ sw $zero, 4($v1) -/* BAA18 80124318 AE020000 */ sw $v0, ($s0) -/* BAA1C 8012431C 24620018 */ addiu $v0, $v1, 0x18 -/* BAA20 80124320 AC650008 */ sw $a1, 8($v1) -/* BAA24 80124324 AC60000C */ sw $zero, 0xc($v1) -/* BAA28 80124328 AE020000 */ sw $v0, ($s0) -/* BAA2C 8012432C 24620020 */ addiu $v0, $v1, 0x20 -/* BAA30 80124330 AC660010 */ sw $a2, 0x10($v1) -/* BAA34 80124334 AC600014 */ sw $zero, 0x14($v1) -/* BAA38 80124338 AE020000 */ sw $v0, ($s0) -/* BAA3C 8012433C AC680018 */ sw $t0, 0x18($v1) -/* BAA40 80124340 080490D6 */ j .L80124358 -/* BAA44 80124344 AC67001C */ sw $a3, 0x1c($v1) -.L80124348: -/* BAA48 80124348 26310001 */ addiu $s1, $s1, 1 -/* BAA4C 8012434C 2A220003 */ slti $v0, $s1, 3 -/* BAA50 80124350 1440FFBF */ bnez $v0, .L80124250 -/* BAA54 80124354 24A50558 */ addiu $a1, $a1, 0x558 -.L80124358: -/* BAA58 80124358 0000882D */ daddu $s1, $zero, $zero -/* BAA5C 8012435C 24120005 */ addiu $s2, $zero, 5 -/* BAA60 80124360 3C108015 */ lui $s0, %hi(gMessagePrinters) -/* BAA64 80124364 26104C30 */ addiu $s0, $s0, %lo(gMessagePrinters) -.L80124368: -/* BAA68 80124368 8E0204FC */ lw $v0, 0x4fc($s0) -/* BAA6C 8012436C 30420002 */ andi $v0, $v0, 2 -/* BAA70 80124370 50400026 */ beql $v0, $zero, .L8012440C -/* BAA74 80124374 26100558 */ addiu $s0, $s0, 0x558 -/* BAA78 80124378 0C049EE9 */ jal draw_message_window -/* BAA7C 8012437C 0200202D */ daddu $a0, $s0, $zero -/* BAA80 80124380 920404F8 */ lbu $a0, 0x4f8($s0) -/* BAA84 80124384 308300FF */ andi $v1, $a0, 0xff -/* BAA88 80124388 1472000C */ bne $v1, $s2, .L801243BC -/* BAA8C 8012438C 2402000C */ addiu $v0, $zero, 0xc -/* BAA90 80124390 8E0304FC */ lw $v1, 0x4fc($s0) -/* BAA94 80124394 30628000 */ andi $v0, $v1, 0x8000 -/* BAA98 80124398 5440001C */ bnel $v0, $zero, .L8012440C -/* BAA9C 8012439C 26100558 */ addiu $s0, $s0, 0x558 -/* BAAA0 801243A0 30620040 */ andi $v0, $v1, 0x40 -/* BAAA4 801243A4 54400019 */ bnel $v0, $zero, .L8012440C -/* BAAA8 801243A8 26100558 */ addiu $s0, $s0, 0x558 -/* BAAAC 801243AC 0C0499E4 */ jal msg_update_rewind_arrow -/* BAAB0 801243B0 0220202D */ daddu $a0, $s1, $zero -/* BAAB4 801243B4 08049103 */ j .L8012440C -/* BAAB8 801243B8 26100558 */ addiu $s0, $s0, 0x558 -.L801243BC: -/* BAABC 801243BC 14620005 */ bne $v1, $v0, .L801243D4 -/* BAAC0 801243C0 2482FFF9 */ addiu $v0, $a0, -7 -/* BAAC4 801243C4 0C049BAB */ jal msg_draw_rewind_arrow -/* BAAC8 801243C8 0220202D */ daddu $a0, $s1, $zero -/* BAACC 801243CC 08049103 */ j .L8012440C -/* BAAD0 801243D0 26100558 */ addiu $s0, $s0, 0x558 -.L801243D4: -/* BAAD4 801243D4 304200FF */ andi $v0, $v0, 0xff -/* BAAD8 801243D8 2C420002 */ sltiu $v0, $v0, 2 -/* BAADC 801243DC 14400008 */ bnez $v0, .L80124400 -/* BAAE0 801243E0 3C020001 */ lui $v0, 1 -/* BAAE4 801243E4 8E0304FC */ lw $v1, 0x4fc($s0) -/* BAAE8 801243E8 00621024 */ and $v0, $v1, $v0 -/* BAAEC 801243EC 14400004 */ bnez $v0, .L80124400 -/* BAAF0 801243F0 3C020002 */ lui $v0, 2 -/* BAAF4 801243F4 00621024 */ and $v0, $v1, $v0 -/* BAAF8 801243F8 50400004 */ beql $v0, $zero, .L8012440C -/* BAAFC 801243FC 26100558 */ addiu $s0, $s0, 0x558 -.L80124400: -/* BAB00 80124400 0C049BDE */ jal msg_draw_choice_pointer -/* BAB04 80124404 0200202D */ daddu $a0, $s0, $zero -/* BAB08 80124408 26100558 */ addiu $s0, $s0, 0x558 -.L8012440C: -/* BAB0C 8012440C 26310001 */ addiu $s1, $s1, 1 -/* BAB10 80124410 2A220003 */ slti $v0, $s1, 3 -/* BAB14 80124414 1440FFD4 */ bnez $v0, .L80124368 -/* BAB18 80124418 00000000 */ nop -/* BAB1C 8012441C 8FBF002C */ lw $ra, 0x2c($sp) -/* BAB20 80124420 8FB20028 */ lw $s2, 0x28($sp) -/* BAB24 80124424 8FB10024 */ lw $s1, 0x24($sp) -/* BAB28 80124428 8FB00020 */ lw $s0, 0x20($sp) -/* BAB2C 8012442C 03E00008 */ jr $ra -/* BAB30 80124430 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/msg/set_message_string.s b/ver/us/asm/nonmatchings/msg/set_message_string.s index 874c9f10da..c2b5369505 100644 --- a/ver/us/asm/nonmatchings/msg/set_message_string.s +++ b/ver/us/asm/nonmatchings/msg/set_message_string.s @@ -21,8 +21,8 @@ glabel set_message_string .L80125B7C: /* BC27C 80125B7C 0000282D */ daddu $a1, $zero, $zero /* BC280 80125B80 240600FD */ addiu $a2, $zero, 0xfd -/* BC284 80125B84 3C038015 */ lui $v1, %hi(D_80155C38) -/* BC288 80125B88 24635C38 */ addiu $v1, $v1, %lo(D_80155C38) +/* BC284 80125B84 3C038015 */ lui $v1, %hi(gMessageStringVars) +/* BC288 80125B88 24635C38 */ addiu $v1, $v1, %lo(gMessageStringVars) /* BC28C 80125B8C 00121140 */ sll $v0, $s2, 5 /* BC290 80125B90 00432021 */ addu $a0, $v0, $v1 .L80125B94: diff --git a/ver/us/asm/nonmatchings/msg/set_message_value.s b/ver/us/asm/nonmatchings/msg/set_message_value.s deleted file mode 100644 index 53a69201e0..0000000000 --- a/ver/us/asm/nonmatchings/msg/set_message_value.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel set_message_value -/* BC2E8 80125BE8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* BC2EC 80125BEC AFB00030 */ sw $s0, 0x30($sp) -/* BC2F0 80125BF0 00A0802D */ daddu $s0, $a1, $zero -/* BC2F4 80125BF4 27A50010 */ addiu $a1, $sp, 0x10 -/* BC2F8 80125BF8 AFBF0034 */ sw $ra, 0x34($sp) -/* BC2FC 80125BFC 0C00A531 */ jal int_to_string -/* BC300 80125C00 2406000A */ addiu $a2, $zero, 0xa -/* BC304 80125C04 0000282D */ daddu $a1, $zero, $zero -/* BC308 80125C08 27A70010 */ addiu $a3, $sp, 0x10 -/* BC30C 80125C0C 3C088015 */ lui $t0, %hi(D_80155C38) -/* BC310 80125C10 25085C38 */ addiu $t0, $t0, %lo(D_80155C38) -/* BC314 80125C14 00103140 */ sll $a2, $s0, 5 -/* BC318 80125C18 00E51021 */ addu $v0, $a3, $a1 -.L80125C1C: -/* BC31C 80125C1C 80430000 */ lb $v1, ($v0) -/* BC320 80125C20 90440000 */ lbu $a0, ($v0) -/* BC324 80125C24 10600008 */ beqz $v1, .L80125C48 -/* BC328 80125C28 00A61021 */ addu $v0, $a1, $a2 -/* BC32C 80125C2C 00481021 */ addu $v0, $v0, $t0 -/* BC330 80125C30 2483FFE0 */ addiu $v1, $a0, -0x20 -/* BC334 80125C34 A0430000 */ sb $v1, ($v0) -/* BC338 80125C38 24A50001 */ addiu $a1, $a1, 1 -/* BC33C 80125C3C 28A2001F */ slti $v0, $a1, 0x1f -/* BC340 80125C40 1440FFF6 */ bnez $v0, .L80125C1C -/* BC344 80125C44 00E51021 */ addu $v0, $a3, $a1 -.L80125C48: -/* BC348 80125C48 00101140 */ sll $v0, $s0, 5 -/* BC34C 80125C4C 00A21021 */ addu $v0, $a1, $v0 -/* BC350 80125C50 240300FD */ addiu $v1, $zero, 0xfd -/* BC354 80125C54 3C018015 */ lui $at, %hi(D_80155C38) -/* BC358 80125C58 00220821 */ addu $at, $at, $v0 -/* BC35C 80125C5C A0235C38 */ sb $v1, %lo(D_80155C38)($at) -/* BC360 80125C60 8FBF0034 */ lw $ra, 0x34($sp) -/* BC364 80125C64 8FB00030 */ lw $s0, 0x30($sp) -/* BC368 80125C68 03E00008 */ jr $ra -/* BC36C 80125C6C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/pause/135EE0/func_80242BAC.s b/ver/us/asm/nonmatchings/pause/135EE0/func_80242BAC.s index 0742a7300c..84d9b24c9e 100644 --- a/ver/us/asm/nonmatchings/pause/135EE0/func_80242BAC.s +++ b/ver/us/asm/nonmatchings/pause/135EE0/func_80242BAC.s @@ -86,8 +86,8 @@ glabel func_80242BAC /* 136010 80242CD0 AC31EF9C */ sw $s1, %lo(gPauseMenuCursorPosX)($at) /* 136014 80242CD4 3C018025 */ lui $at, %hi(gPauseMenuTargetPosY) /* 136018 80242CD8 AC33EFAC */ sw $s3, %lo(gPauseMenuTargetPosY)($at) -/* 13601C 80242CDC 3C018025 */ lui $at, %hi(D_8024EFA0) -/* 136020 80242CE0 AC33EFA0 */ sw $s3, %lo(D_8024EFA0)($at) +/* 13601C 80242CDC 3C018025 */ lui $at, %hi(gPauseMenuCursorPosY) +/* 136020 80242CE0 AC33EFA0 */ sw $s3, %lo(gPauseMenuCursorPosY)($at) .L80242CE4: /* 136024 80242CE4 8FBF0024 */ lw $ra, 0x24($sp) /* 136028 80242CE8 8FB40020 */ lw $s4, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/pause/135EE0/func_80242D04.s b/ver/us/asm/nonmatchings/pause/135EE0/func_80242D04.s index f85469af43..d7c2df8a0e 100644 --- a/ver/us/asm/nonmatchings/pause/135EE0/func_80242D04.s +++ b/ver/us/asm/nonmatchings/pause/135EE0/func_80242D04.s @@ -72,9 +72,9 @@ glabel func_80242D04 /* 136134 80242DF4 AC32EF9C */ sw $s2, %lo(gPauseMenuCursorPosX)($at) /* 136138 80242DF8 3C018025 */ lui $at, %hi(gPauseMenuTargetPosY) /* 13613C 80242DFC AC33EFAC */ sw $s3, %lo(gPauseMenuTargetPosY)($at) -/* 136140 80242E00 3C018025 */ lui $at, %hi(D_8024EFA0) +/* 136140 80242E00 3C018025 */ lui $at, %hi(gPauseMenuCursorPosY) /* 136144 80242E04 08090B93 */ j .L80242E4C -/* 136148 80242E08 AC33EFA0 */ sw $s3, %lo(D_8024EFA0)($at) +/* 136148 80242E08 AC33EFA0 */ sw $s3, %lo(gPauseMenuCursorPosY)($at) .L80242E0C: /* 13614C 80242E0C 92020000 */ lbu $v0, ($s0) /* 136150 80242E10 30420008 */ andi $v0, $v0, 8 diff --git a/ver/us/asm/nonmatchings/pause/135EE0/pause_cleanup.s b/ver/us/asm/nonmatchings/pause/135EE0/pause_cleanup.s index db3646518a..d9a0975716 100644 --- a/ver/us/asm/nonmatchings/pause/135EE0/pause_cleanup.s +++ b/ver/us/asm/nonmatchings/pause/135EE0/pause_cleanup.s @@ -33,8 +33,8 @@ glabel pause_cleanup /* 137AB0 80244770 1440FFFA */ bnez $v0, .L8024475C /* 137AB4 80244774 00000000 */ nop .L80244778: -/* 137AB8 80244778 3C118025 */ lui $s1, %hi(D_8024EF80) -/* 137ABC 8024477C 2631EF80 */ addiu $s1, $s1, %lo(D_8024EF80) +/* 137AB8 80244778 3C118025 */ lui $s1, %hi(gPauseMenuTabs) +/* 137ABC 8024477C 2631EF80 */ addiu $s1, $s1, %lo(gPauseMenuTabs) /* 137AC0 80244780 0000802D */ daddu $s0, $zero, $zero .L80244784: /* 137AC4 80244784 8E240000 */ lw $a0, ($s1) diff --git a/ver/us/asm/nonmatchings/pause/135EE0/pause_handle_input.s b/ver/us/asm/nonmatchings/pause/135EE0/pause_handle_input.s index 853130f808..ddad7e25b6 100644 --- a/ver/us/asm/nonmatchings/pause/135EE0/pause_handle_input.s +++ b/ver/us/asm/nonmatchings/pause/135EE0/pause_handle_input.s @@ -20,9 +20,9 @@ glabel pause_handle_input /* 1377A0 80244460 AFB10034 */ sw $s1, 0x34($sp) /* 1377A4 80244464 AFB00030 */ sw $s0, 0x30($sp) /* 1377A8 80244468 00021080 */ sll $v0, $v0, 2 -/* 1377AC 8024446C 3C148025 */ lui $s4, %hi(D_8024EF80) +/* 1377AC 8024446C 3C148025 */ lui $s4, %hi(gPauseMenuTabs) /* 1377B0 80244470 0282A021 */ addu $s4, $s4, $v0 -/* 1377B4 80244474 8E94EF80 */ lw $s4, %lo(D_8024EF80)($s4) +/* 1377B4 80244474 8E94EF80 */ lw $s4, %lo(gPauseMenuTabs)($s4) /* 1377B8 80244478 0C0B1EAF */ jal get_variable /* 1377BC 8024447C 34A55BDE */ ori $a1, $a1, 0x5bde /* 1377C0 80244480 1040000F */ beqz $v0, .L802444C0 @@ -174,8 +174,8 @@ glabel pause_handle_input /* 1379DC 8024469C 0040F809 */ jalr $v0 /* 1379E0 802446A0 0280202D */ daddu $a0, $s4, $zero .L802446A4: -/* 1379E4 802446A4 3C118025 */ lui $s1, %hi(D_8024EF80) -/* 1379E8 802446A8 2631EF80 */ addiu $s1, $s1, %lo(D_8024EF80) +/* 1379E4 802446A4 3C118025 */ lui $s1, %hi(gPauseMenuTabs) +/* 1379E8 802446A8 2631EF80 */ addiu $s1, $s1, %lo(gPauseMenuTabs) /* 1379EC 802446AC 0000802D */ daddu $s0, $zero, $zero .L802446B0: /* 1379F0 802446B0 8E240000 */ lw $a0, ($s1) diff --git a/ver/us/asm/nonmatchings/pause/135EE0/pause_init.s b/ver/us/asm/nonmatchings/pause/135EE0/pause_init.s index b0e2baed06..064b3f1529 100644 --- a/ver/us/asm/nonmatchings/pause/135EE0/pause_init.s +++ b/ver/us/asm/nonmatchings/pause/135EE0/pause_init.s @@ -44,8 +44,8 @@ glabel pause_init /* 137434 802440F4 3C048025 */ lui $a0, %hi(D_8024F114) /* 137438 802440F8 2484F114 */ addiu $a0, $a0, %lo(D_8024F114) /* 13743C 802440FC 24050004 */ addiu $a1, $zero, 4 -/* 137440 80244100 3C108025 */ lui $s0, %hi(D_8024EF80) -/* 137444 80244104 2610EF80 */ addiu $s0, $s0, %lo(D_8024EF80) +/* 137440 80244100 3C108025 */ lui $s0, %hi(gPauseMenuTabs) +/* 137444 80244104 2610EF80 */ addiu $s0, $s0, %lo(gPauseMenuTabs) /* 137448 80244108 3C028027 */ lui $v0, %hi(gPauseMenuCommonIconIDs) /* 13744C 8024410C 8C4200E8 */ lw $v0, %lo(gPauseMenuCommonIconIDs)($v0) /* 137450 80244110 3C018027 */ lui $at, %hi(D_802700D0) @@ -107,8 +107,8 @@ glabel pause_init /* 13751C 802441DC 2631FFFF */ addiu $s1, $s1, -1 /* 137520 802441E0 1E20FFF0 */ bgtz $s1, .L802441A4 /* 137524 802441E4 2610FFFC */ addiu $s0, $s0, -4 -/* 137528 802441E8 3C028025 */ lui $v0, %hi(D_8024EF80) -/* 13752C 802441EC 8C42EF80 */ lw $v0, %lo(D_8024EF80)($v0) +/* 137528 802441E8 3C028025 */ lui $v0, %hi(gPauseMenuTabs) +/* 13752C 802441EC 8C42EF80 */ lw $v0, %lo(gPauseMenuTabs)($v0) /* 137530 802441F0 0000202D */ daddu $a0, $zero, $zero /* 137534 802441F4 80420001 */ lb $v0, 1($v0) /* 137538 802441F8 3C05F840 */ lui $a1, 0xf840 diff --git a/ver/us/asm/nonmatchings/pause/135EE0/pause_interp_cursor.s b/ver/us/asm/nonmatchings/pause/135EE0/pause_interp_cursor.s index a6b5dc1275..8a31ac256f 100644 --- a/ver/us/asm/nonmatchings/pause/135EE0/pause_interp_cursor.s +++ b/ver/us/asm/nonmatchings/pause/135EE0/pause_interp_cursor.s @@ -16,8 +16,8 @@ glabel pause_interp_cursor /* 1361D8 80242E98 468010A1 */ cvt.d.w $f2, $f2 /* 1361DC 80242E9C 46241082 */ mul.d $f2, $f2, $f4 /* 1361E0 80242EA0 00000000 */ nop -/* 1361E4 80242EA4 3C098025 */ lui $t1, %hi(D_8024EFA0) -/* 1361E8 80242EA8 2529EFA0 */ addiu $t1, $t1, %lo(D_8024EFA0) +/* 1361E4 80242EA4 3C098025 */ lui $t1, %hi(gPauseMenuCursorPosY) +/* 1361E8 80242EA8 2529EFA0 */ addiu $t1, $t1, %lo(gPauseMenuCursorPosY) /* 1361EC 80242EAC 3C048025 */ lui $a0, %hi(gPauseMenuTargetPosY) /* 1361F0 80242EB0 8C84EFAC */ lw $a0, %lo(gPauseMenuTargetPosY)($a0) /* 1361F4 80242EB4 8D260000 */ lw $a2, ($t1) @@ -48,8 +48,8 @@ glabel pause_interp_cursor /* 136250 80242F10 8C620000 */ lw $v0, ($v1) /* 136254 80242F14 00471021 */ addu $v0, $v0, $a3 /* 136258 80242F18 AC620000 */ sw $v0, ($v1) -/* 13625C 80242F1C 3C038025 */ lui $v1, %hi(D_8024EFA0) -/* 136260 80242F20 2463EFA0 */ addiu $v1, $v1, %lo(D_8024EFA0) +/* 13625C 80242F1C 3C038025 */ lui $v1, %hi(gPauseMenuCursorPosY) +/* 136260 80242F20 2463EFA0 */ addiu $v1, $v1, %lo(gPauseMenuCursorPosY) /* 136264 80242F24 8C620000 */ lw $v0, ($v1) /* 136268 80242F28 3C048025 */ lui $a0, %hi(gPauseMenuCursorTargetOpacity) /* 13626C 80242F2C 8C84EFB0 */ lw $a0, %lo(gPauseMenuCursorTargetOpacity)($a0) diff --git a/ver/us/asm/nonmatchings/pause/137ED0/pause_tabs_handle_input.s b/ver/us/asm/nonmatchings/pause/137ED0/pause_tabs_handle_input.s index b74a2122ac..540fb86a45 100644 --- a/ver/us/asm/nonmatchings/pause/137ED0/pause_tabs_handle_input.s +++ b/ver/us/asm/nonmatchings/pause/137ED0/pause_tabs_handle_input.s @@ -16,8 +16,8 @@ glabel pause_tabs_handle_input /* 1386C0 80245380 24070005 */ addiu $a3, $zero, 5 /* 1386C4 80245384 3C048027 */ lui $a0, %hi(D_8027014C) /* 1386C8 80245388 2484014C */ addiu $a0, $a0, %lo(D_8027014C) -/* 1386CC 8024538C 3C068025 */ lui $a2, %hi(D_8024EF80) -/* 1386D0 80245390 24C6EF80 */ addiu $a2, $a2, %lo(D_8024EF80) +/* 1386CC 8024538C 3C068025 */ lui $a2, %hi(gPauseMenuTabs) +/* 1386D0 80245390 24C6EF80 */ addiu $a2, $a2, %lo(gPauseMenuTabs) /* 1386D4 80245394 3C058025 */ lui $a1, %hi(D_8024F1D0) /* 1386D8 80245398 24A5F1D0 */ addiu $a1, $a1, %lo(D_8024F1D0) .L8024539C: @@ -53,8 +53,8 @@ glabel pause_tabs_handle_input /* 138748 80245408 00000000 */ nop /* 13874C 8024540C 3C038027 */ lui $v1, %hi(D_8027014C) /* 138750 80245410 2463014C */ addiu $v1, $v1, %lo(D_8027014C) -/* 138754 80245414 3C058025 */ lui $a1, %hi(D_8024EF80) -/* 138758 80245418 24A5EF80 */ addiu $a1, $a1, %lo(D_8024EF80) +/* 138754 80245414 3C058025 */ lui $a1, %hi(gPauseMenuTabs) +/* 138758 80245418 24A5EF80 */ addiu $a1, $a1, %lo(gPauseMenuTabs) /* 13875C 8024541C 3C048025 */ lui $a0, %hi(D_8024F1D0) /* 138760 80245420 2484F1D0 */ addiu $a0, $a0, %lo(D_8024F1D0) .L80245424: @@ -132,9 +132,9 @@ glabel pause_tabs_handle_input /* 138874 80245534 00220821 */ addu $at, $at, $v0 /* 138878 80245538 9022F1D0 */ lbu $v0, %lo(D_8024F1D0)($at) /* 13887C 8024553C 00021080 */ sll $v0, $v0, 2 -/* 138880 80245540 3C018025 */ lui $at, %hi(D_8024EF80) +/* 138880 80245540 3C018025 */ lui $at, %hi(gPauseMenuTabs) /* 138884 80245544 00220821 */ addu $at, $at, $v0 -/* 138888 80245548 8C22EF80 */ lw $v0, %lo(D_8024EF80)($at) +/* 138888 80245548 8C22EF80 */ lw $v0, %lo(gPauseMenuTabs)($at) /* 13888C 8024554C 3C118025 */ lui $s1, %hi(D_8024F1D0) /* 138890 80245550 2631F1D0 */ addiu $s1, $s1, %lo(D_8024F1D0) /* 138894 80245554 90430000 */ lbu $v1, ($v0) diff --git a/ver/us/asm/nonmatchings/pause/137ED0/pause_tabs_update.s b/ver/us/asm/nonmatchings/pause/137ED0/pause_tabs_update.s index d9e9146938..a6a25736c6 100644 --- a/ver/us/asm/nonmatchings/pause/137ED0/pause_tabs_update.s +++ b/ver/us/asm/nonmatchings/pause/137ED0/pause_tabs_update.s @@ -110,8 +110,8 @@ glabel pause_tabs_update /* 138A84 80245744 0000202D */ daddu $a0, $zero, $zero .L80245748: /* 138A88 80245748 0080802D */ daddu $s0, $a0, $zero -/* 138A8C 8024574C 3C078025 */ lui $a3, %hi(D_8024EF80) -/* 138A90 80245750 24E7EF80 */ addiu $a3, $a3, %lo(D_8024EF80) +/* 138A8C 8024574C 3C078025 */ lui $a3, %hi(gPauseMenuTabs) +/* 138A90 80245750 24E7EF80 */ addiu $a3, $a3, %lo(gPauseMenuTabs) /* 138A94 80245754 3C068025 */ lui $a2, %hi(D_8024F1D0) /* 138A98 80245758 24C6F1D0 */ addiu $a2, $a2, %lo(D_8024F1D0) /* 138A9C 8024575C 3C058016 */ lui $a1, %hi(gUIPanels) @@ -156,8 +156,8 @@ glabel pause_tabs_update /* 138B28 802457E8 2508F1D0 */ addiu $t0, $t0, %lo(D_8024F1D0) /* 138B2C 802457EC 02081021 */ addu $v0, $s0, $t0 /* 138B30 802457F0 90420000 */ lbu $v0, ($v0) -/* 138B34 802457F4 3C088025 */ lui $t0, %hi(D_8024EF80) -/* 138B38 802457F8 2508EF80 */ addiu $t0, $t0, %lo(D_8024EF80) +/* 138B34 802457F4 3C088025 */ lui $t0, %hi(gPauseMenuTabs) +/* 138B38 802457F8 2508EF80 */ addiu $t0, $t0, %lo(gPauseMenuTabs) /* 138B3C 802457FC 00021080 */ sll $v0, $v0, 2 /* 138B40 80245800 00481021 */ addu $v0, $v0, $t0 /* 138B44 80245804 8C420000 */ lw $v0, ($v0) diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 495c871d8d..4cb9f74f09 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -352,7 +352,34 @@ segments: - [0x90FE0, .data, 759b0_len_61b0] - [0x913B0, .data, world/actions] - [0x914E0, .data, world/partners] - - [0x917F8, data] + - [0x919B0, ci4, ui/a_button_unpressed, 48, 40] + - [0x91D70, palette, ui/a_button_unpressed] + - [0x91D90, ci4, ui/a_button_pressed, 48, 40] + - [0x92150, palette, ui/a_button_pressed] + - [0x92170, ci4, ui/analog_stick, 32, 32] + - [0x92370, palette, ui/analog_stick] + - [0x92390, ci4, ui/analog_stick_left, 40, 32] + - [0x92610, palette, ui/analog_stick_left] + - [0x92630, ci4, ui/analog_stick2, 32, 32] + - [0x92830, palette, ui/analog_stick2] + - [0x92850, ci4, ui/analog_stick_right, 40, 32] + - [0x92AD0, palette, ui/analog_stick_right] + - [0x92AF0, ci4, ui/analog_stick3, 32, 32] + - [0x92CF0, palette, ui/analog_stick3] + - [0x92D10, ci4, ui/analog_stick_down, 32, 32] + - [0x92F10, palette, ui/analog_stick_down] + - [0x92F30, ci4, ui/analog_stick_up, 32, 32] + - [0x93130, palette, ui/analog_stick_up] + - [0x93150, ci4, ui/unk_bar, 72, 16] + - [0x93390, palette, ui/unk_bar] + - [0x933B0, ci4, ui/ok, 24, 16] + - [0x93470, palette, ui/ok] + - [0x93490, ci4, ui/red_button, 48, 40] + - [0x93850, palette, ui/red_button] + - [0x93870, ci4, ui/red_button2, 48, 40] + - [0x93C30, palette, ui/red_button2] + - [0x93C50, ci4, ui/start, 24, 8] + - [0x93CB0, palette, ui/start] - [0x93CD0, ci4, ui/hammer, 32, 32] - [0x93ED0, palette, ui/hammer] - [0x93EF0, palette, ui/hammer.disabled] @@ -384,7 +411,10 @@ segments: - [0xDF950, c, DF950] - [0xe0b30, c, e0b30_len_b80] - [0xE16B0, .data, a5dd0_len_114e0] - - [0xE2950, data] + - [0xE2950, .data, B4580] + - [0xE2960, .data, entity] + - [0xE2980, .data, msg] + - [0xE2CA0, data] - [0xE5510, .data, d0a70_len_4fe0] - [0xE56C0, .data, d5a50_len_5fd0] - [0xE5820, .data, dc470_len_14c0] diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 0d3c098e3a..39b70f2c32 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -18755,13 +18755,13 @@ entity_fog_dist_max = 0x80154390; // type:data gWorldDynamicEntityList = 0x801543A0; // gBattleDynamicEntityList = 0x801543E0; // gCurrentDynamicEntityListPtr = 0x80154420; // -gMessageBufferA = 0x80154430; // type:data +gMessageBuffers = 0x80154430; // type:data gMessagePrinters = 0x80154C30; // type:data // size:0x1008 gMessageStringVars = 0x80155C38; // type:data D_80155C98 = 0x80155C98; // type:data -D_80155CA0 = 0x80155CA0; // type:data +gMessageWindowProjMatrix = 0x80155CA0; // type:data D_80155D20 = 0x80155D20; // type:data -D_80155D74 = 0x80155D74; // type:data +gMessageDrawStatePtr = 0x80155D74; // type:data D_80155D80 = 0x80155D80; // type:data D_80155D84 = 0x80155D84; // type:data D_80155D88 = 0x80155D88; // type:data @@ -20149,7 +20149,7 @@ D_802EB3A0 = 0x802EB3A0; // type:data D_802EB3B0 = 0x802EB3B0; // type:data D_802EB3C0 = 0x802EB3C0; // type:data D_802EB3D0 = 0x802EB3D0; // type:data -D_802EB5A8 = 0x802EB5A8; // type:data +gMsgCharsets = 0x802EB5A8; // type:data D_802EB5C0 = 0x802EB5C0; // type:data D_802EB5F0 = 0x802EB5F0; // type:data D_802EB620 = 0x802EB620; // type:data diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index ec74a90f33..8af1031522 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -57,3 +57,4 @@ D_8024B9A8_B8FB28 = 0x8024B9A8; D_8038F800 = 0x8038F800; D_803B5000 = 0x803B5000; B_80240FD0_tst_04 = 0x80240FD0; +D_802EF0D0 = 0x802EF0D0; diff --git a/ver/us/undefined_syms_auto.txt b/ver/us/undefined_syms_auto.txt index b1913d36f9..2c3625b8c0 100644 --- a/ver/us/undefined_syms_auto.txt +++ b/ver/us/undefined_syms_auto.txt @@ -146,14 +146,14 @@ entity_fog_dist_max = 0x80154390; gWorldDynamicEntityList = 0x801543A0; gBattleDynamicEntityList = 0x801543E0; gCurrentDynamicEntityListPtr = 0x80154420; -gMessageBufferA = 0x80154430; +gMessageBuffers = 0x80154430; gMessagePrinters = 0x80154C30; -D_80155C38 = 0x80155C38; +gMessageStringVars = 0x80155C38; gMessageStringVars = 0x80155C38; D_80155C98 = 0x80155C98; -D_80155CA0 = 0x80155CA0; +gMessageWindowProjMatrix = 0x80155CA0; D_80155D20 = 0x80155D20; -D_80155D74 = 0x80155D74; +gMessageDrawStatePtr = 0x80155D74; D_80155D80 = 0x80155D80; D_80155D84 = 0x80155D84; D_80155D88 = 0x80155D88;