From 4f743559340e199b4ca65bcc3bc5ea18569b138e Mon Sep 17 00:00:00 2001 From: red031000 Date: Sun, 6 Jun 2021 20:09:09 +0100 Subject: some progress on rowan's overlay --- arm9/modules/59/asm/mod59_021D74E0_asm.s | 197 ------------------------------- arm9/modules/59/include/mod59_021D74E0.h | 16 ++- arm9/modules/59/src/mod59_021D74E0_src.c | 155 +++++++++++++++++++++++- arm9/src/player_data.c | 2 +- include/player_data.h | 2 +- 5 files changed, 166 insertions(+), 206 deletions(-) diff --git a/arm9/modules/59/asm/mod59_021D74E0_asm.s b/arm9/modules/59/asm/mod59_021D74E0_asm.s index a48cd966..627f31bf 100644 --- a/arm9/modules/59/asm/mod59_021D74E0_asm.s +++ b/arm9/modules/59/asm/mod59_021D74E0_asm.s @@ -3,203 +3,6 @@ .section .text .balign 4, 0 - thumb_func_start MOD59_021D7564 -MOD59_021D7564: ; 0x021D7564 - push {r3, r4, r5, r6, lr} - sub sp, #0xc - add r5, r1, #0 - bl OverlayManager_GetData - ldr r1, [r5] - add r4, r0, #0 - mov r6, #0 - cmp r1, #5 - bls _021D757A - b _021D76AC -_021D757A: - add r1, r1, r1 - add r1, pc - ldrh r1, [r1, #6] - lsl r1, r1, #0x10 - asr r1, r1, #0x10 - add pc, r1 -_021D7586: ; jump table - .short _021D7592 - _021D7586 - 2 ; case 0 - .short _021D75FA - _021D7586 - 2 ; case 1 - .short _021D7642 - _021D7586 - 2 ; case 2 - .short _021D7668 - _021D7586 - 2 ; case 3 - .short _021D7690 - _021D7586 - 2 ; case 4 - .short _021D76AA - _021D7586 - 2 ; case 5 -_021D7592: - add r0, r6, #0 - add r1, r6, #0 - bl FUN_0200E3A0 - mov r0, #1 - add r1, r6, #0 - bl FUN_0200E3A0 - add r0, r6, #0 - add r1, r0, #0 - bl Main_SetVBlankIntrCB - add r0, r6, #0 - add r1, r0, #0 - bl FUN_02015F34 - bl GX_DisableEngineALayers - bl GX_DisableEngineBLayers - mov r2, #1 - lsl r2, r2, #0x1a - ldr r1, [r2] - ldr r0, _021D76B4 ; =0xFFFFE0FF - and r1, r0 - str r1, [r2] - ldr r2, _021D76B8 ; =0x04001000 - ldr r1, [r2] - and r0, r1 - str r0, [r2] - mov r0, #4 - mov r1, #8 - bl SetKeyRepeatTimers - add r0, r4, #0 - bl MOD59_021D778C - add r0, r4, #0 - bl MOD59_021D79F8 - add r0, r4, #0 - bl MOD59_021D7A4C - ldr r0, _021D76BC ; =MOD59_021D7724 - add r1, r4, #0 - bl Main_SetVBlankIntrCB - bl GX_BothDispOn - mov r0, #1 - str r0, [r5] - b _021D76AC -_021D75FA: - bl MOD59_021D8920 - cmp r0, #1 - bne _021D761E - mov r0, #6 - str r0, [sp] - mov r0, #1 - str r0, [sp, #4] - ldr r0, [r4] - str r0, [sp, #8] - add r0, r6, #0 - add r1, r0, #0 - add r2, r0, #0 - add r3, r0, #0 - bl FUN_0200E1D0 - mov r0, #2 - str r0, [r5] -_021D761E: - ldr r0, [r4, #0x14] - cmp r0, #0 - beq _021D76AC - mov r0, #6 - str r0, [sp] - mov r0, #1 - str r0, [sp, #4] - ldr r0, [r4] - str r0, [sp, #8] - mov r0, #0 - add r1, r0, #0 - add r2, r0, #0 - add r3, r0, #0 - bl FUN_0200E1D0 - mov r0, #3 - str r0, [r5] - b _021D76AC -_021D7642: - bl FUN_0200E308 - cmp r0, #1 - bne _021D76AC - add r0, r4, #0 - bl MOD59_021D7A34 - add r0, r4, #0 - bl MOD59_021D796C - add r0, r4, #0 - bl MOD59_021D7A5C - add r0, r6, #0 - add r1, r0, #0 - bl Main_SetVBlankIntrCB - mov r6, #1 - b _021D76AC -_021D7668: - bl FUN_0200E308 - cmp r0, #1 - bne _021D76AC - add r0, r4, #0 - bl MOD59_021D7A34 - add r0, r4, #0 - bl MOD59_021D796C - add r0, r4, #0 - bl MOD59_021D7A5C - add r0, r6, #0 - add r1, r0, #0 - bl Main_SetVBlankIntrCB - mov r0, #4 - str r0, [r5] - b _021D76AC -_021D7690: - ldr r0, [r4, #0x14] - bl OverlayManager_Run - cmp r0, #1 - bne _021D76AC - ldr r0, [r4, #0x14] - bl OverlayManager_delete - add r0, r6, #0 - str r0, [r4, #0x14] - mov r0, #5 - str r0, [r5] - b _021D76AC -_021D76AA: - str r6, [r5] -_021D76AC: - add r0, r6, #0 - add sp, #0xc - pop {r3, r4, r5, r6, pc} - nop -_021D76B4: .word 0xFFFFE0FF -_021D76B8: .word 0x04001000 -_021D76BC: .word MOD59_021D7724 - thumb_func_end MOD59_021D7564 - - thumb_func_start MOD59_021D76C0 -MOD59_021D76C0: ; 0x021D76C0 - push {r4, r5, r6, lr} - add r6, r0, #0 - bl OverlayManager_GetData - add r4, r0, #0 - ldr r0, [r4, #4] - ldr r5, [r4] - bl Sav2_PlayerData_GetProfileAddr - ldr r1, [r4, #0x70] - ldr r1, [r1, #0x18] - bl PlayerName_StringToFlat - ldr r0, [r4, #4] - bl Sav2_PlayerData_GetProfileAddr - ldr r1, [r4, #0x70] - ldr r1, [r1, #4] - bl PlayerProfile_SetTrainerGender - ldr r0, [r4, #4] - bl FUN_02024EB4 - ldr r1, [r4, #0x74] - ldr r1, [r1, #0x18] - bl RivalsNameToU16Array - ldr r0, [r4, #0x70] - bl FUN_02077AC4 - ldr r0, [r4, #0x74] - bl FUN_02077AC4 - add r0, r6, #0 - bl OverlayManager_FreeData - add r0, r5, #0 - bl DestroyHeap - ldr r0, _021D771C ; =SDK_OVERLAY_MODULE_52_ID - ldr r1, _021D7720 ; =MOD52_021D76D8 - bl RegisterMainOverlay - mov r0, #1 - pop {r4, r5, r6, pc} - nop -_021D771C: .word SDK_OVERLAY_MODULE_52_ID -_021D7720: .word MOD52_021D76D8 - thumb_func_end MOD59_021D76C0 - thumb_func_start MOD59_021D7724 MOD59_021D7724: ; 0x021D7724 ldr r3, _021D772C ; =FUN_0201AB60 diff --git a/arm9/modules/59/include/mod59_021D74E0.h b/arm9/modules/59/include/mod59_021D74E0.h index 9342913d..a33e34fc 100644 --- a/arm9/modules/59/include/mod59_021D74E0.h +++ b/arm9/modules/59/include/mod59_021D74E0.h @@ -6,6 +6,14 @@ #include "save_block_2.h" #include "main.h" +struct MOD59_UnkPlayerStruct +{ + u8 padding[0x4]; + u32 gender; + u8 padding2[0x10]; + struct String *name; +}; + typedef struct MOD59_OverlayData { u32 heap_id; @@ -13,10 +21,10 @@ typedef struct MOD59_OverlayData struct Options *options; u32 Unk0C; u32 Unk10; - u32 Unk14; + struct UnkStruct_02006234 *Unk14; u8 padding[0x58]; - u32 Unk70; - u32 Unk74; + struct MOD59_UnkPlayerStruct *playerStruct; + struct MOD59_UnkPlayerStruct *rivalStruct; u8 padding2[0x10]; u8 Unk88; u8 Unk89; @@ -28,5 +36,7 @@ typedef struct MOD59_OverlayData } MOD59_OverlayData; BOOL MOD59_Init(struct UnkStruct_02006234 *param0); +BOOL MOD59_021D7564(struct UnkStruct_02006234 *param0, u32 *param1); +BOOL MOD59_021D76C0(struct UnkStruct_02006234 *param0); #endif //POKEDIAMOND_MOD59_021D74E0_H diff --git a/arm9/modules/59/src/mod59_021D74E0_src.c b/arm9/modules/59/src/mod59_021D74E0_src.c index be8dac20..34912948 100644 --- a/arm9/modules/59/src/mod59_021D74E0_src.c +++ b/arm9/modules/59/src/mod59_021D74E0_src.c @@ -3,9 +3,30 @@ #include "overlay_manager.h" #include "mod59_021D74E0.h" #include "heap.h" +#include "game_init.h" +#include "GX_layers.h" +#include "unk_02024E64.h" +#include "module_52.h" +extern void *FUN_02077A84(u32 heap_id, u32 param1, u32 param2, u32 param3, struct Options *options); -extern u32 FUN_02077A84(u32 heap_id, u32 param1, u32 param2, u32 param3, struct Options *options); +extern void FUN_0200E3A0(PMLCDTarget, int); + +extern void MOD59_021D778C(MOD59_OverlayData *data); +extern void MOD59_021D79F8(MOD59_OverlayData *data); +extern void MOD59_021D7A34(MOD59_OverlayData *data); +extern void MOD59_021D796C(MOD59_OverlayData *data); +extern void MOD59_021D7A4C(MOD59_OverlayData *data); +extern void MOD59_021D7A5C(MOD59_OverlayData *data); +extern void MOD59_021D7724(void *data); +extern u32 MOD59_021D8920(MOD59_OverlayData *data); + +extern void FUN_0200E1D0(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 heap_id); +extern u32 FUN_0200E308(void); + +extern void FUN_02077AC4(void *param0); + +FS_EXTERN_OVERLAY(MODULE_52); THUMB_FUNC BOOL MOD59_Init(struct UnkStruct_02006234 *param0) { @@ -18,9 +39,10 @@ THUMB_FUNC BOOL MOD59_Init(struct UnkStruct_02006234 *param0) int *field18 = OverlayManager_GetField18(param0); data->sav2 = (struct SaveBlock2 *)field18[2]; //? data->options = Sav2_PlayerData_GetOptionsAddr(data->sav2); - data->Unk14 = data->Unk10 = data->Unk0C = 0; - data->Unk70 = FUN_02077A84(0x52, 0, 0, 7, data->options); - data->Unk74 = FUN_02077A84(0x52, 3, 0, 7, data->options); + data->Unk10 = data->Unk0C = 0; + data->Unk14 = NULL; + data->playerStruct = (struct MOD59_UnkPlayerStruct *)FUN_02077A84(0x52, 0, 0, 7, data->options); + data->rivalStruct = (struct MOD59_UnkPlayerStruct *)FUN_02077A84(0x52, 3, 0, 7, data->options); data->Unk88 = 0; data->Unk89 = 0; data->Unk8A = 0; @@ -28,3 +50,128 @@ THUMB_FUNC BOOL MOD59_Init(struct UnkStruct_02006234 *param0) data->Unk90 = 0; return TRUE; } + +THUMB_FUNC BOOL MOD59_021D7564(struct UnkStruct_02006234 *param0, u32 *param1) +{ + MOD59_OverlayData *data = (MOD59_OverlayData *) OverlayManager_GetData(param0); + BOOL ret = FALSE; + + switch (*param1) + { + case 0: + FUN_0200E3A0(PM_LCD_TOP, 0); + FUN_0200E3A0(PM_LCD_BOTTOM, 0); + + Main_SetVBlankIntrCB(NULL, NULL); + + FUN_02015F34(NULL, NULL); + GX_DisableEngineALayers(); + GX_DisableEngineBLayers(); + + reg_GX_DISPCNT = reg_GX_DISPCNT & 0xFFFFE0FF; + reg_GXS_DB_DISPCNT = reg_GXS_DB_DISPCNT & 0xFFFFE0FF; + + SetKeyRepeatTimers(4, 8); + + MOD59_021D778C(data); + MOD59_021D79F8(data); + MOD59_021D7A4C(data); + + Main_SetVBlankIntrCB(MOD59_021D7724, data); + + GX_BothDispOn(); + + *param1 = 1; + + break; + + case 1: + if (MOD59_021D8920(data) == 1) + { + FUN_0200E1D0(0, 0, 0, 0, 6, 1, data->heap_id); + *param1 = 2; + } + + if (data->Unk14 == NULL) + { + break; + } + + FUN_0200E1D0(0, 0, 0, 0, 6, 1, data->heap_id); + *param1 = 3; + + break; + + case 2: + if (FUN_0200E308() != 1) + { + break; + } + + MOD59_021D7A34(data); + MOD59_021D796C(data); + MOD59_021D7A5C(data); + + Main_SetVBlankIntrCB(NULL, NULL); + + ret = TRUE; + break; + + case 3: + if (FUN_0200E308() != 1) + { + break; + } + + MOD59_021D7A34(data); + MOD59_021D796C(data); + MOD59_021D7A5C(data); + + Main_SetVBlankIntrCB(NULL, NULL); + + *param1 = 4; + + break; + + case 4: + if (OverlayManager_Run(data->Unk14) != TRUE) + { + break; + } + + OverlayManager_delete(data->Unk14); + data->Unk14 = NULL; + + *param1 = 5; + + break; + + case 5: + *param1 = 0; + + break; + } + + return ret; +} + +THUMB_FUNC BOOL MOD59_021D76C0(struct UnkStruct_02006234 *param0) +{ + MOD59_OverlayData *data = (MOD59_OverlayData *) OverlayManager_GetData(param0); + + u32 heap_id = data->heap_id; + PlayerName_StringToFlat(Sav2_PlayerData_GetProfileAddr(data->sav2), data->playerStruct->name); + PlayerProfile_SetTrainerGender(Sav2_PlayerData_GetProfileAddr(data->sav2), data->playerStruct->gender); + + RivalsNameToU16Array(FUN_02024EB4(data->sav2), data->rivalStruct->name); + + FUN_02077AC4(data->playerStruct); + FUN_02077AC4(data->rivalStruct); + + OverlayManager_FreeData(param0); + DestroyHeap(heap_id); + + RegisterMainOverlay(FS_OVERLAY_ID(MODULE_52), &MOD52_021D76D8); + + return TRUE; +} diff --git a/arm9/src/player_data.c b/arm9/src/player_data.c index ea5802aa..be2fe7f4 100644 --- a/arm9/src/player_data.c +++ b/arm9/src/player_data.c @@ -111,7 +111,7 @@ u16 PlayerProfile_GetTrainerID_VisibleHalf(struct PlayerData * data) return (u16)data->playerId; } -void PlayerProfile_SetTrainerGender(struct PlayerData * data, u8 gender) +void PlayerProfile_SetTrainerGender(struct PlayerData * data, u32 gender) { data->gender = gender; } diff --git a/include/player_data.h b/include/player_data.h index 5095ea61..c86db1c1 100644 --- a/include/player_data.h +++ b/include/player_data.h @@ -51,7 +51,7 @@ struct String * PlayerProfile_GetPlayerName_NewString(struct PlayerData * data, void PlayerProfile_SetTrainerID(struct PlayerData * data, u32 otid); u32 PlayerProfile_GetTrainerID(struct PlayerData * data); u16 PlayerProfile_GetTrainerID_VisibleHalf(struct PlayerData * data); -void PlayerProfile_SetTrainerGender(struct PlayerData * data, u8 gender); +void PlayerProfile_SetTrainerGender(struct PlayerData * data, u32 gender); u32 PlayerProfile_GetTrainerGender(struct PlayerData * data); BOOL PlayerProfile_TestBadgeFlag(struct PlayerData * data, u32 badgeno); void PlayerProfile_SetBadgeFlag(struct PlayerData * data, u32 badgeno); -- cgit v1.2.3 From d887b5d339c2801e3db17ad50529e45ed55addf2 Mon Sep 17 00:00:00 2001 From: red031000 Date: Sun, 6 Jun 2021 20:52:18 +0100 Subject: enum for gender --- arm9/modules/59/include/mod59_021D74E0.h | 6 ++++-- arm9/src/player_data.c | 4 ++-- include/player_data.h | 10 ++++++++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/arm9/modules/59/include/mod59_021D74E0.h b/arm9/modules/59/include/mod59_021D74E0.h index a33e34fc..112512d8 100644 --- a/arm9/modules/59/include/mod59_021D74E0.h +++ b/arm9/modules/59/include/mod59_021D74E0.h @@ -5,11 +5,12 @@ #include "options.h" #include "save_block_2.h" #include "main.h" +#include "player_data.h" struct MOD59_UnkPlayerStruct { u8 padding[0x4]; - u32 gender; + GenderEnum gender; u8 padding2[0x10]; struct String *name; }; @@ -22,7 +23,8 @@ typedef struct MOD59_OverlayData u32 Unk0C; u32 Unk10; struct UnkStruct_02006234 *Unk14; - u8 padding[0x58]; + struct UnkStruct_02016B94_2 *Unk18; + u8 padding[0x54]; struct MOD59_UnkPlayerStruct *playerStruct; struct MOD59_UnkPlayerStruct *rivalStruct; u8 padding2[0x10]; diff --git a/arm9/src/player_data.c b/arm9/src/player_data.c index be2fe7f4..182e99e8 100644 --- a/arm9/src/player_data.c +++ b/arm9/src/player_data.c @@ -111,12 +111,12 @@ u16 PlayerProfile_GetTrainerID_VisibleHalf(struct PlayerData * data) return (u16)data->playerId; } -void PlayerProfile_SetTrainerGender(struct PlayerData * data, u32 gender) +void PlayerProfile_SetTrainerGender(struct PlayerData * data, GenderEnum gender) { data->gender = gender; } -u32 PlayerProfile_GetTrainerGender(struct PlayerData * data) +GenderEnum PlayerProfile_GetTrainerGender(struct PlayerData * data) { return data->gender; } diff --git a/include/player_data.h b/include/player_data.h index c86db1c1..132eb6ae 100644 --- a/include/player_data.h +++ b/include/player_data.h @@ -7,6 +7,12 @@ struct SaveBlock2; +typedef enum +{ + Male = 0, + Female = 1 +} GenderEnum; + struct PlayerData { /* 0x00 */ u16 playerName[OT_NAME_LENGTH + 1]; @@ -51,8 +57,8 @@ struct String * PlayerProfile_GetPlayerName_NewString(struct PlayerData * data, void PlayerProfile_SetTrainerID(struct PlayerData * data, u32 otid); u32 PlayerProfile_GetTrainerID(struct PlayerData * data); u16 PlayerProfile_GetTrainerID_VisibleHalf(struct PlayerData * data); -void PlayerProfile_SetTrainerGender(struct PlayerData * data, u32 gender); -u32 PlayerProfile_GetTrainerGender(struct PlayerData * data); +void PlayerProfile_SetTrainerGender(struct PlayerData * data, GenderEnum gender); +GenderEnum PlayerProfile_GetTrainerGender(struct PlayerData * data); BOOL PlayerProfile_TestBadgeFlag(struct PlayerData * data, u32 badgeno); void PlayerProfile_SetBadgeFlag(struct PlayerData * data, u32 badgeno); u32 PlayerProfile_CountBadges(struct PlayerData * data); -- cgit v1.2.3 From b44f8c765516b1be85c97b76dab07bfee318b407 Mon Sep 17 00:00:00 2001 From: red031000 Date: Mon, 7 Jun 2021 01:16:24 +0100 Subject: another mod59 func --- arm9/modules/59/asm/mod59_021D74E0_asm.s | 64 +------------------------------- arm9/modules/59/include/mod59_021D74E0.h | 4 +- arm9/modules/59/src/mod59_021D74E0_src.c | 35 ++++++++++++++--- 3 files changed, 34 insertions(+), 69 deletions(-) diff --git a/arm9/modules/59/asm/mod59_021D74E0_asm.s b/arm9/modules/59/asm/mod59_021D74E0_asm.s index 627f31bf..7d1c22b6 100644 --- a/arm9/modules/59/asm/mod59_021D74E0_asm.s +++ b/arm9/modules/59/asm/mod59_021D74E0_asm.s @@ -3,69 +3,7 @@ .section .text .balign 4, 0 - thumb_func_start MOD59_021D7724 -MOD59_021D7724: ; 0x021D7724 - ldr r3, _021D772C ; =FUN_0201AB60 - ldr r0, [r0, #0x18] - bx r3 - nop -_021D772C: .word FUN_0201AB60 - thumb_func_end MOD59_021D7724 - - thumb_func_start MOD59_021D7730 -MOD59_021D7730: ; 0x021D7730 - push {r3, r4} - ldr r2, _021D7788 ; =gMain + 0x40 - mov r0, #0 - ldrh r1, [r2, #0x20] - cmp r1, #0 - beq _021D7784 - ldrh r3, [r2, #0x1c] - mov r1, #1 - lsl r1, r1, #8 - cmp r3, r1 - bhs _021D7784 - ldrh r2, [r2, #0x1e] - cmp r2, #0xc0 - bhs _021D7784 - cmp r3, #0x80 - bhs _021D7758 - mov r1, #0x80 - sub r1, r1, r3 - lsl r1, r1, #0x10 - b _021D775C -_021D7758: - sub r3, #0x80 - lsl r1, r3, #0x10 -_021D775C: - lsr r3, r1, #0x10 - cmp r2, #0x64 - bhs _021D776A - mov r1, #0x64 - sub r1, r1, r2 - lsl r1, r1, #0x10 - b _021D776E -_021D776A: - sub r2, #0x64 - lsl r1, r2, #0x10 -_021D776E: - lsr r4, r1, #0x10 - add r2, r3, #0 - add r1, r4, #0 - mul r2, r3 - mul r1, r4 - add r2, r2, r1 - mov r1, #1 - lsl r1, r1, #8 - cmp r2, r1 - bgt _021D7784 - mov r0, #1 -_021D7784: - pop {r3, r4} - bx lr - .align 2, 0 -_021D7788: .word gMain + 0x40 - thumb_func_end MOD59_021D7730 + .extern MOD59_021D7730 thumb_func_start MOD59_021D778C MOD59_021D778C: ; 0x021D778C diff --git a/arm9/modules/59/include/mod59_021D74E0.h b/arm9/modules/59/include/mod59_021D74E0.h index 112512d8..2dd05826 100644 --- a/arm9/modules/59/include/mod59_021D74E0.h +++ b/arm9/modules/59/include/mod59_021D74E0.h @@ -34,11 +34,13 @@ typedef struct MOD59_OverlayData u8 Unk8B; u8 padding3[4]; u32 Unk90; - //TODO pad to 0xb4 + u8 padding4[32]; } MOD59_OverlayData; BOOL MOD59_Init(struct UnkStruct_02006234 *param0); BOOL MOD59_021D7564(struct UnkStruct_02006234 *param0, u32 *param1); BOOL MOD59_021D76C0(struct UnkStruct_02006234 *param0); +void MOD59_021D7724(MOD59_OverlayData *data); +BOOL MOD59_021D7730(void); #endif //POKEDIAMOND_MOD59_021D74E0_H diff --git a/arm9/modules/59/src/mod59_021D74E0_src.c b/arm9/modules/59/src/mod59_021D74E0_src.c index 34912948..9be9eff3 100644 --- a/arm9/modules/59/src/mod59_021D74E0_src.c +++ b/arm9/modules/59/src/mod59_021D74E0_src.c @@ -6,6 +6,7 @@ #include "game_init.h" #include "GX_layers.h" #include "unk_02024E64.h" +#include "unk_02016B94.h" #include "module_52.h" extern void *FUN_02077A84(u32 heap_id, u32 param1, u32 param2, u32 param3, struct Options *options); @@ -18,7 +19,6 @@ extern void MOD59_021D7A34(MOD59_OverlayData *data); extern void MOD59_021D796C(MOD59_OverlayData *data); extern void MOD59_021D7A4C(MOD59_OverlayData *data); extern void MOD59_021D7A5C(MOD59_OverlayData *data); -extern void MOD59_021D7724(void *data); extern u32 MOD59_021D8920(MOD59_OverlayData *data); extern void FUN_0200E1D0(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 heap_id); @@ -30,13 +30,12 @@ FS_EXTERN_OVERLAY(MODULE_52); THUMB_FUNC BOOL MOD59_Init(struct UnkStruct_02006234 *param0) { - //note: 0xb4 is likely the overlay data struct size, once struct is padded replace with sizeof CreateHeap(3, 0x52, 1 << 18); - MOD59_OverlayData *data = (MOD59_OverlayData *) OverlayManager_CreateAndGetData(param0, 0xb4, 0x52); + MOD59_OverlayData *data = (MOD59_OverlayData *) OverlayManager_CreateAndGetData(param0, sizeof(MOD59_OverlayData), 0x52); (void)memset((void *)data, 0, 0xb4); data->heap_id = 0x52; - int *field18 = OverlayManager_GetField18(param0); + s32 *field18 = OverlayManager_GetField18(param0); data->sav2 = (struct SaveBlock2 *)field18[2]; //? data->options = Sav2_PlayerData_GetOptionsAddr(data->sav2); data->Unk10 = data->Unk0C = 0; @@ -77,7 +76,7 @@ THUMB_FUNC BOOL MOD59_021D7564(struct UnkStruct_02006234 *param0, u32 *param1) MOD59_021D79F8(data); MOD59_021D7A4C(data); - Main_SetVBlankIntrCB(MOD59_021D7724, data); + Main_SetVBlankIntrCB((void (*)(void *))MOD59_021D7724, data); GX_BothDispOn(); @@ -175,3 +174,29 @@ THUMB_FUNC BOOL MOD59_021D76C0(struct UnkStruct_02006234 *param0) return TRUE; } + +THUMB_FUNC void MOD59_021D7724(MOD59_OverlayData *data) +{ + FUN_0201AB60(data->Unk18); +} + +THUMB_FUNC BOOL MOD59_021D7730(void) +{ + BOOL ret = FALSE; + + if (gMain.touchNew != 0 && gMain.touchX < 256 && gMain.touchY < 192) + { + s32 distanceFromXCentre = gMain.touchX < 128 ? (u16)(128 - gMain.touchX) : (u16)(gMain.touchX - 128); + s32 distanceFromYCentre = gMain.touchY < 100 ? (u16)(100 - gMain.touchY) : (u16)(gMain.touchY - 100); + + s32 distanceXSquare = distanceFromXCentre * distanceFromXCentre; + s32 distanceYSquare = distanceFromYCentre * distanceFromYCentre; + + if (distanceXSquare + distanceYSquare <= 256) + { + ret = TRUE; + } + } + + return ret; +} -- cgit v1.2.3 From 2b96796ec0fc2bc1c2e2b6fed90518aa1ba0c802 Mon Sep 17 00:00:00 2001 From: red031000 Date: Mon, 7 Jun 2021 18:00:59 +0100 Subject: rename a lot of 3d models and animations --- files/data/mmodel/fldeff/narc_0012.NSBTX | Bin 0 -> 1360 bytes files/data/mmodel/fldeff/narc_0012.bin | Bin 1360 -> 0 bytes files/data/mmodel/fldeff/narc_0013.NSBTX | Bin 0 -> 308 bytes files/data/mmodel/fldeff/narc_0013.bin | Bin 308 -> 0 bytes files/data/mmodel/fldeff/narc_0014.NSBTX | Bin 0 -> 744 bytes files/data/mmodel/fldeff/narc_0014.bin | Bin 744 -> 0 bytes files/data/mmodel/fldeff/narc_0015.NSBMD | Bin 0 -> 1052 bytes files/data/mmodel/fldeff/narc_0015.bin | Bin 1052 -> 0 bytes files/data/mmodel/fldeff/narc_0016.NSBMD | Bin 0 -> 1068 bytes files/data/mmodel/fldeff/narc_0016.bin | Bin 1068 -> 0 bytes files/data/mmodel/fldeff/narc_0017.NSBMD | Bin 0 -> 792 bytes files/data/mmodel/fldeff/narc_0017.bin | Bin 792 -> 0 bytes files/data/mmodel/fldeff/narc_0018.NSBMD | Bin 0 -> 704 bytes files/data/mmodel/fldeff/narc_0018.bin | Bin 704 -> 0 bytes files/data/mmodel/fldeff/narc_0019.NSBMD | Bin 0 -> 704 bytes files/data/mmodel/fldeff/narc_0019.bin | Bin 704 -> 0 bytes files/data/mmodel/fldeff/narc_0020.NSBMD | Bin 0 -> 1168 bytes files/data/mmodel/fldeff/narc_0020.bin | Bin 1168 -> 0 bytes files/data/mmodel/fldeff/narc_0021.NSBMD | Bin 0 -> 768 bytes files/data/mmodel/fldeff/narc_0021.bin | Bin 768 -> 0 bytes files/data/mmodel/fldeff/narc_0022.NSBMD | Bin 0 -> 780 bytes files/data/mmodel/fldeff/narc_0022.bin | Bin 780 -> 0 bytes files/data/mmodel/fldeff/narc_0023.NSBMD | Bin 0 -> 780 bytes files/data/mmodel/fldeff/narc_0023.bin | Bin 780 -> 0 bytes files/data/mmodel/fldeff/narc_0024.NSBMD | Bin 0 -> 780 bytes files/data/mmodel/fldeff/narc_0024.bin | Bin 780 -> 0 bytes files/data/mmodel/fldeff/narc_0025.NSBMD | Bin 0 -> 704 bytes files/data/mmodel/fldeff/narc_0025.bin | Bin 704 -> 0 bytes files/data/mmodel/fldeff/narc_0026.NSBMD | Bin 0 -> 796 bytes files/data/mmodel/fldeff/narc_0026.bin | Bin 796 -> 0 bytes files/data/mmodel/fldeff/narc_0027.NSBMD | Bin 0 -> 796 bytes files/data/mmodel/fldeff/narc_0027.bin | Bin 796 -> 0 bytes files/data/mmodel/fldeff/narc_0028.NSBMD | Bin 0 -> 796 bytes files/data/mmodel/fldeff/narc_0028.bin | Bin 796 -> 0 bytes files/data/mmodel/fldeff/narc_0029.NSBMD | Bin 0 -> 796 bytes files/data/mmodel/fldeff/narc_0029.bin | Bin 796 -> 0 bytes files/data/mmodel/fldeff/narc_0030.NSBMD | Bin 0 -> 796 bytes files/data/mmodel/fldeff/narc_0030.bin | Bin 796 -> 0 bytes files/data/mmodel/fldeff/narc_0031.NSBMD | Bin 0 -> 796 bytes files/data/mmodel/fldeff/narc_0031.bin | Bin 796 -> 0 bytes files/data/mmodel/fldeff/narc_0032.NSBMD | Bin 0 -> 796 bytes files/data/mmodel/fldeff/narc_0032.bin | Bin 796 -> 0 bytes files/data/mmodel/fldeff/narc_0033.NSBMD | Bin 0 -> 796 bytes files/data/mmodel/fldeff/narc_0033.bin | Bin 796 -> 0 bytes files/data/mmodel/fldeff/narc_0034.NSBMD | Bin 0 -> 796 bytes files/data/mmodel/fldeff/narc_0034.bin | Bin 796 -> 0 bytes files/data/mmodel/fldeff/narc_0035.NSBMD | Bin 0 -> 796 bytes files/data/mmodel/fldeff/narc_0035.bin | Bin 796 -> 0 bytes files/data/mmodel/fldeff/narc_0036.NSBMD | Bin 0 -> 796 bytes files/data/mmodel/fldeff/narc_0036.bin | Bin 796 -> 0 bytes files/data/mmodel/fldeff/narc_0037.NSBMD | Bin 0 -> 796 bytes files/data/mmodel/fldeff/narc_0037.bin | Bin 796 -> 0 bytes files/data/mmodel/fldeff/narc_0038.NSBMD | Bin 0 -> 796 bytes files/data/mmodel/fldeff/narc_0038.bin | Bin 796 -> 0 bytes files/data/mmodel/fldeff/narc_0039.NSBMD | Bin 0 -> 796 bytes files/data/mmodel/fldeff/narc_0039.bin | Bin 796 -> 0 bytes files/data/mmodel/fldeff/narc_0040.NSBMD | Bin 0 -> 796 bytes files/data/mmodel/fldeff/narc_0040.bin | Bin 796 -> 0 bytes files/data/mmodel/fldeff/narc_0041.NSBMD | Bin 0 -> 796 bytes files/data/mmodel/fldeff/narc_0041.bin | Bin 796 -> 0 bytes files/data/mmodel/fldeff/narc_0042.NSBMD | Bin 0 -> 796 bytes files/data/mmodel/fldeff/narc_0042.bin | Bin 796 -> 0 bytes files/data/mmodel/fldeff/narc_0043.NSBMD | Bin 0 -> 796 bytes files/data/mmodel/fldeff/narc_0043.bin | Bin 796 -> 0 bytes files/data/mmodel/fldeff/narc_0044.NSBMD | Bin 0 -> 796 bytes files/data/mmodel/fldeff/narc_0044.bin | Bin 796 -> 0 bytes files/data/mmodel/fldeff/narc_0045.NSBMD | Bin 0 -> 796 bytes files/data/mmodel/fldeff/narc_0045.bin | Bin 796 -> 0 bytes files/data/mmodel/fldeff/narc_0046.NSBMD | Bin 0 -> 796 bytes files/data/mmodel/fldeff/narc_0046.bin | Bin 796 -> 0 bytes files/data/mmodel/fldeff/narc_0047.NSBMD | Bin 0 -> 796 bytes files/data/mmodel/fldeff/narc_0047.bin | Bin 796 -> 0 bytes files/data/mmodel/fldeff/narc_0048.NSBMD | Bin 0 -> 796 bytes files/data/mmodel/fldeff/narc_0048.bin | Bin 796 -> 0 bytes files/data/mmodel/fldeff/narc_0049.NSBMD | Bin 0 -> 780 bytes files/data/mmodel/fldeff/narc_0049.bin | Bin 780 -> 0 bytes files/data/mmodel/fldeff/narc_0050.NSBMD | Bin 0 -> 780 bytes files/data/mmodel/fldeff/narc_0050.bin | Bin 780 -> 0 bytes files/data/mmodel/fldeff/narc_0051.NSBMD | Bin 0 -> 780 bytes files/data/mmodel/fldeff/narc_0051.bin | Bin 780 -> 0 bytes files/data/mmodel/fldeff/narc_0052.NSBMD | Bin 0 -> 780 bytes files/data/mmodel/fldeff/narc_0052.bin | Bin 780 -> 0 bytes files/data/mmodel/fldeff/narc_0053.NSBMD | Bin 0 -> 796 bytes files/data/mmodel/fldeff/narc_0053.bin | Bin 796 -> 0 bytes files/data/mmodel/fldeff/narc_0054.NSBMD | Bin 0 -> 796 bytes files/data/mmodel/fldeff/narc_0054.bin | Bin 796 -> 0 bytes files/data/mmodel/fldeff/narc_0055.NSBMD | Bin 0 -> 796 bytes files/data/mmodel/fldeff/narc_0055.bin | Bin 796 -> 0 bytes files/data/mmodel/fldeff/narc_0056.NSBMD | Bin 0 -> 796 bytes files/data/mmodel/fldeff/narc_0056.bin | Bin 796 -> 0 bytes files/data/mmodel/fldeff/narc_0057.NSBMD | Bin 0 -> 796 bytes files/data/mmodel/fldeff/narc_0057.bin | Bin 796 -> 0 bytes files/data/mmodel/fldeff/narc_0058.NSBMD | Bin 0 -> 2772 bytes files/data/mmodel/fldeff/narc_0058.bin | Bin 2772 -> 0 bytes files/data/mmodel/fldeff/narc_0059.NSBMD | Bin 0 -> 704 bytes files/data/mmodel/fldeff/narc_0059.bin | Bin 704 -> 0 bytes files/data/mmodel/fldeff/narc_0103.NSBMD | Bin 0 -> 704 bytes files/data/mmodel/fldeff/narc_0103.bin | Bin 704 -> 0 bytes files/data/mmodel/fldeff/narc_0104.NSBMD | Bin 0 -> 704 bytes files/data/mmodel/fldeff/narc_0104.bin | Bin 704 -> 0 bytes files/data/mmodel/mmodel/narc_0001.NSBTX | Bin 0 -> 6760 bytes files/data/mmodel/mmodel/narc_0001.bin | Bin 6760 -> 0 bytes files/data/mmodel/mmodel/narc_0002.NSBTX | Bin 0 -> 6760 bytes files/data/mmodel/mmodel/narc_0002.bin | Bin 6760 -> 0 bytes files/data/mmodel/mmodel/narc_0003.NSBTX | Bin 0 -> 6760 bytes files/data/mmodel/mmodel/narc_0003.bin | Bin 6760 -> 0 bytes files/data/mmodel/mmodel/narc_0004.NSBTX | Bin 0 -> 6760 bytes files/data/mmodel/mmodel/narc_0004.bin | Bin 6760 -> 0 bytes files/data/mmodel/mmodel/narc_0005.NSBTX | Bin 0 -> 6760 bytes files/data/mmodel/mmodel/narc_0005.bin | Bin 6760 -> 0 bytes .../area_build_model/areabm_texset/narc_0000.NSBTX | Bin 0 -> 65776 bytes .../area_build_model/areabm_texset/narc_0000.bin | Bin 65776 -> 0 bytes .../area_build_model/areabm_texset/narc_0001.NSBTX | Bin 0 -> 25156 bytes .../area_build_model/areabm_texset/narc_0001.bin | Bin 25156 -> 0 bytes .../area_build_model/areabm_texset/narc_0002.NSBTX | Bin 0 -> 74308 bytes .../area_build_model/areabm_texset/narc_0002.bin | Bin 74308 -> 0 bytes .../area_build_model/areabm_texset/narc_0003.NSBTX | Bin 0 -> 34448 bytes .../area_build_model/areabm_texset/narc_0003.bin | Bin 34448 -> 0 bytes .../area_build_model/areabm_texset/narc_0004.NSBTX | Bin 0 -> 46908 bytes .../area_build_model/areabm_texset/narc_0004.bin | Bin 46908 -> 0 bytes .../area_build_model/areabm_texset/narc_0005.NSBTX | Bin 0 -> 38840 bytes .../area_build_model/areabm_texset/narc_0005.bin | Bin 38840 -> 0 bytes .../area_build_model/areabm_texset/narc_0006.NSBTX | Bin 0 -> 38376 bytes .../area_build_model/areabm_texset/narc_0006.bin | Bin 38376 -> 0 bytes .../area_build_model/areabm_texset/narc_0007.NSBTX | Bin 0 -> 37892 bytes .../area_build_model/areabm_texset/narc_0007.bin | Bin 37892 -> 0 bytes .../area_build_model/areabm_texset/narc_0008.NSBTX | Bin 0 -> 32740 bytes .../area_build_model/areabm_texset/narc_0008.bin | Bin 32740 -> 0 bytes .../area_build_model/areabm_texset/narc_0009.NSBTX | Bin 0 -> 36648 bytes .../area_build_model/areabm_texset/narc_0009.bin | Bin 36648 -> 0 bytes .../area_build_model/areabm_texset/narc_0010.NSBTX | Bin 0 -> 33560 bytes .../area_build_model/areabm_texset/narc_0010.bin | Bin 33560 -> 0 bytes .../area_build_model/areabm_texset/narc_0011.NSBTX | Bin 0 -> 27556 bytes .../area_build_model/areabm_texset/narc_0011.bin | Bin 27556 -> 0 bytes .../area_build_model/areabm_texset/narc_0012.NSBTX | Bin 0 -> 23728 bytes .../area_build_model/areabm_texset/narc_0012.bin | Bin 23728 -> 0 bytes .../area_build_model/areabm_texset/narc_0013.NSBTX | Bin 0 -> 20276 bytes .../area_build_model/areabm_texset/narc_0013.bin | Bin 20276 -> 0 bytes .../area_build_model/areabm_texset/narc_0014.NSBTX | Bin 0 -> 30868 bytes .../area_build_model/areabm_texset/narc_0014.bin | Bin 30868 -> 0 bytes .../areadata/area_map_tex/map_tex_set/narc_0000.NSBTX | Bin 0 -> 23448 bytes .../areadata/area_map_tex/map_tex_set/narc_0000.bin | Bin 23448 -> 0 bytes .../areadata/area_map_tex/map_tex_set/narc_0001.NSBTX | Bin 0 -> 8204 bytes .../areadata/area_map_tex/map_tex_set/narc_0001.bin | Bin 8204 -> 0 bytes files/fielddata/build_model/build_model/narc_0000.NSBMD | Bin 0 -> 1900 bytes files/fielddata/build_model/build_model/narc_0000.bin | Bin 1900 -> 0 bytes files/fielddata/build_model/build_model/narc_0001.NSMBD | Bin 0 -> 2836 bytes files/fielddata/build_model/build_model/narc_0001.bin | Bin 2836 -> 0 bytes files/fielddata/build_model/build_model/narc_0002.NSBMD | Bin 0 -> 784 bytes files/fielddata/build_model/build_model/narc_0002.bin | Bin 784 -> 0 bytes files/fielddata/build_model/build_model/narc_0003.NSBMD | Bin 0 -> 4636 bytes files/fielddata/build_model/build_model/narc_0003.bin | Bin 4636 -> 0 bytes files/fielddata/build_model/build_model/narc_0004.NSBMD | Bin 0 -> 9816 bytes files/fielddata/build_model/build_model/narc_0004.bin | Bin 9816 -> 0 bytes files/fielddata/build_model/build_model/narc_0005.NSBMD | Bin 0 -> 8292 bytes files/fielddata/build_model/build_model/narc_0005.bin | Bin 8292 -> 0 bytes files/fielddata/build_model/build_model/narc_0006.NSBMD | Bin 0 -> 2772 bytes files/fielddata/build_model/build_model/narc_0006.bin | Bin 2772 -> 0 bytes files/graphic/demo_trade/narc_0027.NSBMD | Bin 0 -> 8632 bytes files/graphic/demo_trade/narc_0027.bin | Bin 8632 -> 0 bytes files/graphic/ending/narc_0000.NSBMD | Bin 0 -> 8024 bytes files/graphic/ending/narc_0000.bin | Bin 8024 -> 0 bytes files/graphic/ending/narc_0001.NSBMD | Bin 0 -> 8024 bytes files/graphic/ending/narc_0001.bin | Bin 8024 -> 0 bytes files/graphic/ending/narc_0002.NSBMD | Bin 0 -> 7996 bytes files/graphic/ending/narc_0002.bin | Bin 7996 -> 0 bytes files/graphic/ending/narc_0003.NSBTA | Bin 0 -> 1292 bytes files/graphic/ending/narc_0003.bin | Bin 1292 -> 0 bytes files/graphic/ev_pokeselect/narc_0000.NSBCA | Bin 0 -> 6100 bytes files/graphic/ev_pokeselect/narc_0000.bin | Bin 6100 -> 0 bytes files/graphic/ev_pokeselect/narc_0001.NSBMD | Bin 0 -> 54124 bytes files/graphic/ev_pokeselect/narc_0001.bin | Bin 54124 -> 0 bytes files/graphic/ev_pokeselect/narc_0002.NSBCA | Bin 0 -> 772 bytes files/graphic/ev_pokeselect/narc_0002.bin | Bin 772 -> 0 bytes files/graphic/ev_pokeselect/narc_0003.NSBMD | Bin 0 -> 9780 bytes files/graphic/ev_pokeselect/narc_0003.bin | Bin 9780 -> 0 bytes files/graphic/ev_pokeselect/narc_0004.NSBCA | Bin 0 -> 772 bytes files/graphic/ev_pokeselect/narc_0004.bin | Bin 772 -> 0 bytes files/graphic/ev_pokeselect/narc_0005.NSBMD | Bin 0 -> 9868 bytes files/graphic/ev_pokeselect/narc_0005.bin | Bin 9868 -> 0 bytes files/graphic/ev_pokeselect/narc_0006.NSBCA | Bin 0 -> 772 bytes files/graphic/ev_pokeselect/narc_0006.bin | Bin 772 -> 0 bytes files/graphic/ev_pokeselect/narc_0007.NSBMD | Bin 0 -> 9860 bytes files/graphic/ev_pokeselect/narc_0007.bin | Bin 9860 -> 0 bytes files/graphic/ev_pokeselect/narc_0008.NSBMD | Bin 0 -> 31748 bytes files/graphic/ev_pokeselect/narc_0008.bin | Bin 31748 -> 0 bytes files/graphic/ev_pokeselect/narc_0009.NSBMD | Bin 0 -> 5352 bytes files/graphic/ev_pokeselect/narc_0009.bin | Bin 5352 -> 0 bytes files/graphic/hiden_effect/narc_0000.NSBCA | Bin 0 -> 4740 bytes files/graphic/hiden_effect/narc_0000.bin | Bin 4740 -> 0 bytes files/graphic/hiden_effect/narc_0001.NSBMA | Bin 0 -> 520 bytes files/graphic/hiden_effect/narc_0001.bin | Bin 520 -> 0 bytes files/graphic/hiden_effect/narc_0002.NSBTA | Bin 0 -> 860 bytes files/graphic/hiden_effect/narc_0002.bin | Bin 860 -> 0 bytes files/graphic/hiden_effect/narc_0003.NSBMD | Bin 0 -> 4248 bytes files/graphic/hiden_effect/narc_0003.bin | Bin 4248 -> 0 bytes 196 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 files/data/mmodel/fldeff/narc_0012.NSBTX delete mode 100644 files/data/mmodel/fldeff/narc_0012.bin create mode 100644 files/data/mmodel/fldeff/narc_0013.NSBTX delete mode 100644 files/data/mmodel/fldeff/narc_0013.bin create mode 100644 files/data/mmodel/fldeff/narc_0014.NSBTX delete mode 100644 files/data/mmodel/fldeff/narc_0014.bin create mode 100644 files/data/mmodel/fldeff/narc_0015.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0015.bin create mode 100644 files/data/mmodel/fldeff/narc_0016.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0016.bin create mode 100644 files/data/mmodel/fldeff/narc_0017.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0017.bin create mode 100644 files/data/mmodel/fldeff/narc_0018.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0018.bin create mode 100644 files/data/mmodel/fldeff/narc_0019.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0019.bin create mode 100644 files/data/mmodel/fldeff/narc_0020.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0020.bin create mode 100644 files/data/mmodel/fldeff/narc_0021.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0021.bin create mode 100644 files/data/mmodel/fldeff/narc_0022.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0022.bin create mode 100644 files/data/mmodel/fldeff/narc_0023.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0023.bin create mode 100644 files/data/mmodel/fldeff/narc_0024.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0024.bin create mode 100644 files/data/mmodel/fldeff/narc_0025.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0025.bin create mode 100644 files/data/mmodel/fldeff/narc_0026.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0026.bin create mode 100644 files/data/mmodel/fldeff/narc_0027.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0027.bin create mode 100644 files/data/mmodel/fldeff/narc_0028.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0028.bin create mode 100644 files/data/mmodel/fldeff/narc_0029.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0029.bin create mode 100644 files/data/mmodel/fldeff/narc_0030.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0030.bin create mode 100644 files/data/mmodel/fldeff/narc_0031.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0031.bin create mode 100644 files/data/mmodel/fldeff/narc_0032.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0032.bin create mode 100644 files/data/mmodel/fldeff/narc_0033.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0033.bin create mode 100644 files/data/mmodel/fldeff/narc_0034.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0034.bin create mode 100644 files/data/mmodel/fldeff/narc_0035.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0035.bin create mode 100644 files/data/mmodel/fldeff/narc_0036.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0036.bin create mode 100644 files/data/mmodel/fldeff/narc_0037.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0037.bin create mode 100644 files/data/mmodel/fldeff/narc_0038.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0038.bin create mode 100644 files/data/mmodel/fldeff/narc_0039.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0039.bin create mode 100644 files/data/mmodel/fldeff/narc_0040.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0040.bin create mode 100644 files/data/mmodel/fldeff/narc_0041.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0041.bin create mode 100644 files/data/mmodel/fldeff/narc_0042.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0042.bin create mode 100644 files/data/mmodel/fldeff/narc_0043.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0043.bin create mode 100644 files/data/mmodel/fldeff/narc_0044.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0044.bin create mode 100644 files/data/mmodel/fldeff/narc_0045.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0045.bin create mode 100644 files/data/mmodel/fldeff/narc_0046.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0046.bin create mode 100644 files/data/mmodel/fldeff/narc_0047.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0047.bin create mode 100644 files/data/mmodel/fldeff/narc_0048.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0048.bin create mode 100644 files/data/mmodel/fldeff/narc_0049.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0049.bin create mode 100644 files/data/mmodel/fldeff/narc_0050.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0050.bin create mode 100644 files/data/mmodel/fldeff/narc_0051.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0051.bin create mode 100644 files/data/mmodel/fldeff/narc_0052.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0052.bin create mode 100644 files/data/mmodel/fldeff/narc_0053.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0053.bin create mode 100644 files/data/mmodel/fldeff/narc_0054.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0054.bin create mode 100644 files/data/mmodel/fldeff/narc_0055.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0055.bin create mode 100644 files/data/mmodel/fldeff/narc_0056.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0056.bin create mode 100644 files/data/mmodel/fldeff/narc_0057.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0057.bin create mode 100644 files/data/mmodel/fldeff/narc_0058.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0058.bin create mode 100644 files/data/mmodel/fldeff/narc_0059.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0059.bin create mode 100644 files/data/mmodel/fldeff/narc_0103.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0103.bin create mode 100644 files/data/mmodel/fldeff/narc_0104.NSBMD delete mode 100644 files/data/mmodel/fldeff/narc_0104.bin create mode 100644 files/data/mmodel/mmodel/narc_0001.NSBTX delete mode 100644 files/data/mmodel/mmodel/narc_0001.bin create mode 100644 files/data/mmodel/mmodel/narc_0002.NSBTX delete mode 100644 files/data/mmodel/mmodel/narc_0002.bin create mode 100644 files/data/mmodel/mmodel/narc_0003.NSBTX delete mode 100644 files/data/mmodel/mmodel/narc_0003.bin create mode 100644 files/data/mmodel/mmodel/narc_0004.NSBTX delete mode 100644 files/data/mmodel/mmodel/narc_0004.bin create mode 100644 files/data/mmodel/mmodel/narc_0005.NSBTX delete mode 100644 files/data/mmodel/mmodel/narc_0005.bin create mode 100644 files/fielddata/areadata/area_build_model/areabm_texset/narc_0000.NSBTX delete mode 100644 files/fielddata/areadata/area_build_model/areabm_texset/narc_0000.bin create mode 100644 files/fielddata/areadata/area_build_model/areabm_texset/narc_0001.NSBTX delete mode 100644 files/fielddata/areadata/area_build_model/areabm_texset/narc_0001.bin create mode 100644 files/fielddata/areadata/area_build_model/areabm_texset/narc_0002.NSBTX delete mode 100644 files/fielddata/areadata/area_build_model/areabm_texset/narc_0002.bin create mode 100644 files/fielddata/areadata/area_build_model/areabm_texset/narc_0003.NSBTX delete mode 100644 files/fielddata/areadata/area_build_model/areabm_texset/narc_0003.bin create mode 100644 files/fielddata/areadata/area_build_model/areabm_texset/narc_0004.NSBTX delete mode 100644 files/fielddata/areadata/area_build_model/areabm_texset/narc_0004.bin create mode 100644 files/fielddata/areadata/area_build_model/areabm_texset/narc_0005.NSBTX delete mode 100644 files/fielddata/areadata/area_build_model/areabm_texset/narc_0005.bin create mode 100644 files/fielddata/areadata/area_build_model/areabm_texset/narc_0006.NSBTX delete mode 100644 files/fielddata/areadata/area_build_model/areabm_texset/narc_0006.bin create mode 100644 files/fielddata/areadata/area_build_model/areabm_texset/narc_0007.NSBTX delete mode 100644 files/fielddata/areadata/area_build_model/areabm_texset/narc_0007.bin create mode 100644 files/fielddata/areadata/area_build_model/areabm_texset/narc_0008.NSBTX delete mode 100644 files/fielddata/areadata/area_build_model/areabm_texset/narc_0008.bin create mode 100644 files/fielddata/areadata/area_build_model/areabm_texset/narc_0009.NSBTX delete mode 100644 files/fielddata/areadata/area_build_model/areabm_texset/narc_0009.bin create mode 100644 files/fielddata/areadata/area_build_model/areabm_texset/narc_0010.NSBTX delete mode 100644 files/fielddata/areadata/area_build_model/areabm_texset/narc_0010.bin create mode 100644 files/fielddata/areadata/area_build_model/areabm_texset/narc_0011.NSBTX delete mode 100644 files/fielddata/areadata/area_build_model/areabm_texset/narc_0011.bin create mode 100644 files/fielddata/areadata/area_build_model/areabm_texset/narc_0012.NSBTX delete mode 100644 files/fielddata/areadata/area_build_model/areabm_texset/narc_0012.bin create mode 100644 files/fielddata/areadata/area_build_model/areabm_texset/narc_0013.NSBTX delete mode 100644 files/fielddata/areadata/area_build_model/areabm_texset/narc_0013.bin create mode 100644 files/fielddata/areadata/area_build_model/areabm_texset/narc_0014.NSBTX delete mode 100644 files/fielddata/areadata/area_build_model/areabm_texset/narc_0014.bin create mode 100644 files/fielddata/areadata/area_map_tex/map_tex_set/narc_0000.NSBTX delete mode 100644 files/fielddata/areadata/area_map_tex/map_tex_set/narc_0000.bin create mode 100644 files/fielddata/areadata/area_map_tex/map_tex_set/narc_0001.NSBTX delete mode 100644 files/fielddata/areadata/area_map_tex/map_tex_set/narc_0001.bin create mode 100644 files/fielddata/build_model/build_model/narc_0000.NSBMD delete mode 100644 files/fielddata/build_model/build_model/narc_0000.bin create mode 100644 files/fielddata/build_model/build_model/narc_0001.NSMBD delete mode 100644 files/fielddata/build_model/build_model/narc_0001.bin create mode 100644 files/fielddata/build_model/build_model/narc_0002.NSBMD delete mode 100644 files/fielddata/build_model/build_model/narc_0002.bin create mode 100644 files/fielddata/build_model/build_model/narc_0003.NSBMD delete mode 100644 files/fielddata/build_model/build_model/narc_0003.bin create mode 100644 files/fielddata/build_model/build_model/narc_0004.NSBMD delete mode 100644 files/fielddata/build_model/build_model/narc_0004.bin create mode 100644 files/fielddata/build_model/build_model/narc_0005.NSBMD delete mode 100644 files/fielddata/build_model/build_model/narc_0005.bin create mode 100644 files/fielddata/build_model/build_model/narc_0006.NSBMD delete mode 100644 files/fielddata/build_model/build_model/narc_0006.bin create mode 100644 files/graphic/demo_trade/narc_0027.NSBMD delete mode 100644 files/graphic/demo_trade/narc_0027.bin create mode 100644 files/graphic/ending/narc_0000.NSBMD delete mode 100644 files/graphic/ending/narc_0000.bin create mode 100644 files/graphic/ending/narc_0001.NSBMD delete mode 100644 files/graphic/ending/narc_0001.bin create mode 100644 files/graphic/ending/narc_0002.NSBMD delete mode 100644 files/graphic/ending/narc_0002.bin create mode 100644 files/graphic/ending/narc_0003.NSBTA delete mode 100644 files/graphic/ending/narc_0003.bin create mode 100644 files/graphic/ev_pokeselect/narc_0000.NSBCA delete mode 100644 files/graphic/ev_pokeselect/narc_0000.bin create mode 100644 files/graphic/ev_pokeselect/narc_0001.NSBMD delete mode 100644 files/graphic/ev_pokeselect/narc_0001.bin create mode 100644 files/graphic/ev_pokeselect/narc_0002.NSBCA delete mode 100644 files/graphic/ev_pokeselect/narc_0002.bin create mode 100644 files/graphic/ev_pokeselect/narc_0003.NSBMD delete mode 100644 files/graphic/ev_pokeselect/narc_0003.bin create mode 100644 files/graphic/ev_pokeselect/narc_0004.NSBCA delete mode 100644 files/graphic/ev_pokeselect/narc_0004.bin create mode 100644 files/graphic/ev_pokeselect/narc_0005.NSBMD delete mode 100644 files/graphic/ev_pokeselect/narc_0005.bin create mode 100644 files/graphic/ev_pokeselect/narc_0006.NSBCA delete mode 100644 files/graphic/ev_pokeselect/narc_0006.bin create mode 100644 files/graphic/ev_pokeselect/narc_0007.NSBMD delete mode 100644 files/graphic/ev_pokeselect/narc_0007.bin create mode 100644 files/graphic/ev_pokeselect/narc_0008.NSBMD delete mode 100644 files/graphic/ev_pokeselect/narc_0008.bin create mode 100644 files/graphic/ev_pokeselect/narc_0009.NSBMD delete mode 100644 files/graphic/ev_pokeselect/narc_0009.bin create mode 100644 files/graphic/hiden_effect/narc_0000.NSBCA delete mode 100644 files/graphic/hiden_effect/narc_0000.bin create mode 100644 files/graphic/hiden_effect/narc_0001.NSBMA delete mode 100644 files/graphic/hiden_effect/narc_0001.bin create mode 100644 files/graphic/hiden_effect/narc_0002.NSBTA delete mode 100644 files/graphic/hiden_effect/narc_0002.bin create mode 100644 files/graphic/hiden_effect/narc_0003.NSBMD delete mode 100644 files/graphic/hiden_effect/narc_0003.bin diff --git a/files/data/mmodel/fldeff/narc_0012.NSBTX b/files/data/mmodel/fldeff/narc_0012.NSBTX new file mode 100644 index 00000000..274610d1 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0012.NSBTX differ diff --git a/files/data/mmodel/fldeff/narc_0012.bin b/files/data/mmodel/fldeff/narc_0012.bin deleted file mode 100644 index 274610d1..00000000 Binary files a/files/data/mmodel/fldeff/narc_0012.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0013.NSBTX b/files/data/mmodel/fldeff/narc_0013.NSBTX new file mode 100644 index 00000000..719146e3 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0013.NSBTX differ diff --git a/files/data/mmodel/fldeff/narc_0013.bin b/files/data/mmodel/fldeff/narc_0013.bin deleted file mode 100644 index 719146e3..00000000 Binary files a/files/data/mmodel/fldeff/narc_0013.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0014.NSBTX b/files/data/mmodel/fldeff/narc_0014.NSBTX new file mode 100644 index 00000000..472bdcb2 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0014.NSBTX differ diff --git a/files/data/mmodel/fldeff/narc_0014.bin b/files/data/mmodel/fldeff/narc_0014.bin deleted file mode 100644 index 472bdcb2..00000000 Binary files a/files/data/mmodel/fldeff/narc_0014.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0015.NSBMD b/files/data/mmodel/fldeff/narc_0015.NSBMD new file mode 100644 index 00000000..410bf936 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0015.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0015.bin b/files/data/mmodel/fldeff/narc_0015.bin deleted file mode 100644 index 410bf936..00000000 Binary files a/files/data/mmodel/fldeff/narc_0015.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0016.NSBMD b/files/data/mmodel/fldeff/narc_0016.NSBMD new file mode 100644 index 00000000..a395e353 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0016.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0016.bin b/files/data/mmodel/fldeff/narc_0016.bin deleted file mode 100644 index a395e353..00000000 Binary files a/files/data/mmodel/fldeff/narc_0016.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0017.NSBMD b/files/data/mmodel/fldeff/narc_0017.NSBMD new file mode 100644 index 00000000..e06c315f Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0017.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0017.bin b/files/data/mmodel/fldeff/narc_0017.bin deleted file mode 100644 index e06c315f..00000000 Binary files a/files/data/mmodel/fldeff/narc_0017.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0018.NSBMD b/files/data/mmodel/fldeff/narc_0018.NSBMD new file mode 100644 index 00000000..382c5a96 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0018.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0018.bin b/files/data/mmodel/fldeff/narc_0018.bin deleted file mode 100644 index 382c5a96..00000000 Binary files a/files/data/mmodel/fldeff/narc_0018.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0019.NSBMD b/files/data/mmodel/fldeff/narc_0019.NSBMD new file mode 100644 index 00000000..81a72937 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0019.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0019.bin b/files/data/mmodel/fldeff/narc_0019.bin deleted file mode 100644 index 81a72937..00000000 Binary files a/files/data/mmodel/fldeff/narc_0019.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0020.NSBMD b/files/data/mmodel/fldeff/narc_0020.NSBMD new file mode 100644 index 00000000..b9ef2f24 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0020.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0020.bin b/files/data/mmodel/fldeff/narc_0020.bin deleted file mode 100644 index b9ef2f24..00000000 Binary files a/files/data/mmodel/fldeff/narc_0020.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0021.NSBMD b/files/data/mmodel/fldeff/narc_0021.NSBMD new file mode 100644 index 00000000..9e979e30 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0021.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0021.bin b/files/data/mmodel/fldeff/narc_0021.bin deleted file mode 100644 index 9e979e30..00000000 Binary files a/files/data/mmodel/fldeff/narc_0021.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0022.NSBMD b/files/data/mmodel/fldeff/narc_0022.NSBMD new file mode 100644 index 00000000..12a95c6d Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0022.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0022.bin b/files/data/mmodel/fldeff/narc_0022.bin deleted file mode 100644 index 12a95c6d..00000000 Binary files a/files/data/mmodel/fldeff/narc_0022.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0023.NSBMD b/files/data/mmodel/fldeff/narc_0023.NSBMD new file mode 100644 index 00000000..d885b2a7 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0023.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0023.bin b/files/data/mmodel/fldeff/narc_0023.bin deleted file mode 100644 index d885b2a7..00000000 Binary files a/files/data/mmodel/fldeff/narc_0023.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0024.NSBMD b/files/data/mmodel/fldeff/narc_0024.NSBMD new file mode 100644 index 00000000..a3b10045 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0024.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0024.bin b/files/data/mmodel/fldeff/narc_0024.bin deleted file mode 100644 index a3b10045..00000000 Binary files a/files/data/mmodel/fldeff/narc_0024.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0025.NSBMD b/files/data/mmodel/fldeff/narc_0025.NSBMD new file mode 100644 index 00000000..617c7861 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0025.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0025.bin b/files/data/mmodel/fldeff/narc_0025.bin deleted file mode 100644 index 617c7861..00000000 Binary files a/files/data/mmodel/fldeff/narc_0025.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0026.NSBMD b/files/data/mmodel/fldeff/narc_0026.NSBMD new file mode 100644 index 00000000..878344a4 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0026.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0026.bin b/files/data/mmodel/fldeff/narc_0026.bin deleted file mode 100644 index 878344a4..00000000 Binary files a/files/data/mmodel/fldeff/narc_0026.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0027.NSBMD b/files/data/mmodel/fldeff/narc_0027.NSBMD new file mode 100644 index 00000000..1d63ab7b Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0027.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0027.bin b/files/data/mmodel/fldeff/narc_0027.bin deleted file mode 100644 index 1d63ab7b..00000000 Binary files a/files/data/mmodel/fldeff/narc_0027.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0028.NSBMD b/files/data/mmodel/fldeff/narc_0028.NSBMD new file mode 100644 index 00000000..babf5b3e Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0028.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0028.bin b/files/data/mmodel/fldeff/narc_0028.bin deleted file mode 100644 index babf5b3e..00000000 Binary files a/files/data/mmodel/fldeff/narc_0028.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0029.NSBMD b/files/data/mmodel/fldeff/narc_0029.NSBMD new file mode 100644 index 00000000..8928ada6 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0029.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0029.bin b/files/data/mmodel/fldeff/narc_0029.bin deleted file mode 100644 index 8928ada6..00000000 Binary files a/files/data/mmodel/fldeff/narc_0029.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0030.NSBMD b/files/data/mmodel/fldeff/narc_0030.NSBMD new file mode 100644 index 00000000..c4a501e1 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0030.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0030.bin b/files/data/mmodel/fldeff/narc_0030.bin deleted file mode 100644 index c4a501e1..00000000 Binary files a/files/data/mmodel/fldeff/narc_0030.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0031.NSBMD b/files/data/mmodel/fldeff/narc_0031.NSBMD new file mode 100644 index 00000000..e69da023 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0031.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0031.bin b/files/data/mmodel/fldeff/narc_0031.bin deleted file mode 100644 index e69da023..00000000 Binary files a/files/data/mmodel/fldeff/narc_0031.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0032.NSBMD b/files/data/mmodel/fldeff/narc_0032.NSBMD new file mode 100644 index 00000000..5119f07f Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0032.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0032.bin b/files/data/mmodel/fldeff/narc_0032.bin deleted file mode 100644 index 5119f07f..00000000 Binary files a/files/data/mmodel/fldeff/narc_0032.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0033.NSBMD b/files/data/mmodel/fldeff/narc_0033.NSBMD new file mode 100644 index 00000000..0669c9d9 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0033.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0033.bin b/files/data/mmodel/fldeff/narc_0033.bin deleted file mode 100644 index 0669c9d9..00000000 Binary files a/files/data/mmodel/fldeff/narc_0033.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0034.NSBMD b/files/data/mmodel/fldeff/narc_0034.NSBMD new file mode 100644 index 00000000..008feee3 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0034.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0034.bin b/files/data/mmodel/fldeff/narc_0034.bin deleted file mode 100644 index 008feee3..00000000 Binary files a/files/data/mmodel/fldeff/narc_0034.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0035.NSBMD b/files/data/mmodel/fldeff/narc_0035.NSBMD new file mode 100644 index 00000000..ffd79f3a Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0035.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0035.bin b/files/data/mmodel/fldeff/narc_0035.bin deleted file mode 100644 index ffd79f3a..00000000 Binary files a/files/data/mmodel/fldeff/narc_0035.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0036.NSBMD b/files/data/mmodel/fldeff/narc_0036.NSBMD new file mode 100644 index 00000000..9834ab90 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0036.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0036.bin b/files/data/mmodel/fldeff/narc_0036.bin deleted file mode 100644 index 9834ab90..00000000 Binary files a/files/data/mmodel/fldeff/narc_0036.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0037.NSBMD b/files/data/mmodel/fldeff/narc_0037.NSBMD new file mode 100644 index 00000000..919c2265 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0037.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0037.bin b/files/data/mmodel/fldeff/narc_0037.bin deleted file mode 100644 index 919c2265..00000000 Binary files a/files/data/mmodel/fldeff/narc_0037.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0038.NSBMD b/files/data/mmodel/fldeff/narc_0038.NSBMD new file mode 100644 index 00000000..8f8e7b00 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0038.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0038.bin b/files/data/mmodel/fldeff/narc_0038.bin deleted file mode 100644 index 8f8e7b00..00000000 Binary files a/files/data/mmodel/fldeff/narc_0038.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0039.NSBMD b/files/data/mmodel/fldeff/narc_0039.NSBMD new file mode 100644 index 00000000..dc42dd00 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0039.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0039.bin b/files/data/mmodel/fldeff/narc_0039.bin deleted file mode 100644 index dc42dd00..00000000 Binary files a/files/data/mmodel/fldeff/narc_0039.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0040.NSBMD b/files/data/mmodel/fldeff/narc_0040.NSBMD new file mode 100644 index 00000000..f9ac63f3 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0040.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0040.bin b/files/data/mmodel/fldeff/narc_0040.bin deleted file mode 100644 index f9ac63f3..00000000 Binary files a/files/data/mmodel/fldeff/narc_0040.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0041.NSBMD b/files/data/mmodel/fldeff/narc_0041.NSBMD new file mode 100644 index 00000000..2fba5304 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0041.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0041.bin b/files/data/mmodel/fldeff/narc_0041.bin deleted file mode 100644 index 2fba5304..00000000 Binary files a/files/data/mmodel/fldeff/narc_0041.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0042.NSBMD b/files/data/mmodel/fldeff/narc_0042.NSBMD new file mode 100644 index 00000000..fe6c1ce0 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0042.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0042.bin b/files/data/mmodel/fldeff/narc_0042.bin deleted file mode 100644 index fe6c1ce0..00000000 Binary files a/files/data/mmodel/fldeff/narc_0042.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0043.NSBMD b/files/data/mmodel/fldeff/narc_0043.NSBMD new file mode 100644 index 00000000..c0277fd5 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0043.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0043.bin b/files/data/mmodel/fldeff/narc_0043.bin deleted file mode 100644 index c0277fd5..00000000 Binary files a/files/data/mmodel/fldeff/narc_0043.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0044.NSBMD b/files/data/mmodel/fldeff/narc_0044.NSBMD new file mode 100644 index 00000000..0e5cdf8e Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0044.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0044.bin b/files/data/mmodel/fldeff/narc_0044.bin deleted file mode 100644 index 0e5cdf8e..00000000 Binary files a/files/data/mmodel/fldeff/narc_0044.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0045.NSBMD b/files/data/mmodel/fldeff/narc_0045.NSBMD new file mode 100644 index 00000000..d6462c76 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0045.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0045.bin b/files/data/mmodel/fldeff/narc_0045.bin deleted file mode 100644 index d6462c76..00000000 Binary files a/files/data/mmodel/fldeff/narc_0045.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0046.NSBMD b/files/data/mmodel/fldeff/narc_0046.NSBMD new file mode 100644 index 00000000..6bbda15e Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0046.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0046.bin b/files/data/mmodel/fldeff/narc_0046.bin deleted file mode 100644 index 6bbda15e..00000000 Binary files a/files/data/mmodel/fldeff/narc_0046.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0047.NSBMD b/files/data/mmodel/fldeff/narc_0047.NSBMD new file mode 100644 index 00000000..e0324eed Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0047.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0047.bin b/files/data/mmodel/fldeff/narc_0047.bin deleted file mode 100644 index e0324eed..00000000 Binary files a/files/data/mmodel/fldeff/narc_0047.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0048.NSBMD b/files/data/mmodel/fldeff/narc_0048.NSBMD new file mode 100644 index 00000000..65ee3fda Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0048.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0048.bin b/files/data/mmodel/fldeff/narc_0048.bin deleted file mode 100644 index 65ee3fda..00000000 Binary files a/files/data/mmodel/fldeff/narc_0048.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0049.NSBMD b/files/data/mmodel/fldeff/narc_0049.NSBMD new file mode 100644 index 00000000..4e09879c Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0049.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0049.bin b/files/data/mmodel/fldeff/narc_0049.bin deleted file mode 100644 index 4e09879c..00000000 Binary files a/files/data/mmodel/fldeff/narc_0049.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0050.NSBMD b/files/data/mmodel/fldeff/narc_0050.NSBMD new file mode 100644 index 00000000..629eb1b4 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0050.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0050.bin b/files/data/mmodel/fldeff/narc_0050.bin deleted file mode 100644 index 629eb1b4..00000000 Binary files a/files/data/mmodel/fldeff/narc_0050.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0051.NSBMD b/files/data/mmodel/fldeff/narc_0051.NSBMD new file mode 100644 index 00000000..360941fc Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0051.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0051.bin b/files/data/mmodel/fldeff/narc_0051.bin deleted file mode 100644 index 360941fc..00000000 Binary files a/files/data/mmodel/fldeff/narc_0051.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0052.NSBMD b/files/data/mmodel/fldeff/narc_0052.NSBMD new file mode 100644 index 00000000..8e0d0fb8 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0052.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0052.bin b/files/data/mmodel/fldeff/narc_0052.bin deleted file mode 100644 index 8e0d0fb8..00000000 Binary files a/files/data/mmodel/fldeff/narc_0052.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0053.NSBMD b/files/data/mmodel/fldeff/narc_0053.NSBMD new file mode 100644 index 00000000..c0141f83 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0053.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0053.bin b/files/data/mmodel/fldeff/narc_0053.bin deleted file mode 100644 index c0141f83..00000000 Binary files a/files/data/mmodel/fldeff/narc_0053.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0054.NSBMD b/files/data/mmodel/fldeff/narc_0054.NSBMD new file mode 100644 index 00000000..18a6ab39 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0054.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0054.bin b/files/data/mmodel/fldeff/narc_0054.bin deleted file mode 100644 index 18a6ab39..00000000 Binary files a/files/data/mmodel/fldeff/narc_0054.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0055.NSBMD b/files/data/mmodel/fldeff/narc_0055.NSBMD new file mode 100644 index 00000000..3406b440 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0055.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0055.bin b/files/data/mmodel/fldeff/narc_0055.bin deleted file mode 100644 index 3406b440..00000000 Binary files a/files/data/mmodel/fldeff/narc_0055.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0056.NSBMD b/files/data/mmodel/fldeff/narc_0056.NSBMD new file mode 100644 index 00000000..e2ab3c0b Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0056.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0056.bin b/files/data/mmodel/fldeff/narc_0056.bin deleted file mode 100644 index e2ab3c0b..00000000 Binary files a/files/data/mmodel/fldeff/narc_0056.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0057.NSBMD b/files/data/mmodel/fldeff/narc_0057.NSBMD new file mode 100644 index 00000000..c8ce8fda Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0057.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0057.bin b/files/data/mmodel/fldeff/narc_0057.bin deleted file mode 100644 index c8ce8fda..00000000 Binary files a/files/data/mmodel/fldeff/narc_0057.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0058.NSBMD b/files/data/mmodel/fldeff/narc_0058.NSBMD new file mode 100644 index 00000000..594e0e82 Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0058.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0058.bin b/files/data/mmodel/fldeff/narc_0058.bin deleted file mode 100644 index 594e0e82..00000000 Binary files a/files/data/mmodel/fldeff/narc_0058.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0059.NSBMD b/files/data/mmodel/fldeff/narc_0059.NSBMD new file mode 100644 index 00000000..c4e2cf3b Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0059.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0059.bin b/files/data/mmodel/fldeff/narc_0059.bin deleted file mode 100644 index c4e2cf3b..00000000 Binary files a/files/data/mmodel/fldeff/narc_0059.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0103.NSBMD b/files/data/mmodel/fldeff/narc_0103.NSBMD new file mode 100644 index 00000000..a47d56ba Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0103.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0103.bin b/files/data/mmodel/fldeff/narc_0103.bin deleted file mode 100644 index a47d56ba..00000000 Binary files a/files/data/mmodel/fldeff/narc_0103.bin and /dev/null differ diff --git a/files/data/mmodel/fldeff/narc_0104.NSBMD b/files/data/mmodel/fldeff/narc_0104.NSBMD new file mode 100644 index 00000000..b0f3dafb Binary files /dev/null and b/files/data/mmodel/fldeff/narc_0104.NSBMD differ diff --git a/files/data/mmodel/fldeff/narc_0104.bin b/files/data/mmodel/fldeff/narc_0104.bin deleted file mode 100644 index b0f3dafb..00000000 Binary files a/files/data/mmodel/fldeff/narc_0104.bin and /dev/null differ diff --git a/files/data/mmodel/mmodel/narc_0001.NSBTX b/files/data/mmodel/mmodel/narc_0001.NSBTX new file mode 100644 index 00000000..4558d46b Binary files /dev/null and b/files/data/mmodel/mmodel/narc_0001.NSBTX differ diff --git a/files/data/mmodel/mmodel/narc_0001.bin b/files/data/mmodel/mmodel/narc_0001.bin deleted file mode 100644 index 4558d46b..00000000 Binary files a/files/data/mmodel/mmodel/narc_0001.bin and /dev/null differ diff --git a/files/data/mmodel/mmodel/narc_0002.NSBTX b/files/data/mmodel/mmodel/narc_0002.NSBTX new file mode 100644 index 00000000..c9d4ea6d Binary files /dev/null and b/files/data/mmodel/mmodel/narc_0002.NSBTX differ diff --git a/files/data/mmodel/mmodel/narc_0002.bin b/files/data/mmodel/mmodel/narc_0002.bin deleted file mode 100644 index c9d4ea6d..00000000 Binary files a/files/data/mmodel/mmodel/narc_0002.bin and /dev/null differ diff --git a/files/data/mmodel/mmodel/narc_0003.NSBTX b/files/data/mmodel/mmodel/narc_0003.NSBTX new file mode 100644 index 00000000..b419b265 Binary files /dev/null and b/files/data/mmodel/mmodel/narc_0003.NSBTX differ diff --git a/files/data/mmodel/mmodel/narc_0003.bin b/files/data/mmodel/mmodel/narc_0003.bin deleted file mode 100644 index b419b265..00000000 Binary files a/files/data/mmodel/mmodel/narc_0003.bin and /dev/null differ diff --git a/files/data/mmodel/mmodel/narc_0004.NSBTX b/files/data/mmodel/mmodel/narc_0004.NSBTX new file mode 100644 index 00000000..340e7cf7 Binary files /dev/null and b/files/data/mmodel/mmodel/narc_0004.NSBTX differ diff --git a/files/data/mmodel/mmodel/narc_0004.bin b/files/data/mmodel/mmodel/narc_0004.bin deleted file mode 100644 index 340e7cf7..00000000 Binary files a/files/data/mmodel/mmodel/narc_0004.bin and /dev/null differ diff --git a/files/data/mmodel/mmodel/narc_0005.NSBTX b/files/data/mmodel/mmodel/narc_0005.NSBTX new file mode 100644 index 00000000..92d5ffbd Binary files /dev/null and b/files/data/mmodel/mmodel/narc_0005.NSBTX differ diff --git a/files/data/mmodel/mmodel/narc_0005.bin b/files/data/mmodel/mmodel/narc_0005.bin deleted file mode 100644 index 92d5ffbd..00000000 Binary files a/files/data/mmodel/mmodel/narc_0005.bin and /dev/null differ diff --git a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0000.NSBTX b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0000.NSBTX new file mode 100644 index 00000000..6089ee48 Binary files /dev/null and b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0000.NSBTX differ diff --git a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0000.bin b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0000.bin deleted file mode 100644 index 6089ee48..00000000 Binary files a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0000.bin and /dev/null differ diff --git a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0001.NSBTX b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0001.NSBTX new file mode 100644 index 00000000..becb97b7 Binary files /dev/null and b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0001.NSBTX differ diff --git a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0001.bin b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0001.bin deleted file mode 100644 index becb97b7..00000000 Binary files a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0001.bin and /dev/null differ diff --git a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0002.NSBTX b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0002.NSBTX new file mode 100644 index 00000000..7868c199 Binary files /dev/null and b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0002.NSBTX differ diff --git a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0002.bin b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0002.bin deleted file mode 100644 index 7868c199..00000000 Binary files a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0002.bin and /dev/null differ diff --git a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0003.NSBTX b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0003.NSBTX new file mode 100644 index 00000000..d5d1028f Binary files /dev/null and b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0003.NSBTX differ diff --git a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0003.bin b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0003.bin deleted file mode 100644 index d5d1028f..00000000 Binary files a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0003.bin and /dev/null differ diff --git a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0004.NSBTX b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0004.NSBTX new file mode 100644 index 00000000..d8598e1a Binary files /dev/null and b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0004.NSBTX differ diff --git a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0004.bin b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0004.bin deleted file mode 100644 index d8598e1a..00000000 Binary files a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0004.bin and /dev/null differ diff --git a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0005.NSBTX b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0005.NSBTX new file mode 100644 index 00000000..ef603e0f Binary files /dev/null and b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0005.NSBTX differ diff --git a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0005.bin b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0005.bin deleted file mode 100644 index ef603e0f..00000000 Binary files a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0005.bin and /dev/null differ diff --git a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0006.NSBTX b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0006.NSBTX new file mode 100644 index 00000000..90cab132 Binary files /dev/null and b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0006.NSBTX differ diff --git a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0006.bin b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0006.bin deleted file mode 100644 index 90cab132..00000000 Binary files a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0006.bin and /dev/null differ diff --git a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0007.NSBTX b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0007.NSBTX new file mode 100644 index 00000000..36c988fc Binary files /dev/null and b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0007.NSBTX differ diff --git a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0007.bin b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0007.bin deleted file mode 100644 index 36c988fc..00000000 Binary files a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0007.bin and /dev/null differ diff --git a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0008.NSBTX b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0008.NSBTX new file mode 100644 index 00000000..a46fff6c Binary files /dev/null and b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0008.NSBTX differ diff --git a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0008.bin b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0008.bin deleted file mode 100644 index a46fff6c..00000000 Binary files a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0008.bin and /dev/null differ diff --git a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0009.NSBTX b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0009.NSBTX new file mode 100644 index 00000000..6bb10353 Binary files /dev/null and b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0009.NSBTX differ diff --git a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0009.bin b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0009.bin deleted file mode 100644 index 6bb10353..00000000 Binary files a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0009.bin and /dev/null differ diff --git a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0010.NSBTX b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0010.NSBTX new file mode 100644 index 00000000..3ec999d3 Binary files /dev/null and b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0010.NSBTX differ diff --git a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0010.bin b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0010.bin deleted file mode 100644 index 3ec999d3..00000000 Binary files a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0010.bin and /dev/null differ diff --git a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0011.NSBTX b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0011.NSBTX new file mode 100644 index 00000000..19e7a9e9 Binary files /dev/null and b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0011.NSBTX differ diff --git a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0011.bin b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0011.bin deleted file mode 100644 index 19e7a9e9..00000000 Binary files a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0011.bin and /dev/null differ diff --git a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0012.NSBTX b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0012.NSBTX new file mode 100644 index 00000000..70354f04 Binary files /dev/null and b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0012.NSBTX differ diff --git a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0012.bin b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0012.bin deleted file mode 100644 index 70354f04..00000000 Binary files a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0012.bin and /dev/null differ diff --git a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0013.NSBTX b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0013.NSBTX new file mode 100644 index 00000000..2790f7a6 Binary files /dev/null and b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0013.NSBTX differ diff --git a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0013.bin b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0013.bin deleted file mode 100644 index 2790f7a6..00000000 Binary files a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0013.bin and /dev/null differ diff --git a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0014.NSBTX b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0014.NSBTX new file mode 100644 index 00000000..314da651 Binary files /dev/null and b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0014.NSBTX differ diff --git a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0014.bin b/files/fielddata/areadata/area_build_model/areabm_texset/narc_0014.bin deleted file mode 100644 index 314da651..00000000 Binary files a/files/fielddata/areadata/area_build_model/areabm_texset/narc_0014.bin and /dev/null differ diff --git a/files/fielddata/areadata/area_map_tex/map_tex_set/narc_0000.NSBTX b/files/fielddata/areadata/area_map_tex/map_tex_set/narc_0000.NSBTX new file mode 100644 index 00000000..ac02e25b Binary files /dev/null and b/files/fielddata/areadata/area_map_tex/map_tex_set/narc_0000.NSBTX differ diff --git a/files/fielddata/areadata/area_map_tex/map_tex_set/narc_0000.bin b/files/fielddata/areadata/area_map_tex/map_tex_set/narc_0000.bin deleted file mode 100644 index ac02e25b..00000000 Binary files a/files/fielddata/areadata/area_map_tex/map_tex_set/narc_0000.bin and /dev/null differ diff --git a/files/fielddata/areadata/area_map_tex/map_tex_set/narc_0001.NSBTX b/files/fielddata/areadata/area_map_tex/map_tex_set/narc_0001.NSBTX new file mode 100644 index 00000000..a848c8f1 Binary files /dev/null and b/files/fielddata/areadata/area_map_tex/map_tex_set/narc_0001.NSBTX differ diff --git a/files/fielddata/areadata/area_map_tex/map_tex_set/narc_0001.bin b/files/fielddata/areadata/area_map_tex/map_tex_set/narc_0001.bin deleted file mode 100644 index a848c8f1..00000000 Binary files a/files/fielddata/areadata/area_map_tex/map_tex_set/narc_0001.bin and /dev/null differ diff --git a/files/fielddata/build_model/build_model/narc_0000.NSBMD b/files/fielddata/build_model/build_model/narc_0000.NSBMD new file mode 100644 index 00000000..df429436 Binary files /dev/null and b/files/fielddata/build_model/build_model/narc_0000.NSBMD differ diff --git a/files/fielddata/build_model/build_model/narc_0000.bin b/files/fielddata/build_model/build_model/narc_0000.bin deleted file mode 100644 index df429436..00000000 Binary files a/files/fielddata/build_model/build_model/narc_0000.bin and /dev/null differ diff --git a/files/fielddata/build_model/build_model/narc_0001.NSMBD b/files/fielddata/build_model/build_model/narc_0001.NSMBD new file mode 100644 index 00000000..fed4005f Binary files /dev/null and b/files/fielddata/build_model/build_model/narc_0001.NSMBD differ diff --git a/files/fielddata/build_model/build_model/narc_0001.bin b/files/fielddata/build_model/build_model/narc_0001.bin deleted file mode 100644 index fed4005f..00000000 Binary files a/files/fielddata/build_model/build_model/narc_0001.bin and /dev/null differ diff --git a/files/fielddata/build_model/build_model/narc_0002.NSBMD b/files/fielddata/build_model/build_model/narc_0002.NSBMD new file mode 100644 index 00000000..69993312 Binary files /dev/null and b/files/fielddata/build_model/build_model/narc_0002.NSBMD differ diff --git a/files/fielddata/build_model/build_model/narc_0002.bin b/files/fielddata/build_model/build_model/narc_0002.bin deleted file mode 100644 index 69993312..00000000 Binary files a/files/fielddata/build_model/build_model/narc_0002.bin and /dev/null differ diff --git a/files/fielddata/build_model/build_model/narc_0003.NSBMD b/files/fielddata/build_model/build_model/narc_0003.NSBMD new file mode 100644 index 00000000..e908385d Binary files /dev/null and b/files/fielddata/build_model/build_model/narc_0003.NSBMD differ diff --git a/files/fielddata/build_model/build_model/narc_0003.bin b/files/fielddata/build_model/build_model/narc_0003.bin deleted file mode 100644 index e908385d..00000000 Binary files a/files/fielddata/build_model/build_model/narc_0003.bin and /dev/null differ diff --git a/files/fielddata/build_model/build_model/narc_0004.NSBMD b/files/fielddata/build_model/build_model/narc_0004.NSBMD new file mode 100644 index 00000000..147bf45b Binary files /dev/null and b/files/fielddata/build_model/build_model/narc_0004.NSBMD differ diff --git a/files/fielddata/build_model/build_model/narc_0004.bin b/files/fielddata/build_model/build_model/narc_0004.bin deleted file mode 100644 index 147bf45b..00000000 Binary files a/files/fielddata/build_model/build_model/narc_0004.bin and /dev/null differ diff --git a/files/fielddata/build_model/build_model/narc_0005.NSBMD b/files/fielddata/build_model/build_model/narc_0005.NSBMD new file mode 100644 index 00000000..944dc2bd Binary files /dev/null and b/files/fielddata/build_model/build_model/narc_0005.NSBMD differ diff --git a/files/fielddata/build_model/build_model/narc_0005.bin b/files/fielddata/build_model/build_model/narc_0005.bin deleted file mode 100644 index 944dc2bd..00000000 Binary files a/files/fielddata/build_model/build_model/narc_0005.bin and /dev/null differ diff --git a/files/fielddata/build_model/build_model/narc_0006.NSBMD b/files/fielddata/build_model/build_model/narc_0006.NSBMD new file mode 100644 index 00000000..933c5d1d Binary files /dev/null and b/files/fielddata/build_model/build_model/narc_0006.NSBMD differ diff --git a/files/fielddata/build_model/build_model/narc_0006.bin b/files/fielddata/build_model/build_model/narc_0006.bin deleted file mode 100644 index 933c5d1d..00000000 Binary files a/files/fielddata/build_model/build_model/narc_0006.bin and /dev/null differ diff --git a/files/graphic/demo_trade/narc_0027.NSBMD b/files/graphic/demo_trade/narc_0027.NSBMD new file mode 100644 index 00000000..3de52aa4 Binary files /dev/null and b/files/graphic/demo_trade/narc_0027.NSBMD differ diff --git a/files/graphic/demo_trade/narc_0027.bin b/files/graphic/demo_trade/narc_0027.bin deleted file mode 100644 index 3de52aa4..00000000 Binary files a/files/graphic/demo_trade/narc_0027.bin and /dev/null differ diff --git a/files/graphic/ending/narc_0000.NSBMD b/files/graphic/ending/narc_0000.NSBMD new file mode 100644 index 00000000..19bc6489 Binary files /dev/null and b/files/graphic/ending/narc_0000.NSBMD differ diff --git a/files/graphic/ending/narc_0000.bin b/files/graphic/ending/narc_0000.bin deleted file mode 100644 index 19bc6489..00000000 Binary files a/files/graphic/ending/narc_0000.bin and /dev/null differ diff --git a/files/graphic/ending/narc_0001.NSBMD b/files/graphic/ending/narc_0001.NSBMD new file mode 100644 index 00000000..beb0ec8b Binary files /dev/null and b/files/graphic/ending/narc_0001.NSBMD differ diff --git a/files/graphic/ending/narc_0001.bin b/files/graphic/ending/narc_0001.bin deleted file mode 100644 index beb0ec8b..00000000 Binary files a/files/graphic/ending/narc_0001.bin and /dev/null differ diff --git a/files/graphic/ending/narc_0002.NSBMD b/files/graphic/ending/narc_0002.NSBMD new file mode 100644 index 00000000..093d1a9d Binary files /dev/null and b/files/graphic/ending/narc_0002.NSBMD differ diff --git a/files/graphic/ending/narc_0002.bin b/files/graphic/ending/narc_0002.bin deleted file mode 100644 index 093d1a9d..00000000 Binary files a/files/graphic/ending/narc_0002.bin and /dev/null differ diff --git a/files/graphic/ending/narc_0003.NSBTA b/files/graphic/ending/narc_0003.NSBTA new file mode 100644 index 00000000..bc2ec208 Binary files /dev/null and b/files/graphic/ending/narc_0003.NSBTA differ diff --git a/files/graphic/ending/narc_0003.bin b/files/graphic/ending/narc_0003.bin deleted file mode 100644 index bc2ec208..00000000 Binary files a/files/graphic/ending/narc_0003.bin and /dev/null differ diff --git a/files/graphic/ev_pokeselect/narc_0000.NSBCA b/files/graphic/ev_pokeselect/narc_0000.NSBCA new file mode 100644 index 00000000..4d53e5bf Binary files /dev/null and b/files/graphic/ev_pokeselect/narc_0000.NSBCA differ diff --git a/files/graphic/ev_pokeselect/narc_0000.bin b/files/graphic/ev_pokeselect/narc_0000.bin deleted file mode 100644 index 4d53e5bf..00000000 Binary files a/files/graphic/ev_pokeselect/narc_0000.bin and /dev/null differ diff --git a/files/graphic/ev_pokeselect/narc_0001.NSBMD b/files/graphic/ev_pokeselect/narc_0001.NSBMD new file mode 100644 index 00000000..be54bee3 Binary files /dev/null and b/files/graphic/ev_pokeselect/narc_0001.NSBMD differ diff --git a/files/graphic/ev_pokeselect/narc_0001.bin b/files/graphic/ev_pokeselect/narc_0001.bin deleted file mode 100644 index be54bee3..00000000 Binary files a/files/graphic/ev_pokeselect/narc_0001.bin and /dev/null differ diff --git a/files/graphic/ev_pokeselect/narc_0002.NSBCA b/files/graphic/ev_pokeselect/narc_0002.NSBCA new file mode 100644 index 00000000..16adb461 Binary files /dev/null and b/files/graphic/ev_pokeselect/narc_0002.NSBCA differ diff --git a/files/graphic/ev_pokeselect/narc_0002.bin b/files/graphic/ev_pokeselect/narc_0002.bin deleted file mode 100644 index 16adb461..00000000 Binary files a/files/graphic/ev_pokeselect/narc_0002.bin and /dev/null differ diff --git a/files/graphic/ev_pokeselect/narc_0003.NSBMD b/files/graphic/ev_pokeselect/narc_0003.NSBMD new file mode 100644 index 00000000..3d515b2d Binary files /dev/null and b/files/graphic/ev_pokeselect/narc_0003.NSBMD differ diff --git a/files/graphic/ev_pokeselect/narc_0003.bin b/files/graphic/ev_pokeselect/narc_0003.bin deleted file mode 100644 index 3d515b2d..00000000 Binary files a/files/graphic/ev_pokeselect/narc_0003.bin and /dev/null differ diff --git a/files/graphic/ev_pokeselect/narc_0004.NSBCA b/files/graphic/ev_pokeselect/narc_0004.NSBCA new file mode 100644 index 00000000..785d6908 Binary files /dev/null and b/files/graphic/ev_pokeselect/narc_0004.NSBCA differ diff --git a/files/graphic/ev_pokeselect/narc_0004.bin b/files/graphic/ev_pokeselect/narc_0004.bin deleted file mode 100644 index 785d6908..00000000 Binary files a/files/graphic/ev_pokeselect/narc_0004.bin and /dev/null differ diff --git a/files/graphic/ev_pokeselect/narc_0005.NSBMD b/files/graphic/ev_pokeselect/narc_0005.NSBMD new file mode 100644 index 00000000..748dc501 Binary files /dev/null and b/files/graphic/ev_pokeselect/narc_0005.NSBMD differ diff --git a/files/graphic/ev_pokeselect/narc_0005.bin b/files/graphic/ev_pokeselect/narc_0005.bin deleted file mode 100644 index 748dc501..00000000 Binary files a/files/graphic/ev_pokeselect/narc_0005.bin and /dev/null differ diff --git a/files/graphic/ev_pokeselect/narc_0006.NSBCA b/files/graphic/ev_pokeselect/narc_0006.NSBCA new file mode 100644 index 00000000..94bca388 Binary files /dev/null and b/files/graphic/ev_pokeselect/narc_0006.NSBCA differ diff --git a/files/graphic/ev_pokeselect/narc_0006.bin b/files/graphic/ev_pokeselect/narc_0006.bin deleted file mode 100644 index 94bca388..00000000 Binary files a/files/graphic/ev_pokeselect/narc_0006.bin and /dev/null differ diff --git a/files/graphic/ev_pokeselect/narc_0007.NSBMD b/files/graphic/ev_pokeselect/narc_0007.NSBMD new file mode 100644 index 00000000..10d233c8 Binary files /dev/null and b/files/graphic/ev_pokeselect/narc_0007.NSBMD differ diff --git a/files/graphic/ev_pokeselect/narc_0007.bin b/files/graphic/ev_pokeselect/narc_0007.bin deleted file mode 100644 index 10d233c8..00000000 Binary files a/files/graphic/ev_pokeselect/narc_0007.bin and /dev/null differ diff --git a/files/graphic/ev_pokeselect/narc_0008.NSBMD b/files/graphic/ev_pokeselect/narc_0008.NSBMD new file mode 100644 index 00000000..80725591 Binary files /dev/null and b/files/graphic/ev_pokeselect/narc_0008.NSBMD differ diff --git a/files/graphic/ev_pokeselect/narc_0008.bin b/files/graphic/ev_pokeselect/narc_0008.bin deleted file mode 100644 index 80725591..00000000 Binary files a/files/graphic/ev_pokeselect/narc_0008.bin and /dev/null differ diff --git a/files/graphic/ev_pokeselect/narc_0009.NSBMD b/files/graphic/ev_pokeselect/narc_0009.NSBMD new file mode 100644 index 00000000..23c5d394 Binary files /dev/null and b/files/graphic/ev_pokeselect/narc_0009.NSBMD differ diff --git a/files/graphic/ev_pokeselect/narc_0009.bin b/files/graphic/ev_pokeselect/narc_0009.bin deleted file mode 100644 index 23c5d394..00000000 Binary files a/files/graphic/ev_pokeselect/narc_0009.bin and /dev/null differ diff --git a/files/graphic/hiden_effect/narc_0000.NSBCA b/files/graphic/hiden_effect/narc_0000.NSBCA new file mode 100644 index 00000000..c12ead76 Binary files /dev/null and b/files/graphic/hiden_effect/narc_0000.NSBCA differ diff --git a/files/graphic/hiden_effect/narc_0000.bin b/files/graphic/hiden_effect/narc_0000.bin deleted file mode 100644 index c12ead76..00000000 Binary files a/files/graphic/hiden_effect/narc_0000.bin and /dev/null differ diff --git a/files/graphic/hiden_effect/narc_0001.NSBMA b/files/graphic/hiden_effect/narc_0001.NSBMA new file mode 100644 index 00000000..70263d42 Binary files /dev/null and b/files/graphic/hiden_effect/narc_0001.NSBMA differ diff --git a/files/graphic/hiden_effect/narc_0001.bin b/files/graphic/hiden_effect/narc_0001.bin deleted file mode 100644 index 70263d42..00000000 Binary files a/files/graphic/hiden_effect/narc_0001.bin and /dev/null differ diff --git a/files/graphic/hiden_effect/narc_0002.NSBTA b/files/graphic/hiden_effect/narc_0002.NSBTA new file mode 100644 index 00000000..d4066c4e Binary files /dev/null and b/files/graphic/hiden_effect/narc_0002.NSBTA differ diff --git a/files/graphic/hiden_effect/narc_0002.bin b/files/graphic/hiden_effect/narc_0002.bin deleted file mode 100644 index d4066c4e..00000000 Binary files a/files/graphic/hiden_effect/narc_0002.bin and /dev/null differ diff --git a/files/graphic/hiden_effect/narc_0003.NSBMD b/files/graphic/hiden_effect/narc_0003.NSBMD new file mode 100644 index 00000000..adec36ef Binary files /dev/null and b/files/graphic/hiden_effect/narc_0003.NSBMD differ diff --git a/files/graphic/hiden_effect/narc_0003.bin b/files/graphic/hiden_effect/narc_0003.bin deleted file mode 100644 index adec36ef..00000000 Binary files a/files/graphic/hiden_effect/narc_0003.bin and /dev/null differ -- cgit v1.2.3