Message work (#315)

* msg wip

* var name restoration

* rodata padding

* New compiler that supports .bss section attribute!

* -fno-common & cleanup

* clean

* extern bss for now

* msg work

* git subrepo pull (merge) --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "8588eaae7b"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "8588eaae7b"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* msg_draw_prim_rect

* draw_message_window

* render_messages

* draw_string progress

* remove dumb file

* images, data
This commit is contained in:
Ethan Roseman 2021-07-16 14:27:27 -04:00 committed by GitHub
parent d2875030a3
commit 1beee32dc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
75 changed files with 1013 additions and 1349 deletions

View File

@ -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;

View File

@ -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);

View File

@ -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)

View File

@ -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;

View File

@ -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);

View File

@ -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);

View File

@ -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;

View File

@ -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);

View File

@ -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);

View File

@ -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;

View File

@ -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);

458
src/msg.c
View File

@ -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);

View File

@ -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

View File

@ -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;

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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";

View File

@ -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

View File

@ -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"

View File

@ -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);
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);

View File

@ -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"

View File

@ -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 },

View File

@ -3,4 +3,6 @@
#define NAMESPACE sbk_00
Script N(makeEntities);
extern Script N(main);
extern NpcGroupList N(npcGroupList_80240768);
extern Script N(makeEntities);

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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;

View File

@ -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"

Binary file not shown.

View File

@ -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

File diff suppressed because one or more lines are too long

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

File diff suppressed because one or more lines are too long

View File

@ -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

View File

@ -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

View File

@ -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

File diff suppressed because one or more lines are too long

View File

@ -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)

File diff suppressed because it is too large Load Diff

View File

@ -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)

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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)

View File

@ -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)

View File

@ -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

View File

@ -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

View File

@ -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)

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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:

View File

@ -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

View File

@ -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)

View File

@ -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

View File

@ -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)

View File

@ -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)

View File

@ -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

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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]

View File

@ -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

View File

@ -57,3 +57,4 @@ D_8024B9A8_B8FB28 = 0x8024B9A8;
D_8038F800 = 0x8038F800;
D_803B5000 = 0x803B5000;
B_80240FD0_tst_04 = 0x80240FD0;
D_802EF0D0 = 0x802EF0D0;

View File

@ -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;