diff --git a/data/credits1.s b/data/credits1.s index b959b073e..e03dacbcd 100644 --- a/data/credits1.s +++ b/data/credits1.s @@ -1,94 +1,8 @@ .section .rodata -@ credits1.c -.string "pksdir0\0" -.align 2,0 - .global gUnknown_80E4A10 -gUnknown_80E4A10: @ 80E4A10 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .global gUnknown_80E4A28 -gUnknown_80E4A28: @ 80E4A28 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x02, 0x00 - .byte 0x1a, 0x00, 0x10, 0x00 - .byte 0x10, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .global gUnknown_80E4A40 -gUnknown_80E4A40: @ 80E4A40 - .byte 0x18, 0x18 - .byte 0x38, 0x00 - .byte 0x21, 0xff - .byte 0x22, 0xff - .byte 0x23, 0xff - .byte 0x24, 0xff - .byte 0x25, 0xff - .byte 0x26, 0xff - .byte 0x27, 0xff - .byte 0x28, 0xff - .byte 0x29, 0xff - .byte 0x2a, 0xff - .byte 0x2b, 0xff - .byte 0x2c, 0xff - .byte 0x2d, 0xff - .byte 0x2e, 0xff - .byte 0x2f, 0xff - .byte 0x30, 0xff - .byte 0x31, 0xff - .byte 0x32, 0xff - .byte 0x33, 0xff - .byte 0x34, 0xff - .byte 0x35, 0xff - .byte 0x36, 0xff - .byte 0x37, 0xff - .byte 0x38, 0xff - .byte 0x39, 0xff - .byte 0x3a, 0xff - .byte 0x41, 0xff - .byte 0x42, 0xff - .byte 0x43, 0xff - .byte 0x44, 0xff - .byte 0x45, 0xff - .byte 0x46, 0xff - .byte 0x47, 0xff - .byte 0x48, 0xff - .byte 0x49, 0xff - .byte 0x4a, 0xff - .byte 0x4b, 0xff - .byte 0x4c, 0xff - .byte 0x4d, 0xff - .byte 0x4e, 0xff - .byte 0x4f, 0xff - .byte 0x50, 0xff - .byte 0x51, 0xff - .byte 0x52, 0xff - .byte 0x53, 0xff - .byte 0x54, 0xff - .byte 0x55, 0xff - .byte 0x56, 0xff - .byte 0x57, 0xff - .byte 0x58, 0xff - .byte 0x59, 0xff - .byte 0x5a, 0xff - .byte 0x10, 0xff - .byte 0x11, 0xff - .byte 0x12, 0xff - .byte 0x13, 0xff - .byte 0x14, 0xff - .byte 0x15, 0xff - .byte 0x16, 0xff - .byte 0x17, 0xff - .byte 0x18, 0xff - .byte 0x19, 0xff @ Actual Start of Credits .global Credits_StaffCredits diff --git a/data/data.s b/data/data.s index 5e438e6bd..a097dbae4 100644 --- a/data/data.s +++ b/data/data.s @@ -2,421 +2,6 @@ .align 2, 0 -@ code.c -.string "pksdir0\0" - - .global gScriptVarInfo -gScriptVarInfo: @ 80B7394 - .2byte 6, 2, 0, 0, 1, 29; .4byte gUnknown_80B7DF8 - .2byte 6, 2, 4, 0, 1, 0; .4byte gUnknown_80B7DEC - .2byte 2, 2, 110, 0, 2, 0; .4byte gUnknown_80B7DDC - .2byte 2, 2, 112, 0, 2, 0; .4byte gUnknown_80B7DCC - .2byte 2, 2, 114, 0, 2, 0; .4byte gUnknown_80B7DBC - .2byte 2, 2, 116, 0, 2, 0; .4byte gUnknown_80B7DAC - .2byte 2, 2, 118, 0, 2, 0; .4byte gUnknown_80B7D9C - .2byte 2, 2, 120, 0, 2, 0; .4byte gUnknown_80B7D8C - .2byte 2, 2, 122, 0, 2, 0; .4byte gUnknown_80B7D7C - .2byte 2, 2, 124, 0, 2, 0; .4byte gUnknown_80B7D6C - .2byte 2, 2, 126, 0, 2, 0; .4byte gUnknown_80B7D5C - .2byte 2, 2, 128, 0, 2, 0; .4byte gUnknown_80B7D4C - .2byte 2, 2, 130, 0, 2, 0; .4byte gUnknown_80B7D3C - .2byte 5, 2, 44, 0, 1, 0; .4byte gUnknown_80B7D2C - .2byte 2, 2, 132, 0, 1, 0; .4byte gUnknown_80B7D18 - .2byte 5, 2, 46, 0, 1, 0; .4byte gUnknown_80B7D08 - .2byte 5, 2, 48, 0, 1, 0; .4byte gUnknown_80B7CFC - .2byte 5, 2, 50, 0, 1, 0; .4byte gUnknown_80B7CEC - .2byte 5, 2, 52, 0, 1, 0; .4byte gUnknown_80B7CDC - .2byte 5, 2, 54, 0, 1, 0; .4byte gUnknown_80B7CCC - .2byte 5, 2, 56, 0, 1, 0; .4byte gUnknown_80B7CB8 - .2byte 4, 2, 94, 0, 1, 0; .4byte gUnknown_80B7CA0 - .2byte 2, 2, 133, 0, 1, 0; .4byte gUnknown_80B7C90 - .2byte 8, 2, 0, 0, 1, 0; .4byte gUnknown_80B7C84 - .2byte 2, 2, 134, 0, 1, 0; .4byte gUnknown_80B7C78 - .2byte 2, 2, 135, 0, 1, 0; .4byte gUnknown_80B7C6C - .2byte 2, 2, 136, 0, 1, 0; .4byte gUnknown_80B7C5C - .2byte 3, 2, 96, 0, 1, 0; .4byte gUnknown_80B7C4C - .2byte 2, 2, 137, 0, 1, 0; .4byte gUnknown_80B7C40 - .2byte 2, 2, 138, 0, 1, 0; .4byte gUnknown_80B7C30 - .2byte 2, 2, 139, 0, 1, 0; .4byte gUnknown_80B7C20 - .2byte 5, 2, 58, 0, 1, 0; .4byte gUnknown_80B7C10 - .2byte 8, 2, 0, 0, 1, 0; .4byte gUnknown_80B7C04 - .2byte 8, 2, 0, 0, 1, 0; .4byte gUnknown_80B7BF8 - .2byte 8, 2, 0, 0, 1, 0; .4byte gUnknown_80B7BF0 - .2byte 8, 2, 0, 0, 1, 0; .4byte gUnknown_80B7BE4 - .2byte 1, 2, 140, 0, 16, 0; .4byte gUnknown_80B7BD8 - .2byte 3, 2, 97, 0, 1, 0; .4byte gUnknown_80B7BCC - .2byte 3, 2, 98, 0, 1, 0; .4byte gUnknown_80B7BB8 - .2byte 3, 2, 99, 0, 1, 0; .4byte gUnknown_80B7BAC - .2byte 3, 2, 100, 0, 1, 0; .4byte gUnknown_80B7BA0 - .2byte 3, 2, 101, 0, 1, 0; .4byte gUnknown_80B7B94 - .2byte 3, 2, 102, 0, 1, 0; .4byte gUnknown_80B7B78 - .2byte 1, 2, 142, 0, 64, 0; .4byte gUnknown_80B7B5C - .2byte 1, 2, 150, 0, 64, 0; .4byte gUnknown_80B7B40 - .2byte 1, 2, 158, 0, 64, 0; .4byte gUnknown_80B7B20 - .2byte 1, 2, 166, 0, 32, 0; .4byte gUnknown_80B7B08 - .2byte 1, 2, 170, 0, 32, 0; .4byte gUnknown_80B7AF0 - .2byte 1, 2, 174, 0, 96, 0; .4byte gUnknown_80B7ADC - .2byte 1, 2, 186, 0, 96, 0; .4byte gUnknown_80B7AC8 - .2byte 6, 2, 8, 0, 3, 0; .4byte gUnknown_80B7ABC - .2byte 6, 2, 20, 0, 3, 0; .4byte gUnknown_80B7AB0 - .2byte 6, 2, 32, 0, 3, 0; .4byte gUnknown_80B7AA0 - .2byte 3, 2, 103, 0, 3, 0; .4byte gUnknown_80B7A8C - .2byte 5, 5, 60, 0, 1, 0; .4byte gUnknown_80B7A7C - .2byte 5, 5, 62, 0, 1, 0; .4byte gUnknown_80B7A70 - .2byte 1, 5, 198, 0, 8, 0; .4byte gUnknown_80B7A60 - .2byte 5, 5, 64, 0, 1, 0; .4byte gUnknown_80B7A54 - .2byte 1, 5, 199, 0, 32, 0; .4byte gUnknown_80B7A40 - .2byte 1, 5, 203, 0, 32, 0; .4byte gUnknown_80B7A2C - .2byte 1, 5, 207, 0, 16, 0; .4byte gUnknown_80B7A18 - .2byte 1, 5, 209, 0, 16, 0; .4byte gUnknown_80B7A04 - .2byte 5, 5, 66, 0, 8, 0; .4byte gUnknown_80B79F8 - .2byte 1, 5, 211, 0, 16, 0; .4byte gUnknown_80B79EC - .2byte 1, 6, 213, 0, 16, 0; .4byte gUnknown_80B79DC - .2byte 5, 6, 82, 0, 2, 0; .4byte gUnknown_80B79CC - .2byte 5, 6, 86, 0, 4, 0; .4byte gUnknown_80B79C0 - .2byte 3, 6, 106, 0, 1, 0; .4byte gUnknown_80B79AC - .2byte 3, 6, 107, 0, 1, 0; .4byte gUnknown_80B7998 - .2byte 3, 6, 108, 0, 1, 0; .4byte gUnknown_80B7984 - .2byte 3, 6, 109, 0, 1, 0; .4byte gUnknown_80B7970 - .2byte 1, 6, 215, 0, 16, 0; .4byte gUnknown_80B7960 - .2byte 1, 6, 217, 0, 16, 0; .4byte gUnknown_80B7950 - .2byte 1, 6, 219, 0, 16, 0; .4byte gUnknown_80B7940 - .2byte 1, 6, 221, 0, 16, 0; .4byte gUnknown_80B7930 - .2byte 1, 6, 223, 0, 8, 0; .4byte gUnknown_80B791C - .2byte 1, 6, 224, 0, 8, 0; .4byte gUnknown_80B7908 - .2byte 1, 6, 225, 0, 8, 0; .4byte gUnknown_80B78F4 - .2byte 1, 6, 226, 0, 8, 0; .4byte gUnknown_80B78E0 - .2byte 1, 6, 227, 0, 8, 0; .4byte gUnknown_80B78CC - .2byte 1, 6, 228, 0, 8, 0; .4byte gUnknown_80B78B8 - .2byte 0, 0, 229, 0, 0, 0; .4byte gUnknown_80B78B4 - -gUnknown_80B78B4: - .string "SUM\0" - -gUnknown_80B78B8: - .string "EVENT_M02E01A_2N\0" - .align 2, 0 - -gUnknown_80B78CC: - .string "EVENT_M01E10A_5N\0" - .align 2, 0 - -gUnknown_80B78E0: - .string "EVENT_M01E10A_3N\0" - .align 2, 0 - -gUnknown_80B78F4: - .string "EVENT_M01E10A_1N\0" - .align 2, 0 - -gUnknown_80B7908: - .string "EVENT_M01E09A_8N\0" - .align 2, 0 - -gUnknown_80B791C: - .string "EVENT_M01E09A_2N\0" - .align 2, 0 - -gUnknown_80B7930: - .string "EVENT_T01P03\0" - .align 2, 0 - -gUnknown_80B7940: - .string "EVENT_T01P02\0" - .align 2, 0 - -gUnknown_80B7950: - .string "EVENT_T01P01\0" - .align 2, 0 - -gUnknown_80B7960: - .string "EVENT_B01P01\0" - .align 2, 0 - -gUnknown_80B7970: - .string "EVENT_ORNAMENT_04\0" - .align 2, 0 - -gUnknown_80B7984: - .string "EVENT_ORNAMENT_03\0" - .align 2, 0 - -gUnknown_80B7998: - .string "EVENT_ORNAMENT_02\0" - .align 2, 0 - -gUnknown_80B79AC: - .string "EVENT_ORNAMENT_01\0" - .align 2, 0 - -gUnknown_80B79C0: - .string "EVENT_GONBE\0" - .align 2, 0 - -gUnknown_80B79CC: - .string "EVENT_S08E01\0" - .align 2, 0 - -gUnknown_80B79DC: - .string "EVENT_S07E01\0" - .align 2, 0 - -gUnknown_80B79EC: - .string "INN_TEMP\0" - .align 2, 0 - -gUnknown_80B79F8: - .string "SHOP_TEMP\0" - .align 2, 0 - -gUnknown_80B7A04: - .string "DELIVER_ITEM_TEMP\0" - .align 2, 0 - -gUnknown_80B7A18: - .string "DELIVER_ITEM_STATIC\0" - .align 2, 0 - -gUnknown_80B7A2C: - .string "STATION_ITEM_TEMP\0" - .align 2, 0 - -gUnknown_80B7A40: - .string "STATION_ITEM_STATIC\0" - .align 2, 0 - -gUnknown_80B7A54: - .string "EVENT_LOCAL\0" - .align 2, 0 - -gUnknown_80B7A60: - .string "MAP_LOCAL_DOOR\0" - .align 2, 0 - -gUnknown_80B7A70: - .string "MAP_LOCAL\0" - .align 2, 0 - -gUnknown_80B7A7C: - .string "GROUND_LOCAL\0" - .align 2, 0 - -gUnknown_80B7A8C: - .string "POSITION_DIRECTION\0" - .align 2, 0 - -gUnknown_80B7AA0: - .string "POSITION_HEIGHT\0" - .align 2, 0 - -gUnknown_80B7AB0: - .string "POSITION_Y\0" - .align 2, 0 - -gUnknown_80B7ABC: - .string "POSITION_X\0" - .align 2, 0 - -gUnknown_80B7AC8: - .string "DUNGEON_CLEAR_LIST\0" - .align 2, 0 - -gUnknown_80B7ADC: - .string "DUNGEON_ENTER_LIST\0" - .align 2, 0 - -gUnknown_80B7AF0: - .string "TRAINING_PRESENT_LIST\0" - .align 2, 0 - -gUnknown_80B7B08: - .string "TRAINING_CONQUEST_LIST\0" - .align 2, 0 - -gUnknown_80B7B20: - .string "RESCUE_SCENARIO_CONQUEST_LIST\0" - .align 2, 0 - -gUnknown_80B7B40: - .string "RESCUE_SCENARIO_JOB_LIST\0" - .align 2, 0 - -gUnknown_80B7B5C: - .string "RESCUE_SCENARIO_ORDER_LIST\0" - .align 2, 0 - -gUnknown_80B7B78: - .string "FLAG_KIND_CHANGE_REQUEST\0" - .align 2, 0 - -gUnknown_80B7B94: - .string "FLAG_KIND\0" - .align 2, 0 - -gUnknown_80B7BA0: - .string "BASE_LEVEL\0" - .align 2, 0 - -gUnknown_80B7BAC: - .string "BASE_KIND\0" - .align 2, 0 - -gUnknown_80B7BB8: - .string "PARTNER_TALK_KIND\0" - .align 2, 0 - -gUnknown_80B7BCC: - .string "WARP_LOCK\0" - .align 2, 0 - -gUnknown_80B7BD8: - .string "WARP_LIST\0" - .align 2, 0 - -gUnknown_80B7BE4: - .string "BANK_GOLD\0" - .align 2, 0 - -gUnknown_80B7BF0: - .string "GOLD\0" - .align 2, 0 - -gUnknown_80B7BF8: - .string "UNIT_SUM\0" - .align 2, 0 - -gUnknown_80B7C04: - .string "FRIEND_SUM\0" - .align 2, 0 - -gUnknown_80B7C10: - .string "NEW_FRIEND_KIND\0" - .align 2, 0 - -gUnknown_80B7C20: - .string "PARTNER2_KIND\0" - .align 2, 0 - -gUnknown_80B7C30: - .string "PARTNER1_KIND\0" - .align 2, 0 - -gUnknown_80B7C40: - .string "PLAYER_KIND\0" - .align 2, 0 - -gUnknown_80B7C4C: - .string "WEATHER_KIND\0" - .align 2, 0 - -gUnknown_80B7C5C: - .string "CONDITION_KIND\0" - .align 2, 0 - -gUnknown_80B7C6C: - .string "CLEAR_COUNT\0" - .align 2, 0 - -gUnknown_80B7C78: - .string "START_MODE\0" - .align 2, 0 - -gUnknown_80B7C84: - .string "SCRIPT_MODE\0" - .align 2, 0 - -gUnknown_80B7C90: - .string "DUNGEON_RESULT\0" - .align 2, 0 - -gUnknown_80B7CA0: - .string "DUNGEON_ENTER_FREQUENCY\0" - .align 2, 0 - -gUnknown_80B7CB8: - .string "DUNGEON_ENTER_INDEX\0" - .align 2, 0 - -gUnknown_80B7CCC: - .string "DUNGEON_ENTER\0" - .align 2, 0 - -gUnknown_80B7CDC: - .string "DUNGEON_SELECT\0" - .align 2, 0 - -gUnknown_80B7CEC: - .string "GROUND_PLACE\0" - .align 2, 0 - -gUnknown_80B7CFC: - .string "GROUND_MAP\0" - .align 2, 0 - -gUnknown_80B7D08: - .string "GROUND_GETOUT\0" - .align 2, 0 - -gUnknown_80B7D18: - .string "GROUND_ENTER_LINK\0" - .align 2, 0 - -gUnknown_80B7D2C: - .string "GROUND_ENTER\0" - .align 2, 0 - -gUnknown_80B7D3C: - .string "SCENARIO_SUB9\0" - .align 2, 0 - -gUnknown_80B7D4C: - .string "SCENARIO_SUB8\0" - .align 2, 0 - -gUnknown_80B7D5C: - .string "SCENARIO_SUB7\0" - .align 2, 0 - -gUnknown_80B7D6C: - .string "SCENARIO_SUB6\0" - .align 2, 0 - -gUnknown_80B7D7C: - .string "SCENARIO_SUB5\0" - .align 2, 0 - -gUnknown_80B7D8C: - .string "SCENARIO_SUB4\0" - .align 2, 0 - -gUnknown_80B7D9C: - .string "SCENARIO_SUB3\0" - .align 2, 0 - -gUnknown_80B7DAC: - .string "SCENARIO_SUB2\0" - .align 2, 0 - -gUnknown_80B7DBC: - .string "SCENARIO_SUB1\0" - .align 2, 0 - -gUnknown_80B7DCC: - .string "SCENARIO_MAIN\0" - .align 2, 0 - -gUnknown_80B7DDC: - .string "SCENARIO_SELECT\0" - .align 2, 0 - -gUnknown_80B7DEC: - .string "CONDITION\0" - .align 2, 0 - -gUnknown_80B7DF8: - .string "VERSION\0" - .align 2, 0 - @ ??? .string "pksdir0\0" diff --git a/include/credits1.h b/include/credits1.h index 5a1130ad0..ebd87789c 100644 --- a/include/credits1.h +++ b/include/credits1.h @@ -18,7 +18,7 @@ typedef struct CreditsData /* 0x0 */ s16 type; /* 0x2 */ s16 x; /* 0x4 */ s16 y; - /* 0x8 */ u8 *text; + /* 0x8 */ const u8 *text; } CreditsData; bool8 DrawCredits(s32 creditsCategoryIndex, s32); diff --git a/include/event_flag.h b/include/event_flag.h index b68a3c828..54a04e79f 100644 --- a/include/event_flag.h +++ b/include/event_flag.h @@ -133,7 +133,7 @@ struct ScriptVarInfo { // size: 0x8 struct ScriptVarPtr { - /* 0x0 */ struct ScriptVarInfo *info; + /* 0x0 */ const struct ScriptVarInfo *info; /* 0x4 */ u8 *ptr; }; @@ -170,8 +170,8 @@ void sub_80026E8(s16 r0, bool8 r1); bool8 SaveGlobalScriptVars(void *r0); bool8 RestoreGlobalScriptVars(u8 *r0); -// .rodata -extern struct ScriptVarInfo gScriptVarInfo[]; // NDS=0210FAC4 +// script_vars_info.c +extern const struct ScriptVarInfo gScriptVarInfo[]; // NDS=0210FAC4 // EWRAM extern u8 gScriptVarBuffer[0x400]; diff --git a/ld_script.ld b/ld_script.ld index b9cc29a9d..d179e3708 100755 --- a/ld_script.ld +++ b/ld_script.ld @@ -427,6 +427,7 @@ SECTIONS { { src/main_loops.o(.rodata); src/event_flag.o(.rodata); + src/script_vars_info.o(.rodata); data/data.o(.rodata); src/code_8002774.o(.rodata); data/pksdir_5.o(.rodata); @@ -527,6 +528,7 @@ SECTIONS { src/code_8031D70.o(.rodata); src/adventure_log.o(.rodata); src/friend_rescue.o(.rodata); + src/credits1.o(.rodata); data/credits1.o(.rodata); src/credits2.o(.rodata); src/main_menu1.o(.rodata); diff --git a/src/credits1.c b/src/credits1.c index 2b5136701..0ec208992 100644 --- a/src/credits1.c +++ b/src/credits1.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_8099360.h" #include "credits1.h" #include "event_flag.h" @@ -9,9 +10,85 @@ EWRAM_INIT static Credits1Work *sCredits1Work = {NULL}; -extern const WindowTemplate gUnknown_80E4A10; -extern const WindowTemplate gUnknown_80E4A28; -extern const unkStruct_3000400 gUnknown_80E4A40; +static const WindowTemplate sDummyWinTemplate = WIN_TEMPLATE_DUMMY; +static const WindowTemplate gUnknown_80E4A28 = { + .unk0 = 0, + .type = WINDOW_TYPE_2, + .pos = {2, 2}, + .width = 26, + .height = 16, + .unk10 = 16, + .unk12 = 0, + .header = NULL, +}; + +static const unkStruct_3000400 gUnknown_80E4A40 = {{0x18, 0x18, 0x38, 0}}; + +UNUSED static const u8 sUnknownUnusedData[][2] = { + {0x21, 0xff}, + {0x22, 0xff}, + {0x23, 0xff}, + {0x24, 0xff}, + {0x25, 0xff}, + {0x26, 0xff}, + {0x27, 0xff}, + {0x28, 0xff}, + {0x29, 0xff}, + {0x2a, 0xff}, + {0x2b, 0xff}, + {0x2c, 0xff}, + {0x2d, 0xff}, + {0x2e, 0xff}, + {0x2f, 0xff}, + {0x30, 0xff}, + {0x31, 0xff}, + {0x32, 0xff}, + {0x33, 0xff}, + {0x34, 0xff}, + {0x35, 0xff}, + {0x36, 0xff}, + {0x37, 0xff}, + {0x38, 0xff}, + {0x39, 0xff}, + {0x3a, 0xff}, + {0x41, 0xff}, + {0x42, 0xff}, + {0x43, 0xff}, + {0x44, 0xff}, + {0x45, 0xff}, + {0x46, 0xff}, + {0x47, 0xff}, + {0x48, 0xff}, + {0x49, 0xff}, + {0x4a, 0xff}, + {0x4b, 0xff}, + {0x4c, 0xff}, + {0x4d, 0xff}, + {0x4e, 0xff}, + {0x4f, 0xff}, + {0x50, 0xff}, + {0x51, 0xff}, + {0x52, 0xff}, + {0x53, 0xff}, + {0x54, 0xff}, + {0x55, 0xff}, + {0x56, 0xff}, + {0x57, 0xff}, + {0x58, 0xff}, + {0x59, 0xff}, + {0x5a, 0xff}, + {0x10, 0xff}, + {0x11, 0xff}, + {0x12, 0xff}, + {0x13, 0xff}, + {0x14, 0xff}, + {0x15, 0xff}, + {0x16, 0xff}, + {0x17, 0xff}, + {0x18, 0xff}, + {0x19, 0xff} +}; + extern const CreditsData* gCreditsTable[27]; bool8 DrawCredits(s32 creditsCategoryIndex, s32 param_2) @@ -20,7 +97,6 @@ bool8 DrawCredits(s32 creditsCategoryIndex, s32 param_2) s32 x; s32 y; const CreditsData *cred; - u8 *srcText; u8 *destText1; u8 *destText2; u8 curChar; @@ -31,8 +107,8 @@ bool8 DrawCredits(s32 creditsCategoryIndex, s32 param_2) sCredits1Work->unk64 = param_2; sCredits1Work->creditsCategoryIndex = creditsCategoryIndex; - for (i = 0; i < 4; i++) - sCredits1Work->unk0.id[i] = gUnknown_80E4A10; + for (i = 0; i < MAX_WINDOWS; i++) + sCredits1Work->unk0.id[i] = sDummyWinTemplate; sCredits1Work->unk0.id[0] = gUnknown_80E4A28; ResetUnusedInputStruct(); @@ -43,7 +119,7 @@ bool8 DrawCredits(s32 creditsCategoryIndex, s32 param_2) cred = creditsCategoryIndex[gCreditsTable]; // WTF y = 0; while (cred->text != NULL) { - srcText = cred->text; + const u8 *srcText = cred->text; if (cred->y >= 0) y = cred->y; else diff --git a/src/data/event_flag.h b/src/data/event_flag.h index 477ca00de..1b2405875 100644 --- a/src/data/event_flag.h +++ b/src/data/event_flag.h @@ -1,15 +1,4 @@ -struct LocalScriptVarInfo -{ - s16 unk0; - s16 unk2; - s16 unk4; - s16 unk6; - s16 unk8; - s16 unkA; - const u8 *text; -}; - -const struct LocalScriptVarInfo sLocalScriptVarInfo[4] = { +static const struct ScriptVarInfo sLocalScriptVarInfo[4] = { 5, 7, 0, 0, 1, 0, "LOCAL0", 5, 7, 2, 0, 1, 0, "LOCAL1", 5, 7, 4, 0, 1, 0, "LOCAL2", @@ -22,10 +11,8 @@ struct unkStruct_80B6D90 s32 num; }; -const u8 gUnknown_80B7144[]; - const struct unkStruct_80B6D90 gUnknown_80B6D90[59] = { - {gUnknown_80B7144, 0}, + {"NONE", 0}, {"M00E01A", -1}, {"M01E01A", -1}, {"M01E02A", -1}, @@ -86,8 +73,6 @@ const struct unkStruct_80B6D90 gUnknown_80B6D90[59] = { {"DEBUG GROUND", -1}, }; -ALIGNED(4) const u8 gUnknown_80B7144[] = "NONE"; - const u8 *const gUnknown_80B714C[10] = { "2-1", "2-1", diff --git a/src/event_flag.c b/src/event_flag.c index 750747e4b..8d4dabd1d 100644 --- a/src/event_flag.c +++ b/src/event_flag.c @@ -27,16 +27,13 @@ extern void sub_80973A8(u32, u32); extern void sub_80972F4(void); extern void nullsub_128(void); -// A fakematch? Debugging leftover? A bug? No clue. -#define GET_PTR_x400VAR(varId)(((void*) (&gScriptVarInfo[varId - 0x466])) - 4) - // arm9.bin::0200FF68 void ThoroughlyResetScriptVars(void) { s32 iVar1; s32 iVar3; u16 uVar2; - struct ScriptVarInfo *puVar1; + const struct ScriptVarInfo *puVar1; for(iVar3 = 0; iVar3 < 0x400; iVar3++) { @@ -108,15 +105,15 @@ UNUSED void sub_8001564(void) // arm9.bin::0200FEB4 void ResetScriptVarArray(u8 *localVarBuf, s16 varId_) { - struct ScriptVarInfo *infoPtr; + const struct ScriptVarInfo *infoPtr; u16 i; s32 varId = varId_; if (varId < 0x400) { - infoPtr = &(gScriptVarInfo)[varId]; + infoPtr = &gScriptVarInfo[varId]; } else { - infoPtr = GET_PTR_x400VAR(varId); + infoPtr = &sLocalScriptVarInfo[varId - 0x400]; } for (i = 0; i < infoPtr->arrayLen; i++) { @@ -127,15 +124,15 @@ void ResetScriptVarArray(u8 *localVarBuf, s16 varId_) // arm9.bin::0200FE04 void ClearScriptVarArray(u8 *localVarBuf, s16 varId_) { - struct ScriptVarInfo *infoPtr; + const struct ScriptVarInfo *infoPtr; u16 i; s32 varId = varId_; if (varId < 0x400) { - infoPtr = &(gScriptVarInfo)[varId]; + infoPtr = &gScriptVarInfo[varId]; } else { - infoPtr = GET_PTR_x400VAR(varId); + infoPtr = &sLocalScriptVarInfo[varId - 0x400]; } for (i = 0; i < infoPtr->arrayLen; i++) { @@ -146,7 +143,7 @@ void ClearScriptVarArray(u8 *localVarBuf, s16 varId_) // arm9.bin::0200FD60 void GetScriptVarRef(struct ScriptVarPtr *out, u8 *localVarBuf, s32 varId_) { - struct ScriptVarInfo *infoPtr; + const struct ScriptVarInfo *infoPtr; s32 varId = (s16) varId_; if (varId < 0x400) { @@ -155,7 +152,7 @@ void GetScriptVarRef(struct ScriptVarPtr *out, u8 *localVarBuf, s32 varId_) out->ptr = &gScriptVarBuffer[infoPtr->bufOffset]; } else { - infoPtr = GET_PTR_x400VAR(varId); + infoPtr = &sLocalScriptVarInfo[varId - 0x400]; out->info = infoPtr; out->ptr = &localVarBuf[infoPtr->bufOffset * 4]; } @@ -807,7 +804,7 @@ UNUSED const u8 *sub_8002394(u32 param_1) return "1-1"; // 1-1 } else { - return gUnknown_80B7144; // NONE + return "NONE"; } } @@ -817,7 +814,7 @@ UNUSED const u8 *sub_80023C4(u32 param_1) return gUnknown_80B71A0[param_1]; // CISTART, CECONTINUE, CNLAST, CWEND } else { - return gUnknown_80B7144; // NONE + return "NONE"; } } #endif diff --git a/src/friend_rescue.c b/src/friend_rescue.c index 1a2f345ef..9750c5134 100644 --- a/src/friend_rescue.c +++ b/src/friend_rescue.c @@ -37,282 +37,282 @@ extern TeamInventory *gTeamInventoryRef; // NOTE: MenuItems and WindowTemplate defined in here.. #include "data/friend_rescue_menus.h" -const u8 gUnknown_80E25F4[] = "What would you like to do?"; +static const u8 gUnknown_80E25F4[] = "What would you like to do?"; -ALIGNED(4) const u8 gUnknown_80E2610[] = _( +ALIGNED(4) static const u8 gUnknown_80E2610[] = _( "How would you like to send your\n" "{COLOR CYAN_G}SOS Mail{RESET}?"); -ALIGNED(4) const u8 gUnknown_80E2640[] = _( +ALIGNED(4) static const u8 gUnknown_80E2640[] = _( "How would you like to receive your\n" "friend's {COLOR CYAN_G}SOS Mail{RESET}?"); -ALIGNED(4) const u8 gUnknown_80E2680[] = _( +ALIGNED(4) static const u8 gUnknown_80E2680[] = _( "How would you like to send your\n" "{COLOR CYAN_G}A-OK Mail{RESET}?"); -ALIGNED(4) const u8 gUnknown_80E26B0[] = _( +ALIGNED(4) static const u8 gUnknown_80E26B0[] = _( "How would you like to receive your\n" "friend's {COLOR CYAN_G}A-OK Mail{RESET}?"); -ALIGNED(4) const u8 gUnknown_80E26F0[] = _( +ALIGNED(4) static const u8 gUnknown_80E26F0[] = _( "How would you like to send your\n" "{COLOR CYAN_G}Thank-You Mail{RESET}?"); -ALIGNED(4) const u8 gUnknown_80E2728[] = _( +ALIGNED(4) static const u8 gUnknown_80E2728[] = _( "How would you like to receive your\n" "friend's {COLOR CYAN_G}Thank-You Mail{RESET}?"); -ALIGNED(4) const u8 gUnknown_80E276C[] = _( +ALIGNED(4) static const u8 gUnknown_80E276C[] = _( "The GBA Game Pak does not have\n" "an {COLOR CYAN_G}A-OK Mail{RESET} on it."); -ALIGNED(4) const u8 gUnknown_80E27A4[] = _( +ALIGNED(4) static const u8 gUnknown_80E27A4[] = _( "If you accept an {COLOR CYAN_G}A-OK Mail{RESET}, the\n" "{COLOR CYAN_G}Thank-You Mail{RESET} you received before\n" "will be overwritten. Is that OK?"); -ALIGNED(4) const u8 gUnknown_80E2814[] = _( +ALIGNED(4) static const u8 gUnknown_80E2814[] = _( "Please enter the {COLOR CYAN_G}A-OK Mail password{RESET}."); -ALIGNED(4) const u8 gUnknown_80E2840[] = _( +ALIGNED(4) static const u8 gUnknown_80E2840[] = _( "The {COLOR CYAN_G}A-OK Mail{RESET} will be received and\n" "processed."); -ALIGNED(4) const u8 gUnknown_80E2874[] = _( +ALIGNED(4) static const u8 gUnknown_80E2874[] = _( "A {COLOR CYAN_G}helper Pokémon{RESET} also arrived!"); -ALIGNED(4) const u8 gUnknown_80E2898[] = _( +ALIGNED(4) static const u8 gUnknown_80E2898[] = _( "An {COLOR CYAN_G}A-OK Mail{RESET} was received.\n" "Your adventure will be saved."); -ALIGNED(4) const u8 gUnknown_80E28D8[] = _( +ALIGNED(4) static const u8 gUnknown_80E28D8[] = _( "Resume your game using {COLOR CYAN_G}Revive Team{RESET}."); -ALIGNED(4) const u8 gUnknown_80E2904[] = _( +ALIGNED(4) static const u8 gUnknown_80E2904[] = _( "Your friend's Mailbox is full.\n" "This piece of mail cannot be sent.\n" "The recipient must delete old mail."); -ALIGNED(4) const u8 gUnknown_80E296C[] = _( +ALIGNED(4) static const u8 gUnknown_80E296C[] = _( "Please choose the {COLOR CYAN_G}SOS Mail{RESET} you want\n" "to send."); -ALIGNED(4) const u8 gUnknown_80E29A0[] = _( +ALIGNED(4) static const u8 gUnknown_80E29A0[] = _( "This {COLOR CYAN_G}SOS Mail{RESET} will be sent.\n" "Is that OK?"); -ALIGNED(4) const u8 gUnknown_80E29D0[] = _( +ALIGNED(4) static const u8 gUnknown_80E29D0[] = _( "Your {COLOR CYAN_G}SOS Mail{RESET} was sent.\n" "Your adventure will be saved."); -ALIGNED(4) const u8 gUnknown_80E2A0C[] = "Save completed."; +ALIGNED(4) static const u8 gUnknown_80E2A0C[] = "Save completed."; -ALIGNED(4) const u8 gUnknown_80E2A1C[] = _( +ALIGNED(4) static const u8 gUnknown_80E2A1C[] = _( "Please give this password to the friend\n" "coming to your rescue."); -ALIGNED(4) const u8 gUnknown_80E2A5C[] = _( +ALIGNED(4) static const u8 gUnknown_80E2A5C[] = _( "Here is the {COLOR CYAN_G}SOS Mail password{RESET}."); -ALIGNED(4) const u8 gUnknown_80E2A80[] = _( +ALIGNED(4) static const u8 gUnknown_80E2A80[] = _( "Here is the {COLOR CYAN_G}A-OK Mail password{RESET}."); -ALIGNED(4) const u8 gUnknown_80E2AA8[] = _( +ALIGNED(4) static const u8 gUnknown_80E2AA8[] = _( "Please give this password to the friend\n" "that you rescued."); -ALIGNED(4) const u8 gUnknown_80E2AE4[] = _( +ALIGNED(4) static const u8 gUnknown_80E2AE4[] = _( "Please connect a {COLOR CYAN_G}Link Cable{RESET}.\n" "When your friend's side is ready, you may\n" "communicate and exchange data."); -ALIGNED(4) const u8 gUnknown_80E2B54[] = _( +ALIGNED(4) static const u8 gUnknown_80E2B54[] = _( "Your {COLOR CYAN_G}A-OK Mail{RESET} was sent.\n" "Your adventure will be saved."); -ALIGNED(4) const u8 gUnknown_80E2B90[] = _( +ALIGNED(4) static const u8 gUnknown_80E2B90[] = _( "Using a {COLOR CYAN_G}Game Link cable{RESET},\n" "you can send a {COLOR CYAN_G}helper Pokémon{RESET} to\n" "a friend."); -ALIGNED(4) const u8 gUnknown_80E2BE0[] = _( +ALIGNED(4) static const u8 gUnknown_80E2BE0[] = _( "Your own Pokémon will not disappear\n" "if you send it as a helper.\n" "Will you send a helper to your friend?"); -ALIGNED(4) const u8 gUnknown_80E2C48[] = _( +ALIGNED(4) static const u8 gUnknown_80E2C48[] = _( "Pick the Pokémon to be sent as a helper.\n" "(Any hold item will not be sent.)"); -ALIGNED(4) const u8 gUnknown_80E2C94[] = _( +ALIGNED(4) static const u8 gUnknown_80E2C94[] = _( "No Pokémon are in your Friend Areas.\n" "What would you like to do?"); -ALIGNED(4) const u8 gUnknown_80E2CD4[] = _( +ALIGNED(4) static const u8 gUnknown_80E2CD4[] = _( "Is this Pokémon OK?"); -ALIGNED(4) const u8 gUnknown_80E2CE8[] = _( +ALIGNED(4) static const u8 gUnknown_80E2CE8[] = _( "Please choose the {COLOR CYAN_G}A-OK Mail{RESET} that should\n" "be sent to your friend."); -ALIGNED(4) const u8 gUnknown_80E2D30[] = _( +ALIGNED(4) static const u8 gUnknown_80E2D30[] = _( "This {COLOR CYAN_G}A-OK Mail{RESET} will be sent.\n" "Is that OK?"); -ALIGNED(4) const u8 gUnknown_80E2D60[] = _( +ALIGNED(4) static const u8 gUnknown_80E2D60[] = _( "There is no {COLOR CYAN_G}A-OK Mail{RESET}."); -ALIGNED(4) const u8 gUnknown_80E2D7C[] = _( +ALIGNED(4) static const u8 gUnknown_80E2D7C[] = _( "Connect the {COLOR CYAN_G}Game Link cable{RESET}.\n" "When your friend is ready, begin\n" "communication."); -ALIGNED(4) const u8 gUnknown_80E2DD0[] = _( +ALIGNED(4) static const u8 gUnknown_80E2DD0[] = _( "{CENTER_ALIGN}Communicating...\n" "{CENTER_ALIGN}Please wait with the power on.\n" "{CENTER_ALIGN}To cancel, press {B_BUTTON}."); -ALIGNED(4) const u8 gUnknown_80E2E20[] = _( +ALIGNED(4) static const u8 gUnknown_80E2E20[] = _( "The GBA Game Pak will be written to.\n" "Is that OK?"); -ALIGNED(4) const u8 gUnknown_80E2E54[] = _( +ALIGNED(4) static const u8 gUnknown_80E2E54[] = _( "{CENTER_ALIGN}Reading from GBA Game Pak.\n" "{CENTER_ALIGN}Do not remove the GBA Game Pak.\n" "{CENTER_ALIGN}Please wait with the power on."); -ALIGNED(4) const u8 gUnknown_80E2EB4[] = _( +ALIGNED(4) static const u8 gUnknown_80E2EB4[] = _( "{CENTER_ALIGN}Writing to GBA Game Pak.\n" "{CENTER_ALIGN}Do not remove the GBA Game Pak.\n" "{CENTER_ALIGN}Please wait with the power on."); -ALIGNED(4) const u8 gUnknown_80E2F14[] = _( +ALIGNED(4) static const u8 gUnknown_80E2F14[] = _( "There is no {COLOR CYAN_G}SOS Mail{RESET} on\n" "the GBA Game Pak."); -ALIGNED(4) const u8 gUnknown_80E2F44[] = _( +ALIGNED(4) static const u8 gUnknown_80E2F44[] = _( "Please choose an {COLOR CYAN_G}SOS Mail{RESET}\n" "on the GBA Game Pak."); -ALIGNED(4) const u8 gUnknown_80E2F78[] = _( +ALIGNED(4) static const u8 gUnknown_80E2F78[] = _( "Is it OK to accept this {COLOR CYAN_G}SOS Mail{RESET}?"); -ALIGNED(4) const u8 gUnknown_80E2FA0[] = _( +ALIGNED(4) static const u8 gUnknown_80E2FA0[] = _( "There is no more space for accepting\n" "new mail.\n" "You must delete old mail."); -ALIGNED(4) const u8 gUnknown_80E2FEC[] = _( +ALIGNED(4) static const u8 gUnknown_80E2FEC[] = _( "The {COLOR CYAN_G}SOS Mail{RESET} has been received.\n" "Your adventure will be saved."); -ALIGNED(4) const u8 gUnknown_80E3030[] = _( +ALIGNED(4) static const u8 gUnknown_80E3030[] = _( "Please embark on your rescue mission\n" "from the Pelipper Post Office. "); -ALIGNED(4) const u8 gUnknown_80E3078[] = _( +ALIGNED(4) static const u8 gUnknown_80E3078[] = _( "Please enter the {COLOR CYAN_G}SOS Mail password{RESET}."); -ALIGNED(4) const u8 gUnknown_80E30A4[] = _( +ALIGNED(4) static const u8 gUnknown_80E30A4[] = _( "Is it OK to send this {COLOR CYAN_G}Thank-You Mail{RESET}?"); -ALIGNED(4) const u8 gUnknown_80E30D0[] = _( +ALIGNED(4) static const u8 gUnknown_80E30D0[] = _( "Please choose the {COLOR CYAN_G}Thank-You Mail{RESET} that\n" "should be sent to your friend."); -ALIGNED(4) const u8 gUnknown_80E311C[] = _( +ALIGNED(4) static const u8 gUnknown_80E311C[] = _( "Please enter the {COLOR CYAN_G}Thank-You Mail password{RESET}."); -ALIGNED(4) const u8 gUnknown_80E314C[] = _( +ALIGNED(4) static const u8 gUnknown_80E314C[] = _( "The {COLOR CYAN_G}Thank-You Mail password{RESET} will be\n" "shown."); -ALIGNED(4) const u8 gUnknown_80E317C[] = _( +ALIGNED(4) static const u8 gUnknown_80E317C[] = _( "Your adventure will be saved."); -ALIGNED(4) const u8 gUnknown_80E319C[] = _( +ALIGNED(4) static const u8 gUnknown_80E319C[] = _( "Steps will now be taken to receive the\n" "{COLOR CYAN_G}Thank-You Mail{RESET}."); -ALIGNED(4) const u8 gUnknown_80E31D8[] = _( +ALIGNED(4) static const u8 gUnknown_80E31D8[] = _( "All preparations have been made."); -ALIGNED(4) const u8 gUnknown_80E31FC[] = _( +ALIGNED(4) static const u8 gUnknown_80E31FC[] = _( "The {COLOR CYAN_G}Thank-You Mail{RESET} was sent."); -ALIGNED(4) const u8 gUnknown_80E3220[] = _( +ALIGNED(4) static const u8 gUnknown_80E3220[] = _( "You received the {COLOR CYAN_G}Thank-You Mail{RESET}."); -ALIGNED(4) const u8 gUnknown_80E3248[] = _( +ALIGNED(4) static const u8 gUnknown_80E3248[] = _( "The {COLOR CYAN_G}Thank-You Mail{RESET} was sent.\n" "Your adventure will be saved."); -ALIGNED(4) const u8 gUnknown_80E3288[] = _( +ALIGNED(4) static const u8 gUnknown_80E3288[] = _( "Steps will now be taken to send your\n" "{COLOR CYAN_G}Thank-You Mail{RESET}."); -ALIGNED(4) const u8 gUnknown_80E32C4[] = _( +ALIGNED(4) static const u8 gUnknown_80E32C4[] = _( "OK. You're good to go.\n" "{COLOR YELLOW_N}%s{RESET}, I hope your sense of\n" "gratitude reaches your friend."); -ALIGNED(4) const u8 gUnknown_80E331C[] = _( +ALIGNED(4) static const u8 gUnknown_80E331C[] = _( "The item chosen here can't be exchanged\n" "with anything else.\n" "Are you sure this item is OK?"); -ALIGNED(4) const u8 gUnknown_80E3378[] = _( +ALIGNED(4) static const u8 gUnknown_80E3378[] = _( "Please choose the item to be sent."); -ALIGNED(4) const u8 gUnknown_80E339C[] = _( +ALIGNED(4) static const u8 gUnknown_80E339C[] = _( "There are no items in storage.\n" "What would you like to do?"); -ALIGNED(4) const u8 gUnknown_80E33D8[] = _( +ALIGNED(4) static const u8 gUnknown_80E33D8[] = _( "Would you like to choose\n" "a {COLOR CYAN_G}reward item{RESET} from storage and\n" "send it with your mail?"); -ALIGNED(4) const u8 gUnknown_80E3430[] = _( +ALIGNED(4) static const u8 gUnknown_80E3430[] = _( "This mail already has an attached\n" "{COLOR CYAN_G}reward item{RESET}.{EXTRA_MSG}Once an item has been chosen, it may not\n" "be exchanged with another item."); -ALIGNED(4) const u8 gUnknown_80E34B0[] = _( +ALIGNED(4) static const u8 gUnknown_80E34B0[] = _( "Would you like to resend the mail\n" "with the same item attached?"); -ALIGNED(4) const u8 gUnknown_80E34F0[] = _( +ALIGNED(4) static const u8 gUnknown_80E34F0[] = _( "Please select a {COLOR CYAN_G}Thank-You Mail{RESET}\n" "from the GBA Game Pak."); -ALIGNED(4) const u8 gUnknown_80E352C[] = _( +ALIGNED(4) static const u8 gUnknown_80E352C[] = _( "Is it OK to accept this {COLOR CYAN_G}Thank-You Mail{RESET}?"); -ALIGNED(4) const u8 gUnknown_80E355C[] = _( +ALIGNED(4) static const u8 gUnknown_80E355C[] = _( "Mail can't be sent to a GBA Game Pak\n" "with the game quicksaved in a dungeon."); -ALIGNED(4) const u8 gUnknown_80E35AC[] = _( +ALIGNED(4) static const u8 gUnknown_80E35AC[] = _( "The GBA Game Pak does not have\n" "a {COLOR CYAN_G}Thank-You Mail{RESET} on it."); -ALIGNED(4) const u8 gUnknown_80E35E8[] = _( +ALIGNED(4) static const u8 gUnknown_80E35E8[] = _( "There is no {COLOR CYAN_G}Thank-You Mail{RESET}."); -ALIGNED(4) const u8 gUnknown_80E360C[] = _( +ALIGNED(4) static const u8 gUnknown_80E360C[] = _( "How would you like to send\n" "your {COLOR CYAN_G}Thank-You Mail{RESET}?"); -ALIGNED(4) const u8 gUnknown_80E3644[] = _( +ALIGNED(4) static const u8 gUnknown_80E3644[] = _( "How would you like to receive\n" "the {COLOR CYAN_G}Thank-You Mail{RESET}?"); -ALIGNED(4) const u8 gUnknown_80E367C[] = _( +ALIGNED(4) static const u8 gUnknown_80E367C[] = _( "Read which Info?"); -ALIGNED(4) const u8 gUnknown_80E3690[] = _( +ALIGNED(4) static const u8 gUnknown_80E3690[] = _( "If your team is defeated and in need\n" "of rescuing, send an {COLOR CYAN_G}SOS Mail{RESET}\n" "to a friend.{EXTRA_MSG}Once you send your mail, you must wait\n" @@ -323,7 +323,7 @@ ALIGNED(4) const u8 gUnknown_80E3690[] = _( "to send a {COLOR CYAN_G}Thank-You Mail{RESET} to the friend\n" "who came to your rescue."); -ALIGNED(4) const u8 gUnknown_80E3818[] = _( +ALIGNED(4) static const u8 gUnknown_80E3818[] = _( "If your team is defeated in\n" "a dungeon, you may send a friend\n" "an {COLOR CYAN_G}SOS Mail{RESET} for help.{EXTRA_MSG}However, there are some places\n" @@ -334,7 +334,7 @@ ALIGNED(4) const u8 gUnknown_80E3818[] = _( "you will have to give up and return\n" "to your rescue team base."); -ALIGNED(4) const u8 gUnknown_80E3998[] = _( +ALIGNED(4) static const u8 gUnknown_80E3998[] = _( "If your friend successfully rescues\n" "your team, accept your friend's\n" "{COLOR CYAN_G}A-OK Mail{RESET}.{EXTRA_MSG}Once the {COLOR CYAN_G}A-OK Mail{RESET} is received,\n" @@ -345,14 +345,14 @@ ALIGNED(4) const u8 gUnknown_80E3998[] = _( "be able to bring an item with it when\n" "joining your team."); -ALIGNED(4) const u8 gUnknown_80E3B1C[] = _( +ALIGNED(4) static const u8 gUnknown_80E3B1C[] = _( "If your team has been rescued, be sure\n" "to send a {COLOR CYAN_G}Thank-You Mail{RESET} to the friend\n" "that came to your help.{EXTRA_MSG}You may also attach a {COLOR CYAN_G}reward item{RESET}\n" "from storage to your {COLOR CYAN_G}Thank-You Mail{RESET}\n" "and send it to your friend."); -ALIGNED(4) const u8 gUnknown_80E3BF8[] = _( +ALIGNED(4) static const u8 gUnknown_80E3BF8[] = _( "If your friend's team needs rescuing,\n" "you must first receive an {COLOR CYAN_G}SOS Mail{RESET}\n" "from your friend.{EXTRA_MSG}When you get the mail, you may embark\n" @@ -364,13 +364,13 @@ ALIGNED(4) const u8 gUnknown_80E3BF8[] = _( "you may not choose {COLOR CYAN_G}Go Rescue{RESET}.\n" "Your last save must be out of a dungeon."); -ALIGNED(4) const u8 gUnknown_80E3DE4[] = _( +ALIGNED(4) static const u8 gUnknown_80E3DE4[] = _( "You may receive an {COLOR CYAN_G}SOS Mail{RESET} from\n" "a friend's team that lies defeated in\n" "a dungeon.{EXTRA_MSG}If there is no space for new mail, delete\n" "old mail at the {COLOR CYAN_G}Pelipper Post Office{RESET}."); -ALIGNED(4) const u8 gUnknown_80E3E98[] = _( +ALIGNED(4) static const u8 gUnknown_80E3E98[] = _( "If you successfully rescue your friend's\n" "team, send your friend an {COLOR CYAN_G}A-OK Mail{RESET}.{EXTRA_MSG}Using a {COLOR CYAN_G}Game Link cable{RESET}, you may\n" "also send your friend a Pokémon from\n" @@ -379,7 +379,7 @@ ALIGNED(4) const u8 gUnknown_80E3E98[] = _( "its Friend Area.{EXTRA_MSG}If there is no space for new mail, delete\n" "old mail at the {COLOR CYAN_G}Pelipper Post Office{RESET}."); -ALIGNED(4) const u8 gUnknown_80E4014[] = _( +ALIGNED(4) static const u8 gUnknown_80E4014[] = _( "When you receive an {COLOR CYAN_G}SOS Mail{RESET},\n" "you may embark on your rescue mission\n" "from the {COLOR CYAN_G}Pelipper Post Office{RESET}.{EXTRA_MSG}Beware--if you do not have access to\n" @@ -387,13 +387,13 @@ ALIGNED(4) const u8 gUnknown_80E4014[] = _( "on a rescue mission there.{EXTRA_MSG}Accept challenging rescues only\n" "if you are ready and qualified!"); -ALIGNED(4) const u8 gUnknown_80E4130[] = _( +ALIGNED(4) static const u8 gUnknown_80E4130[] = _( "If you send an {COLOR CYAN_G}A-OK Mail{RESET}, you may\n" "receive a {COLOR CYAN_G}Thank-You Mail{RESET} in return\n" "from your friend.{EXTRA_MSG}The {COLOR CYAN_G}Thank-You Mail{RESET} may also come\n" "with a {COLOR CYAN_G}reward item{RESET} attached."); -ALIGNED(4) const u8 gUnknown_80E41DC[] = _( +ALIGNED(4) static const u8 gUnknown_80E41DC[] = _( "Using the {COLOR CYAN_G}Dual Slot{RESET} function,\n" "you may perform rescue operations with\n" "friends using the GBA Game Pak version.{EXTRA_MSG}Insert the DS Game Card and the GBA\n" @@ -402,7 +402,7 @@ ALIGNED(4) const u8 gUnknown_80E41DC[] = _( "the {COLOR CYAN_G}Dual Slot{RESET} function will be\n" "available on the main menu. "); -ALIGNED(4) const u8 gUnknown_80E4314[] = _( +ALIGNED(4) static const u8 gUnknown_80E4314[] = _( "Friends can rescue each other's defeated\n" "teams using a {COLOR CYAN_G}Game Link cable{RESET},\n" "{COLOR CYAN_G}passwords{RESET}, and so on.{EXTRA_MSG}You may go on a rescue mission to save\n" @@ -412,87 +412,87 @@ ALIGNED(4) const u8 gUnknown_80E4314[] = _( "exchange help with faraway friends."); -ALIGNED(4) const u8 gUnknown_80E4480[] = _( +ALIGNED(4) static const u8 gUnknown_80E4480[] = _( "There was a communication error."); -ALIGNED(4) const u8 gUnknown_80E44A4[] = _( +ALIGNED(4) static const u8 gUnknown_80E44A4[] = _( "An incorrect number of GBA systems are\n" "connected.\n" "Please redo this process from the start."); -ALIGNED(4) const u8 gUnknown_80E4500[] = _( +ALIGNED(4) static const u8 gUnknown_80E4500[] = _( "There is no response from your friend.\n" "Please redo this process from the start."); -ALIGNED(4) const u8 gUnknown_80E4550[] = _( +ALIGNED(4) static const u8 gUnknown_80E4550[] = _( "The sender and receiver appear to be\n" "in different modes.\n" "Please redo the process from the start."); -ALIGNED(4) const u8 gUnknown_80E45B4[] = _( +ALIGNED(4) static const u8 gUnknown_80E45B4[] = _( "Your storage space is full.\n" "Please make room, then redo the\n" "process from the start."); -ALIGNED(4) const u8 gUnknown_80E460C[] = _( +ALIGNED(4) static const u8 gUnknown_80E460C[] = _( "This mail has been received before.\n" "It cannot be received again."); -ALIGNED(4) const u8 gUnknown_80E4650[] = _( +ALIGNED(4) static const u8 gUnknown_80E4650[] = _( "This mail has been sent already.\n" "It cannot be sent again."); -ALIGNED(4) const u8 gUnknown_80E468C[] = _( +ALIGNED(4) static const u8 gUnknown_80E468C[] = _( "You do not appear eligible to receive\n" "this {COLOR CYAN_G}A-OK Mail{RESET}."); -ALIGNED(4) const u8 gUnknown_80E46C8[] = _( +ALIGNED(4) static const u8 gUnknown_80E46C8[] = _( "Your friend is not eligible to receive\n" "this {COLOR CYAN_G}A-OK Mail{RESET}."); -ALIGNED(4) const u8 gUnknown_80E4704[] = _( +ALIGNED(4) static const u8 gUnknown_80E4704[] = _( "You do not appear eligible to receive\n" "this {COLOR CYAN_G}Thank-You Mail{RESET}."); -ALIGNED(4) const u8 gUnknown_80E4744[] = _( +ALIGNED(4) static const u8 gUnknown_80E4744[] = _( "Your friend is not eligible to receive\n" "this {COLOR CYAN_G}Thank-You Mail{RESET}."); -ALIGNED(4) const u8 gUnknown_80E4788[] = _( +ALIGNED(4) static const u8 gUnknown_80E4788[] = _( "Something went wrong.\n" "Please turn off the power and\n" "reinsert the GBA Game Pak."); -ALIGNED(4) const u8 gUnknown_80E47D8[] = _( +ALIGNED(4) static const u8 gUnknown_80E47D8[] = _( "There is no space for receiving new\n" "mail.\n" "Please delete old mail, then try again."); -ALIGNED(4) const u8 gUnknown_80E482C[] = _( +ALIGNED(4) static const u8 gUnknown_80E482C[] = _( "There is no response from your friend.\n" "Please make sure the sender and receiver\n" "are ready, then redo this from the start."); -ALIGNED(4) const u8 gUnknown_80E48A8[] = _( +ALIGNED(4) static const u8 gUnknown_80E48A8[] = _( "This password is incorrect.\n" "Would you like to enter it again?"); -ALIGNED(4) const u8 gUnknown_80E48E8[] = _( +ALIGNED(4) static const u8 gUnknown_80E48E8[] = _( "This password does not appear to be\n" "that of an {COLOR CYAN_G}SOS Mail{RESET}."); -ALIGNED(4) const u8 gUnknown_80E4928[] = _( +ALIGNED(4) static const u8 gUnknown_80E4928[] = _( "Received the {COLOR CYAN_G}SOS Mail{RESET}.\n" "Your adventure will be saved."); -ALIGNED(4) const u8 gUnknown_80E4964[] = _( +ALIGNED(4) static const u8 gUnknown_80E4964[] = _( "This password does not appear to be\n" "an {COLOR CYAN_G}A-OK Mail{RESET}."); -ALIGNED(4) const u8 gUnknown_80E499C[] = _( +ALIGNED(4) static const u8 gUnknown_80E499C[] = _( "This password can no longer be used."); -ALIGNED(4) const u8 gUnknown_80E49C4[] = _( +ALIGNED(4) static const u8 gUnknown_80E49C4[] = _( "This password does not appear to be\n" "that of a {COLOR CYAN_G}Thank-You Mail{RESET}."); diff --git a/src/script_vars_info.c b/src/script_vars_info.c new file mode 100644 index 000000000..7ba2242c5 --- /dev/null +++ b/src/script_vars_info.c @@ -0,0 +1,88 @@ +#include "global.h" +#include "globaldata.h" +#include "event_flag.h" + +const struct ScriptVarInfo gScriptVarInfo[] = { + [VERSION] = {6, 2, 0, 0, 1, 29, "VERSION"}, + [CONDITION] = {6, 2, 4, 0, 1, 0, "CONDITION"}, + [SCENARIO_SELECT] = {2, 2, 110, 0, 2, 0, "SCENARIO_SELECT"}, + [SCENARIO_MAIN] = {2, 2, 112, 0, 2, 0, "SCENARIO_MAIN"}, + [SCENARIO_SUB1] = {2, 2, 114, 0, 2, 0, "SCENARIO_SUB1"}, + [SCENARIO_SUB2] = {2, 2, 116, 0, 2, 0, "SCENARIO_SUB2"}, + [SCENARIO_SUB3] = {2, 2, 118, 0, 2, 0, "SCENARIO_SUB3"}, + [SCENARIO_SUB4] = {2, 2, 120, 0, 2, 0, "SCENARIO_SUB4"}, + [SCENARIO_SUB5] = {2, 2, 122, 0, 2, 0, "SCENARIO_SUB5"}, + [SCENARIO_SUB6] = {2, 2, 124, 0, 2, 0, "SCENARIO_SUB6"}, + [SCENARIO_SUB7] = {2, 2, 126, 0, 2, 0, "SCENARIO_SUB7"}, + [SCENARIO_SUB8] = {2, 2, 128, 0, 2, 0, "SCENARIO_SUB8"}, + [SCENARIO_SUB9] = {2, 2, 130, 0, 2, 0, "SCENARIO_SUB9"}, + [GROUND_ENTER] = {5, 2, 44, 0, 1, 0, "GROUND_ENTER"}, + [GROUND_ENTER_LINK] = {2, 2, 132, 0, 1, 0, "GROUND_ENTER_LINK"}, + [GROUND_GETOUT] = {5, 2, 46, 0, 1, 0, "GROUND_GETOUT"}, + [GROUND_MAP] = {5, 2, 48, 0, 1, 0, "GROUND_MAP"}, + [GROUND_PLACE] = {5, 2, 50, 0, 1, 0, "GROUND_PLACE"}, + [DUNGEON_SELECT] = {5, 2, 52, 0, 1, 0, "DUNGEON_SELECT"}, + [DUNGEON_ENTER] = {5, 2, 54, 0, 1, 0, "DUNGEON_ENTER"}, + [DUNGEON_ENTER_INDEX] = {5, 2, 56, 0, 1, 0, "DUNGEON_ENTER_INDEX"}, + [DUNGEON_ENTER_FREQUENCY] = {4, 2, 94, 0, 1, 0, "DUNGEON_ENTER_FREQUENCY"}, + [DUNGEON_RESULT] = {2, 2, 133, 0, 1, 0, "DUNGEON_RESULT"}, + [SCRIPT_MODE] = {8, 2, 0, 0, 1, 0, "SCRIPT_MODE"}, + [START_MODE] = {2, 2, 134, 0, 1, 0, "START_MODE"}, + [CLEAR_COUNT] = {2, 2, 135, 0, 1, 0, "CLEAR_COUNT"}, + [CONDITION_KIND] = {2, 2, 136, 0, 1, 0, "CONDITION_KIND"}, + [WEATHER_KIND] = {3, 2, 96, 0, 1, 0, "WEATHER_KIND"}, + [PLAYER_KIND] = {2, 2, 137, 0, 1, 0, "PLAYER_KIND"}, + [PARTNER1_KIND] = {2, 2, 138, 0, 1, 0, "PARTNER1_KIND"}, + [PARTNER2_KIND] = {2, 2, 139, 0, 1, 0, "PARTNER2_KIND"}, + [NEW_FRIEND_KIND] = {5, 2, 58, 0, 1, 0, "NEW_FRIEND_KIND"}, + [FRIEND_SUM] = {8, 2, 0, 0, 1, 0, "FRIEND_SUM"}, + [UNIT_SUM] = {8, 2, 0, 0, 1, 0, "UNIT_SUM"}, + [GOLD] = {8, 2, 0, 0, 1, 0, "GOLD"}, + [BANK_GOLD] = {8, 2, 0, 0, 1, 0, "BANK_GOLD"}, + [WARP_LIST] = {1, 2, 140, 0, 16, 0, "WARP_LIST"}, + [WARP_LOCK] = {3, 2, 97, 0, 1, 0, "WARP_LOCK"}, + [PARTNER_TALK_KIND] = {3, 2, 98, 0, 1, 0, "PARTNER_TALK_KIND"}, + [BASE_KIND] = {3, 2, 99, 0, 1, 0, "BASE_KIND"}, + [BASE_LEVEL] = {3, 2, 100, 0, 1, 0, "BASE_LEVEL"}, + [FLAG_KIND] = {3, 2, 101, 0, 1, 0, "FLAG_KIND"}, + [FLAG_KIND_CHANGE_REQUEST] = {3, 2, 102, 0, 1, 0, "FLAG_KIND_CHANGE_REQUEST"}, + [RESCUE_SCENARIO_ORDER_LIST] = {1, 2, 142, 0, 64, 0, "RESCUE_SCENARIO_ORDER_LIST"}, + [RESCUE_SCENARIO_JOB_LIST] = {1, 2, 150, 0, 64, 0, "RESCUE_SCENARIO_JOB_LIST"}, + [RESCUE_SCENARIO_CONQUEST_LIST] = {1, 2, 158, 0, 64, 0, "RESCUE_SCENARIO_CONQUEST_LIST"}, + [TRAINING_CONQUEST_LIST] = {1, 2, 166, 0, 32, 0, "TRAINING_CONQUEST_LIST"}, + [TRAINING_PRESENT_LIST] = {1, 2, 170, 0, 32, 0, "TRAINING_PRESENT_LIST"}, + [DUNGEON_ENTER_LIST] = {1, 2, 174, 0, 96, 0, "DUNGEON_ENTER_LIST"}, + [DUNGEON_CLEAR_LIST] = {1, 2, 186, 0, 96, 0, "DUNGEON_CLEAR_LIST"}, + [POSITION_X] = {6, 2, 8, 0, 3, 0, "POSITION_X"}, + [POSITION_Y] = {6, 2, 20, 0, 3, 0, "POSITION_Y"}, + [POSITION_HEIGHT] = {6, 2, 32, 0, 3, 0, "POSITION_HEIGHT"}, + [POSITION_DIRECTION] = {3, 2, 103, 0, 3, 0, "POSITION_DIRECTION"}, + [GROUND_LOCAL] = {5, 5, 60, 0, 1, 0, "GROUND_LOCAL"}, + [MAP_LOCAL] = {5, 5, 62, 0, 1, 0, "MAP_LOCAL"}, + [MAP_LOCAL_DOOR] = {1, 5, 198, 0, 8, 0, "MAP_LOCAL_DOOR"}, + [EVENT_LOCAL] = {5, 5, 64, 0, 1, 0, "EVENT_LOCAL"}, + [STATION_ITEM_STATIC] = {1, 5, 199, 0, 32, 0, "STATION_ITEM_STATIC"}, + [STATION_ITEM_TEMP] = {1, 5, 203, 0, 32, 0, "STATION_ITEM_TEMP"}, + [DELIVER_ITEM_STATIC] = {1, 5, 207, 0, 16, 0, "DELIVER_ITEM_STATIC"}, + [DELIVER_ITEM_TEMP] = {1, 5, 209, 0, 16, 0, "DELIVER_ITEM_TEMP"}, + [SHOP_TEMP] = {5, 5, 66, 0, 8, 0, "SHOP_TEMP"}, + [INN_TEMP] = {1, 5, 211, 0, 16, 0, "INN_TEMP"}, + [EVENT_S07E01] = {1, 6, 213, 0, 16, 0, "EVENT_S07E01"}, + [EVENT_S08E01] = {5, 6, 82, 0, 2, 0, "EVENT_S08E01"}, + [EVENT_GONBE] = {5, 6, 86, 0, 4, 0, "EVENT_GONBE"}, + [EVENT_ORNAMENT_01] = {3, 6, 106, 0, 1, 0, "EVENT_ORNAMENT_01"}, + [EVENT_ORNAMENT_02] = {3, 6, 107, 0, 1, 0, "EVENT_ORNAMENT_02"}, + [EVENT_ORNAMENT_03] = {3, 6, 108, 0, 1, 0, "EVENT_ORNAMENT_03"}, + [EVENT_ORNAMENT_04] = {3, 6, 109, 0, 1, 0, "EVENT_ORNAMENT_04"}, + [EVENT_B01P01] = {1, 6, 215, 0, 16, 0, "EVENT_B01P01"}, + [EVENT_T01P01] = {1, 6, 217, 0, 16, 0, "EVENT_T01P01"}, + [EVENT_T01P02] = {1, 6, 219, 0, 16, 0, "EVENT_T01P02"}, + [EVENT_T01P03] = {1, 6, 221, 0, 16, 0, "EVENT_T01P03"}, + [EVENT_M01E09A_2N] = {1, 6, 223, 0, 8, 0, "EVENT_M01E09A_2N"}, + [EVENT_M01E09A_8N] = {1, 6, 224, 0, 8, 0, "EVENT_M01E09A_8N"}, + [EVENT_M01E10A_1N] = {1, 6, 225, 0, 8, 0, "EVENT_M01E10A_1N"}, + [EVENT_M01E10A_3N] = {1, 6, 226, 0, 8, 0, "EVENT_M01E10A_3N"}, + [EVENT_M01E10A_5N] = {1, 6, 227, 0, 8, 0, "EVENT_M01E10A_5N"}, + [EVENT_M02E01A_2N] = {1, 6, 228, 0, 8, 0, "EVENT_M02E01A_2N"}, + [SUM] = {0, 0, 229, 0, 0, 0, "SUM"}, +};