diff options
| author | Charles D <gogume1er@gmail.com> | 2021-07-04 22:17:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-04 22:17:19 +0200 |
| commit | 042e8e5a558d3fb9470234f1ffdfa42d3556d5d3 (patch) | |
| tree | b4d547f092ec9fedf15c2e2a4fb0be4e55b438e5 | |
| parent | 50d1f49f2b2b73663c447ae09e0fb3c602a1a973 (diff) | |
| parent | 97efa5f28e697c85d0a47c45f04b0b69dbf699b0 (diff) | |
Merge branch 'master' into map_matrix
144 files changed, 762 insertions, 96 deletions
diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s index f2ef44dc..94c65983 100644 --- a/arm9/asm/unk_02035068.s +++ b/arm9/asm/unk_02035068.s @@ -341,7 +341,7 @@ _0203529A: _020352AC: ldr r0, [r5, #0x1c] ldr r0, [r0, #0x0] - bl FUN_020349CC + bl MapHeader_MapIsAmitySquare cmp r0, #0x1 bne _020352BC mov r0, #0x6 @@ -2145,7 +2145,7 @@ _02036170: add r7, r0, #0x0 ldr r0, [r5, #0x1c] ldr r0, [r0, #0x0] - bl FUN_02034A04 + bl MapHeader_GetMapEvolutionMethod strh r0, [r7, #0x2] mov r0, #0x0 strb r0, [r7, #0x1] diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s index be2b4770..cfbae230 100644 --- a/arm9/asm/unk_020476CC.s +++ b/arm9/asm/unk_020476CC.s @@ -536,7 +536,7 @@ FUN_02047A78: ; 0x02047A78 str r0, [r5, r1] ldr r0, [r4, #0x1c] ldr r0, [r0, #0x0] - bl FUN_02034A04 + bl MapHeader_GetMapEvolutionMethod mov r1, #0x59 lsl r1, r1, #0x2 str r0, [r5, r1] @@ -1161,7 +1161,7 @@ FUN_0204806C: ; 0x0204806C add r6, r0, #0x0 ldr r0, [r4, #0x1c] ldr r0, [r0, #0x0] - bl MapHeader_GetField17_0 + bl MapHeader_GetBattleBg mov r1, #0x15 lsl r1, r1, #0x4 str r0, [r5, r1] diff --git a/arm9/asm/unk_02048904.s b/arm9/asm/unk_02048904.s index a3631340..8cf0ee61 100644 --- a/arm9/asm/unk_02048904.s +++ b/arm9/asm/unk_02048904.s @@ -506,7 +506,7 @@ FUN_02048CDC: ; 0x02048CDC add r4, r0, #0x0 ldr r0, [r4, #0x1c] ldr r0, [r0, #0x0] - bl FUN_020349E4 + bl MapHeader_MapIsPokemonCenterSecondFloor cmp r0, #0x0 beq _02048CFE ldr r1, [r4, #0x1c] @@ -860,7 +860,7 @@ FUN_02048FC8: ; 0x02048FC8 add r4, r0, #0x0 ldr r0, [r4, #0x1c] ldr r0, [r0, #0x0] - bl FUN_02034998 + bl MapHeader_MapIsUnionRoom cmp r0, #0x0 bne _02049000 add r0, r4, #0x0 diff --git a/arm9/asm/unk_0205CE48.s b/arm9/asm/unk_0205CE48.s index ba92a404..ccff7b32 100644 --- a/arm9/asm/unk_0205CE48.s +++ b/arm9/asm/unk_0205CE48.s @@ -440,7 +440,7 @@ FUN_0205D170: ; 0x0205D170 pop {r3-r5, pc} _0205D184: ldr r0, [r5, #0x0] - bl MapHeader_MapIsOnOverworldMatrix + bl MapHeader_MapIsOnMainMatrix cmp r0, #0x0 bne _0205D194 mov r0, #0x0 @@ -1178,7 +1178,7 @@ _0205D730: .word 0x000022F6 FUN_0205D734: ; 0x0205D734 push {r3, lr} ldr r0, [r0, #0x0] - bl MapHeader_MapIsOnOverworldMatrix + bl MapHeader_MapIsOnMainMatrix cmp r0, #0x0 beq _0205D744 mov r0, #0x0 @@ -1595,7 +1595,7 @@ _0205DA8E: cmp r0, #0x1 bne _0205DAA6 ldr r0, [r4, #0x0] - bl MapHeader_GetField17_6 + bl MapHeader_IsEscapeRopeAllowed cmp r0, #0x1 bne _0205DAA6 mov r0, #0x0 @@ -1675,7 +1675,7 @@ _0205DB1A: pop {r3-r5, pc} _0205DB30: ldr r0, [r4, #0x0] - bl FUN_020349D8 + bl MapHeader_MapIsSpearPillar cmp r0, #0x0 beq _0205DB3E mov r0, #0x0 diff --git a/arm9/asm/unk_0205F7A0.s b/arm9/asm/unk_0205F7A0.s index 3ad96b92..67b26aea 100644 --- a/arm9/asm/unk_0205F7A0.s +++ b/arm9/asm/unk_0205F7A0.s @@ -55,7 +55,7 @@ FUN_0205F7A0: ; 0x0205F7A0 asr r1, r1, #0x5 asr r2, r2, #0x5 bl MapMatrix_GetMapHeader - bl MapHeader_MapIsOnOverworldMatrix + bl MapHeader_MapIsOnMainMatrix cmp r0, #0x0 beq _0205F806 str r4, [r5, #0x0] diff --git a/arm9/asm/unk_0206367C.s b/arm9/asm/unk_0206367C.s index b475c1e5..3a92648f 100644 --- a/arm9/asm/unk_0206367C.s +++ b/arm9/asm/unk_0206367C.s @@ -122,7 +122,7 @@ _0206377C: _02063786: ldr r0, [r5, #0x1c] ldr r0, [r0, #0x0] - bl MapHeader_MapIsOnOverworldMatrix + bl MapHeader_MapIsOnMainMatrix cmp r0, #0x0 beq _020637A6 ldr r0, [r5, #0xc] diff --git a/arm9/asm/unk_02063948.s b/arm9/asm/unk_02063948.s index 1b2bc0a5..632e129d 100644 --- a/arm9/asm/unk_02063948.s +++ b/arm9/asm/unk_02063948.s @@ -1129,7 +1129,7 @@ _020641BE: cmp r0, #0x1 bne _020641D2 ldr r0, [r4, #0x0] - bl MapHeader_GetField17_6 + bl MapHeader_IsEscapeRopeAllowed cmp r0, #0x1 beq _020641D6 _020641D2: diff --git a/arm9/asm/unk_0207550C.s b/arm9/asm/unk_0207550C.s index ee3ba62f..0ad8aad2 100644 --- a/arm9/asm/unk_0207550C.s +++ b/arm9/asm/unk_0207550C.s @@ -2248,7 +2248,7 @@ _02076814: ldr r0, [r0, #0x1c] ldr r0, [r0, #0x1c] ldr r0, [r0, #0x0] - bl FUN_02034A04 + bl MapHeader_GetMapEvolutionMethod add r3, r0, #0x0 ldr r0, _02076878 ; =0x000005A4 lsl r3, r3, #0x10 diff --git a/arm9/global.inc b/arm9/global.inc index a788fcac..da12b3fd 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -2504,23 +2504,23 @@ .extern MapHeader_GetMapSec .extern MapHeader_GetWeatherType .extern MapHeader_GetCameraType -.extern MapHeader_GetField17_0 -.extern MapHeader_GetField17_6 +.extern MapHeader_GetBattleBg +.extern MapHeader_IsEscapeRopeAllowed .extern MapHeader_IsFlyAllowed .extern MapHeader_IsBikeAllowed .extern FUN_020348E4 -.extern MapHeader_MapIsOnOverworldMatrix +.extern MapHeader_MapIsOnMainMatrix .extern FUN_02034930 .extern FUN_02034944 .extern FUN_02034964 .extern FUN_02034984 -.extern FUN_02034998 -.extern FUN_020349AC -.extern FUN_020349B8 -.extern FUN_020349CC -.extern FUN_020349D8 -.extern FUN_020349E4 -.extern FUN_02034A04 +.extern MapHeader_MapIsUnionRoom +.extern MapHeader_MapIsMtCoronetFeebasRoom +.extern MapHeader_MapIsTrophyGarden +.extern MapHeader_MapIsAmitySquare +.extern MapHeader_MapIsSpearPillar +.extern MapHeader_MapIsPokemonCenterSecondFloor +.extern MapHeader_GetMapEvolutionMethod .extern FUN_02034A28 .extern FUN_02034A48 .extern FUN_02034A60 diff --git a/arm9/modules/05/asm/mod05_021D74E0.s b/arm9/modules/05/asm/mod05_021D74E0.s index e523b28d..1aad5cc7 100644 --- a/arm9/modules/05/asm/mod05_021D74E0.s +++ b/arm9/modules/05/asm/mod05_021D74E0.s @@ -542,7 +542,7 @@ MOD05_021D79B4: ; 0x021D79B4 add r5, r0, #0 ldr r0, [r5, #0x1c] ldr r0, [r0] - bl MapHeader_MapIsOnOverworldMatrix + bl MapHeader_MapIsOnMainMatrix cmp r0, #0 beq _021D79FE ldr r0, [r5, #0xc] diff --git a/arm9/modules/05/asm/mod05_021D80E8.s b/arm9/modules/05/asm/mod05_021D80E8.s index bda94277..7af8c0ec 100644 --- a/arm9/modules/05/asm/mod05_021D80E8.s +++ b/arm9/modules/05/asm/mod05_021D80E8.s @@ -2216,11 +2216,11 @@ MOD05_021D9290: ; 0x021D9290 beq _021D92DA ldr r0, [r4, #0x1c] ldr r0, [r0] - bl MapHeader_MapIsOnOverworldMatrix + bl MapHeader_MapIsOnMainMatrix cmp r0, #1 bne _021D931C ldr r0, [sp, #8] - bl MapHeader_MapIsOnOverworldMatrix + bl MapHeader_MapIsOnMainMatrix cmp r0, #0 bne _021D931C ldr r0, [r4, #0x38] @@ -2246,11 +2246,11 @@ _021D92DA: beq _021D931C ldr r0, [r4, #0x1c] ldr r0, [r0] - bl MapHeader_MapIsOnOverworldMatrix + bl MapHeader_MapIsOnMainMatrix cmp r0, #1 bne _021D931C ldr r0, [sp, #8] - bl MapHeader_MapIsOnOverworldMatrix + bl MapHeader_MapIsOnMainMatrix cmp r0, #0 bne _021D931C ldr r0, [r4, #0x38] diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index 8d26492c..5567f4d2 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -4775,7 +4775,7 @@ MOD06_0223B9A8: ; 0x0223B9A8 ldr r0, [r0] add r6, r2, #0 add r7, r3, #0 - bl FUN_020349B8 + bl MapHeader_MapIsTrophyGarden cmp r0, #0 beq _0223B9FC add r1, sp, #0 @@ -5248,7 +5248,7 @@ _0223BD8A: ldr r0, [sp, #8] ldr r0, [r0, #0x1c] ldr r0, [r0] - bl FUN_020349AC + bl MapHeader_MapIsMtCoronetFeebasRoom cmp r0, #0 beq _0223BDFC ldr r0, [sp, #8] diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s index dbf02f8d..6e4f14c2 100644 --- a/arm9/modules/07/asm/module_07.s +++ b/arm9/modules/07/asm/module_07.s @@ -5037,7 +5037,7 @@ MOD07_02214720: ; 0x02214720 mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r1, r0] - bl FUN_02034998 + bl MapHeader_MapIsUnionRoom cmp r0, #1 bne _0221479C mov r0, #1 diff --git a/arm9/modules/42/asm/module_42.s b/arm9/modules/42/asm/module_42.s index 9e502906..3a2eb2e3 100644 --- a/arm9/modules/42/asm/module_42.s +++ b/arm9/modules/42/asm/module_42.s @@ -139,7 +139,7 @@ _02254932: add r6, r0, #0 ldr r0, [r4, #0x1c] ldr r0, [r0] - bl MapHeader_MapIsOnOverworldMatrix + bl MapHeader_MapIsOnMainMatrix cmp r0, #0 beq _02254984 ldr r0, [r4, #0x1c] @@ -527,7 +527,7 @@ MOD42_02254C04: ; 0x02254C04 add r6, r0, #0 ldr r0, [r4, #0x1c] ldr r0, [r0] - bl MapHeader_MapIsOnOverworldMatrix + bl MapHeader_MapIsOnMainMatrix cmp r0, #0 beq _02254C3C ldr r1, [r4, #0x1c] diff --git a/arm9/modules/43/asm/module_43.s b/arm9/modules/43/asm/module_43.s index 59f7e81d..cb9d4f4d 100644 --- a/arm9/modules/43/asm/module_43.s +++ b/arm9/modules/43/asm/module_43.s @@ -62,7 +62,7 @@ MOD43_0225489C: ; 0x0225489C add r6, r0, #0 ldr r0, [r4, #0x1c] ldr r0, [r0] - bl MapHeader_MapIsOnOverworldMatrix + bl MapHeader_MapIsOnMainMatrix cmp r0, #0 beq _022548E0 ldr r0, [r4, #0x1c] @@ -395,7 +395,7 @@ MOD43_02254AF8: ; 0x02254AF8 add r7, r0, #0 ldr r0, [r4, #0x1c] ldr r0, [r0] - bl MapHeader_MapIsOnOverworldMatrix + bl MapHeader_MapIsOnMainMatrix cmp r0, #0 beq _02254B36 ldr r1, [r4, #0x1c] diff --git a/arm9/src/map_header.c b/arm9/src/map_header.c index 644a590b..49f8e986 100644 --- a/arm9/src/map_header.c +++ b/arm9/src/map_header.c @@ -1,39 +1,55 @@ #include "global.h" #include "map_header.h" #include "constants/map_sections.h" +#include "pokemon.h" #pragma thumb on // Static decls u32 MapNumberBoundsCheck(u32 mapno); -const u16 UNK_020EED54[] = { - 0x01A5, 0x01AD, 0x01B4, 0x01BC, 0x01C5, 0x01CC, 0x0007, 0x0025, - 0x0031, 0x01EF, 0x0046, 0x0066, 0x007C, 0x0087, 0x0098, 0x00A9, - 0x00AE, 0x00BE +static const u16 sPokemonCenterSecondFloorMaps[] = { + 421, + 429, + 436, + 444, + 453, + 460, + 7, + 37, + 49, + 495, + 70, + 102, + 124, + 135, + 152, + 169, + 174, + 190 }; -const u16 UNK_020EED78[] = { - 0x0181, 0x001A, - 0x00CB, 0x0019, - 0x00CF, 0x0018, - 0x00D0, 0x0018, - 0x00D1, 0x0018, - 0x00D2, 0x0018, - 0x00D3, 0x0018, - 0x00D4, 0x0018, - 0x00D5, 0x0018, - 0x00D6, 0x0018, - 0x00D7, 0x0018, - 0x00D8, 0x0018, - 0x00D9, 0x0018, - 0x00DA, 0x0018, - 0x00DB, 0x0018, - 0x00DC, 0x0018, - 0x00DD, 0x0018, +static const u16 sMapEvolutionMethods[] = { + 385, EVO_ROUTE217, + 203, EVO_ETERNA, + 207, EVO_CORONET, + 208, EVO_CORONET, + 209, EVO_CORONET, + 210, EVO_CORONET, + 211, EVO_CORONET, + 212, EVO_CORONET, + 213, EVO_CORONET, + 214, EVO_CORONET, + 215, EVO_CORONET, + 216, EVO_CORONET, + 217, EVO_CORONET, + 218, EVO_CORONET, + 219, EVO_CORONET, + 220, EVO_CORONET, + 221, EVO_CORONET, }; -const struct MapHeader sMapHeaders[] = { +static const struct MapHeader sMapHeaders[] = { { 0x0, 0x0, 0x0, 0x170, 0x33b, 0x12, 0x3e8, 0x3e8, 0xffff, 0x0, MAPSEC_MYSTERY_ZONE, 0x0, 0x0, 0x2, 3, TRUE, TRUE, TRUE, FALSE }, { 0x0, 0x0, 0x0, 0x170, 0x33b, 0x12, 0x3e8, 0x3e8, 0xffff, 0x0, MAPSEC_MYSTERY_ZONE, 0x0, 0x0, 0x0, 3, FALSE, FALSE, FALSE, FALSE }, { 0x2, 0x2, 0x2, 0x413, 0x3ca, 0x236, 0x424, 0x424, 0xffff, 0x1, MAPSEC_MYSTERY_ZONE, 0x0, 0x0, 0x6, 3, FALSE, FALSE, FALSE, FALSE }, @@ -694,16 +710,16 @@ u8 MapHeader_GetCameraType(u32 mapno) return sMapHeaders[mapno].camera_type; } -u8 MapHeader_GetField17_0(u32 mapno) +u8 MapHeader_GetBattleBg(u32 mapno) { mapno = MapNumberBoundsCheck(mapno); - return sMapHeaders[mapno].unk17_0; + return sMapHeaders[mapno].battle_bg; } -u8 MapHeader_GetField17_6(u32 mapno) +u8 MapHeader_IsEscapeRopeAllowed(u32 mapno) { mapno = MapNumberBoundsCheck(mapno); - return sMapHeaders[mapno].unk17_6; + return sMapHeaders[mapno].is_escape_rope_allowed; } u8 MapHeader_IsFlyAllowed(u32 mapno) @@ -733,7 +749,7 @@ BOOL FUN_020348E4(u32 mapno) return FALSE; } -BOOL MapHeader_MapIsOnOverworldMatrix(u32 mapno) +BOOL MapHeader_MapIsOnMainMatrix(u32 mapno) { return MapHeader_GetMatrixId(mapno) == 0; } @@ -760,56 +776,56 @@ BOOL FUN_02034964(u32 mapno) BOOL FUN_02034984(u32 mapno) { - return !!FUN_0203491C(mapno); + return FUN_0203491C(mapno) != FALSE; } -BOOL FUN_02034998(u32 mapno) +BOOL MapHeader_MapIsUnionRoom(u32 mapno) { return mapno == 466; } -BOOL FUN_020349AC(u32 mapno) +BOOL MapHeader_MapIsMtCoronetFeebasRoom(u32 mapno) { return mapno == 219; } -BOOL FUN_020349B8(u32 mapno) +BOOL MapHeader_MapIsTrophyGarden(u32 mapno) { return mapno == 287; } -BOOL FUN_020349CC(u32 mapno) +BOOL MapHeader_MapIsAmitySquare(u32 mapno) { return mapno == 253; } -BOOL FUN_020349D8(u32 mapno) +BOOL MapHeader_MapIsSpearPillar(u32 mapno) { return mapno == 220; } -BOOL FUN_020349E4(u16 a0) +BOOL MapHeader_MapIsPokemonCenterSecondFloor(u32 mapno) { int i; - for (i = 0; i < NELEMS(UNK_020EED54); i++) + for (i = 0; i < NELEMS(sPokemonCenterSecondFloorMaps); i++) { - if (a0 == UNK_020EED54[i]) + if (mapno == sPokemonCenterSecondFloorMaps[i]) return TRUE; } return FALSE; } -u16 FUN_02034A04(u16 a0) +u16 MapHeader_GetMapEvolutionMethod(u32 mapno) { int i; - for (i = 0; i < NELEMS(UNK_020EED78); i += 2) + for (i = 0; i < NELEMS(sMapEvolutionMethods); i += 2) { - if (a0 == UNK_020EED78[i + 0]) - return UNK_020EED78[i + 1]; + if (mapno == sMapEvolutionMethods[i + 0]) + return sMapEvolutionMethods[i + 1]; } - return 0; + return EVO_NONE; } diff --git a/files/graphic/field_board/.gitignore b/files/graphic/field_board/.gitignore new file mode 100644 index 00000000..026c4ab6 --- /dev/null +++ b/files/graphic/field_board/.gitignore @@ -0,0 +1,52 @@ +narc_0000.NCGR +narc_0001.NCLR +narc_0002.NCGR +narc_0003.NCGR +narc_0004.NCGR +narc_0005.NCGR +narc_0006.NCGR +narc_0007.NCGR +narc_0008.NCGR +narc_0009.NCGR +narc_0010.NCGR +narc_0011.NCGR +narc_0012.NCGR +narc_0013.NCGR +narc_0014.NCGR +narc_0015.NCGR +narc_0016.NCGR +narc_0017.NCGR +narc_0018.NCGR +narc_0019.NCGR +narc_0020.NCGR +narc_0021.NCGR +narc_0022.NCGR +narc_0023.NCGR +narc_0024.NCGR +narc_0025.NCGR +narc_0026.NCGR +narc_0027.NCGR +narc_0028.NCGR +narc_0029.NCGR +narc_0030.NCGR +narc_0031.NCGR +narc_0032.NCGR +narc_0033.NCGR +narc_0034.NCGR +narc_0035.NCGR +narc_0036.NCGR +narc_0037.NCGR +narc_0038.NCGR +narc_0039.NCGR +narc_0040.NCGR +narc_0041.NCGR +narc_0042.NCGR +narc_0043.NCGR +narc_0044.NCGR +narc_0045.NCGR +narc_0046.NCGR +narc_0047.NCGR +narc_0048.NCGR +narc_0049.NCGR +narc_0050.NCGR +narc_0051.NCGR diff --git a/files/graphic/field_board/narc_0000.NCGR b/files/graphic/field_board/narc_0000.NCGR Binary files differdeleted file mode 100644 index 2214fa16..00000000 --- a/files/graphic/field_board/narc_0000.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0000.png b/files/graphic/field_board/narc_0000.png Binary files differnew file mode 100644 index 00000000..048d9b4f --- /dev/null +++ b/files/graphic/field_board/narc_0000.png diff --git a/files/graphic/field_board/narc_0001.NCLR b/files/graphic/field_board/narc_0001.NCLR Binary files differdeleted file mode 100644 index 990624d5..00000000 --- a/files/graphic/field_board/narc_0001.NCLR +++ /dev/null diff --git a/files/graphic/field_board/narc_0001.pal b/files/graphic/field_board/narc_0001.pal new file mode 100644 index 00000000..b1272fcc --- /dev/null +++ b/files/graphic/field_board/narc_0001.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +156 213 139 +255 255 255 +222 205 164 +180 189 197 +139 148 156 +255 0 0 +8 0 255 +255 172 16 +156 115 82 +222 205 164 +0 0 0 +98 74 41 +123 98 49 +139 115 49 +156 123 57 +180 148 65 +156 213 139 +255 255 255 +164 222 180 +180 189 197 +139 148 156 +255 0 0 +8 0 255 +255 172 16 +156 115 82 +164 222 180 +0 0 0 +41 106 65 +49 131 74 +57 139 82 +65 156 82 +74 180 98 +156 213 139 +255 255 255 +205 205 205 +180 189 197 +139 148 156 +255 0 0 +8 0 255 +255 172 16 +156 115 82 +205 205 205 +0 0 0 +82 90 90 +98 115 115 +115 123 123 +131 139 139 +148 156 156 +156 213 139 +255 255 255 +180 197 222 +180 189 197 +139 148 156 +255 0 0 +8 0 255 +255 172 16 +156 115 82 +180 197 222 +0 0 0 +57 65 115 +74 82 139 +82 98 148 +90 106 164 +106 131 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/graphic/field_board/narc_0002.NCGR b/files/graphic/field_board/narc_0002.NCGR Binary files differdeleted file mode 100644 index 72eaa937..00000000 --- a/files/graphic/field_board/narc_0002.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0002.png b/files/graphic/field_board/narc_0002.png Binary files differnew file mode 100644 index 00000000..b421947e --- /dev/null +++ b/files/graphic/field_board/narc_0002.png diff --git a/files/graphic/field_board/narc_0003.NCGR b/files/graphic/field_board/narc_0003.NCGR Binary files differdeleted file mode 100644 index b8146d82..00000000 --- a/files/graphic/field_board/narc_0003.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0003.png b/files/graphic/field_board/narc_0003.png Binary files differnew file mode 100644 index 00000000..ae1cad13 --- /dev/null +++ b/files/graphic/field_board/narc_0003.png diff --git a/files/graphic/field_board/narc_0004.NCGR b/files/graphic/field_board/narc_0004.NCGR Binary files differdeleted file mode 100644 index 718d36b2..00000000 --- a/files/graphic/field_board/narc_0004.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0004.png b/files/graphic/field_board/narc_0004.png Binary files differnew file mode 100644 index 00000000..b504a95a --- /dev/null +++ b/files/graphic/field_board/narc_0004.png diff --git a/files/graphic/field_board/narc_0005.NCGR b/files/graphic/field_board/narc_0005.NCGR Binary files differdeleted file mode 100644 index 62a652fc..00000000 --- a/files/graphic/field_board/narc_0005.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0005.png b/files/graphic/field_board/narc_0005.png Binary files differnew file mode 100644 index 00000000..9e66ffaf --- /dev/null +++ b/files/graphic/field_board/narc_0005.png diff --git a/files/graphic/field_board/narc_0006.NCGR b/files/graphic/field_board/narc_0006.NCGR Binary files differdeleted file mode 100644 index 32aaa40d..00000000 --- a/files/graphic/field_board/narc_0006.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0006.png b/files/graphic/field_board/narc_0006.png Binary files differnew file mode 100644 index 00000000..9a3b8ee1 --- /dev/null +++ b/files/graphic/field_board/narc_0006.png diff --git a/files/graphic/field_board/narc_0007.NCGR b/files/graphic/field_board/narc_0007.NCGR Binary files differdeleted file mode 100644 index ae134cc6..00000000 --- a/files/graphic/field_board/narc_0007.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0007.png b/files/graphic/field_board/narc_0007.png Binary files differnew file mode 100644 index 00000000..d4902c20 --- /dev/null +++ b/files/graphic/field_board/narc_0007.png diff --git a/files/graphic/field_board/narc_0008.NCGR b/files/graphic/field_board/narc_0008.NCGR Binary files differdeleted file mode 100644 index 8c301e2e..00000000 --- a/files/graphic/field_board/narc_0008.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0008.png b/files/graphic/field_board/narc_0008.png Binary files differnew file mode 100644 index 00000000..4230dee6 --- /dev/null +++ b/files/graphic/field_board/narc_0008.png diff --git a/files/graphic/field_board/narc_0009.NCGR b/files/graphic/field_board/narc_0009.NCGR Binary files differdeleted file mode 100644 index cc56dc59..00000000 --- a/files/graphic/field_board/narc_0009.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0009.png b/files/graphic/field_board/narc_0009.png Binary files differnew file mode 100644 index 00000000..993d65dc --- /dev/null +++ b/files/graphic/field_board/narc_0009.png diff --git a/files/graphic/field_board/narc_0010.NCGR b/files/graphic/field_board/narc_0010.NCGR Binary files differdeleted file mode 100644 index 9e63cbc0..00000000 --- a/files/graphic/field_board/narc_0010.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0010.png b/files/graphic/field_board/narc_0010.png Binary files differnew file mode 100644 index 00000000..8c30ed22 --- /dev/null +++ b/files/graphic/field_board/narc_0010.png diff --git a/files/graphic/field_board/narc_0011.NCGR b/files/graphic/field_board/narc_0011.NCGR Binary files differdeleted file mode 100644 index dc9a146e..00000000 --- a/files/graphic/field_board/narc_0011.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0011.png b/files/graphic/field_board/narc_0011.png Binary files differnew file mode 100644 index 00000000..13ad7ee1 --- /dev/null +++ b/files/graphic/field_board/narc_0011.png diff --git a/files/graphic/field_board/narc_0012.NCGR b/files/graphic/field_board/narc_0012.NCGR Binary files differdeleted file mode 100644 index 7ece9935..00000000 --- a/files/graphic/field_board/narc_0012.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0012.png b/files/graphic/field_board/narc_0012.png Binary files differnew file mode 100644 index 00000000..671d51b4 --- /dev/null +++ b/files/graphic/field_board/narc_0012.png diff --git a/files/graphic/field_board/narc_0013.NCGR b/files/graphic/field_board/narc_0013.NCGR Binary files differdeleted file mode 100644 index d655fec6..00000000 --- a/files/graphic/field_board/narc_0013.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0013.png b/files/graphic/field_board/narc_0013.png Binary files differnew file mode 100644 index 00000000..03582f80 --- /dev/null +++ b/files/graphic/field_board/narc_0013.png diff --git a/files/graphic/field_board/narc_0014.NCGR b/files/graphic/field_board/narc_0014.NCGR Binary files differdeleted file mode 100644 index 9a3eaee2..00000000 --- a/files/graphic/field_board/narc_0014.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0014.png b/files/graphic/field_board/narc_0014.png Binary files differnew file mode 100644 index 00000000..c2120f8f --- /dev/null +++ b/files/graphic/field_board/narc_0014.png diff --git a/files/graphic/field_board/narc_0015.NCGR b/files/graphic/field_board/narc_0015.NCGR Binary files differdeleted file mode 100644 index bcd4f3d6..00000000 --- a/files/graphic/field_board/narc_0015.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0015.png b/files/graphic/field_board/narc_0015.png Binary files differnew file mode 100644 index 00000000..969bed28 --- /dev/null +++ b/files/graphic/field_board/narc_0015.png diff --git a/files/graphic/field_board/narc_0016.NCGR b/files/graphic/field_board/narc_0016.NCGR Binary files differdeleted file mode 100644 index c3b2c6e6..00000000 --- a/files/graphic/field_board/narc_0016.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0016.png b/files/graphic/field_board/narc_0016.png Binary files differnew file mode 100644 index 00000000..d20cbaf0 --- /dev/null +++ b/files/graphic/field_board/narc_0016.png diff --git a/files/graphic/field_board/narc_0017.NCGR b/files/graphic/field_board/narc_0017.NCGR Binary files differdeleted file mode 100644 index e65bee7a..00000000 --- a/files/graphic/field_board/narc_0017.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0017.png b/files/graphic/field_board/narc_0017.png Binary files differnew file mode 100644 index 00000000..2f5353f2 --- /dev/null +++ b/files/graphic/field_board/narc_0017.png diff --git a/files/graphic/field_board/narc_0018.NCGR b/files/graphic/field_board/narc_0018.NCGR Binary files differdeleted file mode 100644 index c2ee2796..00000000 --- a/files/graphic/field_board/narc_0018.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0018.png b/files/graphic/field_board/narc_0018.png Binary files differnew file mode 100644 index 00000000..26826ad2 --- /dev/null +++ b/files/graphic/field_board/narc_0018.png diff --git a/files/graphic/field_board/narc_0019.NCGR b/files/graphic/field_board/narc_0019.NCGR Binary files differdeleted file mode 100644 index a719f813..00000000 --- a/files/graphic/field_board/narc_0019.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0019.png b/files/graphic/field_board/narc_0019.png Binary files differnew file mode 100644 index 00000000..3ce891a2 --- /dev/null +++ b/files/graphic/field_board/narc_0019.png diff --git a/files/graphic/field_board/narc_0020.NCGR b/files/graphic/field_board/narc_0020.NCGR Binary files differdeleted file mode 100644 index ea2c46cb..00000000 --- a/files/graphic/field_board/narc_0020.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0020.png b/files/graphic/field_board/narc_0020.png Binary files differnew file mode 100644 index 00000000..8e2e75d0 --- /dev/null +++ b/files/graphic/field_board/narc_0020.png diff --git a/files/graphic/field_board/narc_0021.NCGR b/files/graphic/field_board/narc_0021.NCGR Binary files differdeleted file mode 100644 index 05e41987..00000000 --- a/files/graphic/field_board/narc_0021.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0021.png b/files/graphic/field_board/narc_0021.png Binary files differnew file mode 100644 index 00000000..98cea9ce --- /dev/null +++ b/files/graphic/field_board/narc_0021.png diff --git a/files/graphic/field_board/narc_0022.NCGR b/files/graphic/field_board/narc_0022.NCGR Binary files differdeleted file mode 100644 index 3041a705..00000000 --- a/files/graphic/field_board/narc_0022.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0022.png b/files/graphic/field_board/narc_0022.png Binary files differnew file mode 100644 index 00000000..1fac00f6 --- /dev/null +++ b/files/graphic/field_board/narc_0022.png diff --git a/files/graphic/field_board/narc_0023.NCGR b/files/graphic/field_board/narc_0023.NCGR Binary files differdeleted file mode 100644 index a63dae87..00000000 --- a/files/graphic/field_board/narc_0023.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0023.png b/files/graphic/field_board/narc_0023.png Binary files differnew file mode 100644 index 00000000..ba66d1fe --- /dev/null +++ b/files/graphic/field_board/narc_0023.png diff --git a/files/graphic/field_board/narc_0024.NCGR b/files/graphic/field_board/narc_0024.NCGR Binary files differdeleted file mode 100644 index 727edd61..00000000 --- a/files/graphic/field_board/narc_0024.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0024.png b/files/graphic/field_board/narc_0024.png Binary files differnew file mode 100644 index 00000000..3114b153 --- /dev/null +++ b/files/graphic/field_board/narc_0024.png diff --git a/files/graphic/field_board/narc_0025.NCGR b/files/graphic/field_board/narc_0025.NCGR Binary files differdeleted file mode 100644 index 770b3435..00000000 --- a/files/graphic/field_board/narc_0025.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0025.png b/files/graphic/field_board/narc_0025.png Binary files differnew file mode 100644 index 00000000..e257f724 --- /dev/null +++ b/files/graphic/field_board/narc_0025.png diff --git a/files/graphic/field_board/narc_0026.NCGR b/files/graphic/field_board/narc_0026.NCGR Binary files differdeleted file mode 100644 index 671b76ca..00000000 --- a/files/graphic/field_board/narc_0026.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0026.png b/files/graphic/field_board/narc_0026.png Binary files differnew file mode 100644 index 00000000..ab7fe549 --- /dev/null +++ b/files/graphic/field_board/narc_0026.png diff --git a/files/graphic/field_board/narc_0027.NCGR b/files/graphic/field_board/narc_0027.NCGR Binary files differdeleted file mode 100644 index c6cf71ea..00000000 --- a/files/graphic/field_board/narc_0027.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0027.png b/files/graphic/field_board/narc_0027.png Binary files differnew file mode 100644 index 00000000..2609b7c9 --- /dev/null +++ b/files/graphic/field_board/narc_0027.png diff --git a/files/graphic/field_board/narc_0028.NCGR b/files/graphic/field_board/narc_0028.NCGR Binary files differdeleted file mode 100644 index f041e52a..00000000 --- a/files/graphic/field_board/narc_0028.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0028.png b/files/graphic/field_board/narc_0028.png Binary files differnew file mode 100644 index 00000000..628e2ed0 --- /dev/null +++ b/files/graphic/field_board/narc_0028.png diff --git a/files/graphic/field_board/narc_0029.NCGR b/files/graphic/field_board/narc_0029.NCGR Binary files differdeleted file mode 100644 index 00cc5f47..00000000 --- a/files/graphic/field_board/narc_0029.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0029.png b/files/graphic/field_board/narc_0029.png Binary files differnew file mode 100644 index 00000000..2236f368 --- /dev/null +++ b/files/graphic/field_board/narc_0029.png diff --git a/files/graphic/field_board/narc_0030.NCGR b/files/graphic/field_board/narc_0030.NCGR Binary files differdeleted file mode 100644 index 74326921..00000000 --- a/files/graphic/field_board/narc_0030.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0030.png b/files/graphic/field_board/narc_0030.png Binary files differnew file mode 100644 index 00000000..945c2c85 --- /dev/null +++ b/files/graphic/field_board/narc_0030.png diff --git a/files/graphic/field_board/narc_0031.NCGR b/files/graphic/field_board/narc_0031.NCGR Binary files differdeleted file mode 100644 index db1b2c11..00000000 --- a/files/graphic/field_board/narc_0031.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0031.png b/files/graphic/field_board/narc_0031.png Binary files differnew file mode 100644 index 00000000..d7a6570d --- /dev/null +++ b/files/graphic/field_board/narc_0031.png diff --git a/files/graphic/field_board/narc_0032.NCGR b/files/graphic/field_board/narc_0032.NCGR Binary files differdeleted file mode 100644 index 913e641a..00000000 --- a/files/graphic/field_board/narc_0032.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0032.png b/files/graphic/field_board/narc_0032.png Binary files differnew file mode 100644 index 00000000..7b5678db --- /dev/null +++ b/files/graphic/field_board/narc_0032.png diff --git a/files/graphic/field_board/narc_0033.NCGR b/files/graphic/field_board/narc_0033.NCGR Binary files differdeleted file mode 100644 index 72eaa937..00000000 --- a/files/graphic/field_board/narc_0033.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0033.png b/files/graphic/field_board/narc_0033.png Binary files differnew file mode 100644 index 00000000..b673ab76 --- /dev/null +++ b/files/graphic/field_board/narc_0033.png diff --git a/files/graphic/field_board/narc_0034.NCGR b/files/graphic/field_board/narc_0034.NCGR Binary files differdeleted file mode 100644 index 523bf808..00000000 --- a/files/graphic/field_board/narc_0034.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0034.png b/files/graphic/field_board/narc_0034.png Binary files differnew file mode 100644 index 00000000..7257a197 --- /dev/null +++ b/files/graphic/field_board/narc_0034.png diff --git a/files/graphic/field_board/narc_0035.NCGR b/files/graphic/field_board/narc_0035.NCGR Binary files differdeleted file mode 100644 index 693bb05a..00000000 --- a/files/graphic/field_board/narc_0035.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0035.png b/files/graphic/field_board/narc_0035.png Binary files differnew file mode 100644 index 00000000..519a6d75 --- /dev/null +++ b/files/graphic/field_board/narc_0035.png diff --git a/files/graphic/field_board/narc_0036.NCGR b/files/graphic/field_board/narc_0036.NCGR Binary files differdeleted file mode 100644 index 6f8ca866..00000000 --- a/files/graphic/field_board/narc_0036.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0036.png b/files/graphic/field_board/narc_0036.png Binary files differnew file mode 100644 index 00000000..0f6972ea --- /dev/null +++ b/files/graphic/field_board/narc_0036.png diff --git a/files/graphic/field_board/narc_0037.NCGR b/files/graphic/field_board/narc_0037.NCGR Binary files differdeleted file mode 100644 index a884581d..00000000 --- a/files/graphic/field_board/narc_0037.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0037.png b/files/graphic/field_board/narc_0037.png Binary files differnew file mode 100644 index 00000000..2ac3406c --- /dev/null +++ b/files/graphic/field_board/narc_0037.png diff --git a/files/graphic/field_board/narc_0038.NCGR b/files/graphic/field_board/narc_0038.NCGR Binary files differdeleted file mode 100644 index db4c74ef..00000000 --- a/files/graphic/field_board/narc_0038.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0038.png b/files/graphic/field_board/narc_0038.png Binary files differnew file mode 100644 index 00000000..9e8c4f71 --- /dev/null +++ b/files/graphic/field_board/narc_0038.png diff --git a/files/graphic/field_board/narc_0039.NCGR b/files/graphic/field_board/narc_0039.NCGR Binary files differdeleted file mode 100644 index 1044248c..00000000 --- a/files/graphic/field_board/narc_0039.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0039.png b/files/graphic/field_board/narc_0039.png Binary files differnew file mode 100644 index 00000000..03e45d87 --- /dev/null +++ b/files/graphic/field_board/narc_0039.png diff --git a/files/graphic/field_board/narc_0040.NCGR b/files/graphic/field_board/narc_0040.NCGR Binary files differdeleted file mode 100644 index 7d9273a8..00000000 --- a/files/graphic/field_board/narc_0040.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0040.png b/files/graphic/field_board/narc_0040.png Binary files differnew file mode 100644 index 00000000..6711ddee --- /dev/null +++ b/files/graphic/field_board/narc_0040.png diff --git a/files/graphic/field_board/narc_0041.NCGR b/files/graphic/field_board/narc_0041.NCGR Binary files differdeleted file mode 100644 index 018da8e8..00000000 --- a/files/graphic/field_board/narc_0041.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0041.png b/files/graphic/field_board/narc_0041.png Binary files differnew file mode 100644 index 00000000..048703e6 --- /dev/null +++ b/files/graphic/field_board/narc_0041.png diff --git a/files/graphic/field_board/narc_0042.NCGR b/files/graphic/field_board/narc_0042.NCGR Binary files differdeleted file mode 100644 index f11c877b..00000000 --- a/files/graphic/field_board/narc_0042.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0042.png b/files/graphic/field_board/narc_0042.png Binary files differnew file mode 100644 index 00000000..4277e483 --- /dev/null +++ b/files/graphic/field_board/narc_0042.png diff --git a/files/graphic/field_board/narc_0043.NCGR b/files/graphic/field_board/narc_0043.NCGR Binary files differdeleted file mode 100644 index 315b57d6..00000000 --- a/files/graphic/field_board/narc_0043.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0043.png b/files/graphic/field_board/narc_0043.png Binary files differnew file mode 100644 index 00000000..85a9539e --- /dev/null +++ b/files/graphic/field_board/narc_0043.png diff --git a/files/graphic/field_board/narc_0044.NCGR b/files/graphic/field_board/narc_0044.NCGR Binary files differdeleted file mode 100644 index 0d4073ce..00000000 --- a/files/graphic/field_board/narc_0044.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0044.png b/files/graphic/field_board/narc_0044.png Binary files differnew file mode 100644 index 00000000..a30999c7 --- /dev/null +++ b/files/graphic/field_board/narc_0044.png diff --git a/files/graphic/field_board/narc_0045.NCGR b/files/graphic/field_board/narc_0045.NCGR Binary files differdeleted file mode 100644 index 1db915f8..00000000 --- a/files/graphic/field_board/narc_0045.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0045.png b/files/graphic/field_board/narc_0045.png Binary files differnew file mode 100644 index 00000000..031e9c2f --- /dev/null +++ b/files/graphic/field_board/narc_0045.png diff --git a/files/graphic/field_board/narc_0046.NCGR b/files/graphic/field_board/narc_0046.NCGR Binary files differdeleted file mode 100644 index 5eaa1a63..00000000 --- a/files/graphic/field_board/narc_0046.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0046.png b/files/graphic/field_board/narc_0046.png Binary files differnew file mode 100644 index 00000000..e119ac73 --- /dev/null +++ b/files/graphic/field_board/narc_0046.png diff --git a/files/graphic/field_board/narc_0047.NCGR b/files/graphic/field_board/narc_0047.NCGR Binary files differdeleted file mode 100644 index 9ba02c72..00000000 --- a/files/graphic/field_board/narc_0047.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0047.png b/files/graphic/field_board/narc_0047.png Binary files differnew file mode 100644 index 00000000..99554fe8 --- /dev/null +++ b/files/graphic/field_board/narc_0047.png diff --git a/files/graphic/field_board/narc_0048.NCGR b/files/graphic/field_board/narc_0048.NCGR Binary files differdeleted file mode 100644 index 91b4e253..00000000 --- a/files/graphic/field_board/narc_0048.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0048.png b/files/graphic/field_board/narc_0048.png Binary files differnew file mode 100644 index 00000000..2f75369e --- /dev/null +++ b/files/graphic/field_board/narc_0048.png diff --git a/files/graphic/field_board/narc_0049.NCGR b/files/graphic/field_board/narc_0049.NCGR Binary files differdeleted file mode 100644 index 42ee64bd..00000000 --- a/files/graphic/field_board/narc_0049.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0049.png b/files/graphic/field_board/narc_0049.png Binary files differnew file mode 100644 index 00000000..a6ab4d6d --- /dev/null +++ b/files/graphic/field_board/narc_0049.png diff --git a/files/graphic/field_board/narc_0050.NCGR b/files/graphic/field_board/narc_0050.NCGR Binary files differdeleted file mode 100644 index ed820ee1..00000000 --- a/files/graphic/field_board/narc_0050.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0050.png b/files/graphic/field_board/narc_0050.png Binary files differnew file mode 100644 index 00000000..90cadf55 --- /dev/null +++ b/files/graphic/field_board/narc_0050.png diff --git a/files/graphic/field_board/narc_0051.NCGR b/files/graphic/field_board/narc_0051.NCGR Binary files differdeleted file mode 100644 index 2aa39b2b..00000000 --- a/files/graphic/field_board/narc_0051.NCGR +++ /dev/null diff --git a/files/graphic/field_board/narc_0051.png b/files/graphic/field_board/narc_0051.png Binary files differnew file mode 100644 index 00000000..348bf037 --- /dev/null +++ b/files/graphic/field_board/narc_0051.png diff --git a/files/resource/eng/trial/trial/.gitignore b/files/resource/eng/trial/trial/.gitignore new file mode 100644 index 00000000..41816fbf --- /dev/null +++ b/files/resource/eng/trial/trial/.gitignore @@ -0,0 +1,8 @@ +narc_0000.NCLR +narc_0001.NCGR +narc_0002.NSCR +narc_0003.NCLR +narc_0004.NCGR +narc_0005.NSCR +narc_0006.NCLR +narc_0007.NCGR diff --git a/files/resource/eng/trial/trial/.knarcignore b/files/resource/eng/trial/trial/.knarcignore index 2856080a..ebdff6e6 100644 --- a/files/resource/eng/trial/trial/.knarcignore +++ b/files/resource/eng/trial/trial/.knarcignore @@ -1,2 +1,3 @@ *.png *.pal +*.json diff --git a/files/resource/eng/trial/trial/narc_0000.NCLR b/files/resource/eng/trial/trial/narc_0000.NCLR Binary files differdeleted file mode 100644 index 5f80ebcb..00000000 --- a/files/resource/eng/trial/trial/narc_0000.NCLR +++ /dev/null diff --git a/files/resource/eng/trial/trial/narc_0000.pal b/files/resource/eng/trial/trial/narc_0000.pal new file mode 100644 index 00000000..12de63af --- /dev/null +++ b/files/resource/eng/trial/trial/narc_0000.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +255 222 0 +255 255 255 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/resource/eng/trial/trial/narc_0001.NCGR b/files/resource/eng/trial/trial/narc_0001.NCGR Binary files differdeleted file mode 100644 index 3bd9894e..00000000 --- a/files/resource/eng/trial/trial/narc_0001.NCGR +++ /dev/null diff --git a/files/resource/eng/trial/trial/narc_0001.png b/files/resource/eng/trial/trial/narc_0001.png Binary files differnew file mode 100644 index 00000000..001fffe4 --- /dev/null +++ b/files/resource/eng/trial/trial/narc_0001.png diff --git a/files/resource/eng/trial/trial/narc_0002.NSCR b/files/resource/eng/trial/trial/narc_0002.NSCR Binary files differdeleted file mode 100644 index 73e2bb51..00000000 --- a/files/resource/eng/trial/trial/narc_0002.NSCR +++ /dev/null diff --git a/files/resource/eng/trial/trial/narc_0002_map.json b/files/resource/eng/trial/trial/narc_0002_map.json new file mode 100644 index 00000000..f29ca09e --- /dev/null +++ b/files/resource/eng/trial/trial/narc_0002_map.json @@ -0,0 +1,32 @@ +{ "compressionlevel":-1, + "height":32, + "infinite":false, + "layers":[ + { + "data":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551, 552, 553, 554, 555, 556, 557, 558, 559, 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, 571, 572, 573, 574, 575, 576, 577, 578, 579, 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, 591, 592, 593, 594, 595, 596, 597, 598, 599, 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 614, 615, 616, 617, 618, 619, 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, 631, 632, 633, 634, 635, 636, 637, 638, 639, 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651, 652, 653, 654, 655, 656, 657, 658, 659, 660, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, 671, 672, 673, 674, 675, 676, 677, 678, 679, 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691, 692, 693, 694, 695, 696, 697, 698, 699, 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, 710, 711, 712, 713, 714, 715, 716, 717, 718, 719, 720, 721, 722, 723, 724, 725, 726, 727, 728, 729, 730, 731, 732, 733, 734, 735, 736, 737, 738, 739, 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, 751, 752, 753, 754, 755, 756, 757, 758, 759, 760, 761, 762, 763, 764, 765, 766, 767, 768, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], + "height":32, + "id":1, + "name":"Tile Layer 1", + "opacity":1, + "type":"tilelayer", + "visible":true, + "width":32, + "x":0, + "y":0 + }], + "nextlayerid":2, + "nextobjectid":1, + "orientation":"orthogonal", + "renderorder":"right-down", + "tiledversion":"1.7.0", + "tileheight":8, + "tilesets":[ + { + "firstgid":1, + "source":"narc_0002_tileset.json" + }], + "tilewidth":8, + "type":"map", + "version":"1.6", + "width":32 +}
\ No newline at end of file diff --git a/files/resource/eng/trial/trial/narc_0002_tileset.json b/files/resource/eng/trial/trial/narc_0002_tileset.json new file mode 100644 index 00000000..8017cfa2 --- /dev/null +++ b/files/resource/eng/trial/trial/narc_0002_tileset.json @@ -0,0 +1,14 @@ +{ "columns":32, + "image":"narc_0001.png", + "imageheight":192, + "imagewidth":256, + "margin":0, + "name":"narc_0001", + "spacing":0, + "tilecount":768, + "tiledversion":"1.7.0", + "tileheight":8, + "tilewidth":8, + "type":"tileset", + "version":"1.6" +}
\ No newline at end of file diff --git a/files/resource/eng/trial/trial/narc_0003.NCLR b/files/resource/eng/trial/trial/narc_0003.NCLR Binary files differdeleted file mode 100644 index fd75cd98..00000000 --- a/files/resource/eng/trial/trial/narc_0003.NCLR +++ /dev/null diff --git a/files/resource/eng/trial/trial/narc_0003.pal b/files/resource/eng/trial/trial/narc_0003.pal new file mode 100644 index 00000000..c88938c8 --- /dev/null +++ b/files/resource/eng/trial/trial/narc_0003.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +8 0 0 +222 222 222 +41 41 41 +123 123 123 +172 172 172 +74 74 74 +255 255 255 +189 189 189 +98 98 98 +139 139 139 +57 49 49 +205 205 205 +156 156 156 +82 82 82 +180 180 180 diff --git a/files/resource/eng/trial/trial/narc_0004.NCGR b/files/resource/eng/trial/trial/narc_0004.NCGR Binary files differdeleted file mode 100644 index ba25ad50..00000000 --- a/files/resource/eng/trial/trial/narc_0004.NCGR +++ /dev/null diff --git a/files/resource/eng/trial/trial/narc_0004.png b/files/resource/eng/trial/trial/narc_0004.png Binary files differnew file mode 100644 index 00000000..2a7b1c9a --- /dev/null +++ b/files/resource/eng/trial/trial/narc_0004.png diff --git a/files/resource/eng/trial/trial/narc_0005.NSCR b/files/resource/eng/trial/trial/narc_0005.NSCR Binary files differdeleted file mode 100644 index 73e2bb51..00000000 --- a/files/resource/eng/trial/trial/narc_0005.NSCR +++ /dev/null diff --git a/files/resource/eng/trial/trial/narc_0005_map.json b/files/resource/eng/trial/trial/narc_0005_map.json new file mode 100644 index 00000000..f008e1a3 --- /dev/null +++ b/files/resource/eng/trial/trial/narc_0005_map.json @@ -0,0 +1,32 @@ +{ "compressionlevel":-1, + "height":32, + "infinite":false, + "layers":[ + { + "data":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551, 552, 553, 554, 555, 556, 557, 558, 559, 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, 571, 572, 573, 574, 575, 576, 577, 578, 579, 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, 591, 592, 593, 594, 595, 596, 597, 598, 599, 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 614, 615, 616, 617, 618, 619, 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, 631, 632, 633, 634, 635, 636, 637, 638, 639, 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651, 652, 653, 654, 655, 656, 657, 658, 659, 660, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, 671, 672, 673, 674, 675, 676, 677, 678, 679, 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691, 692, 693, 694, 695, 696, 697, 698, 699, 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, 710, 711, 712, 713, 714, 715, 716, 717, 718, 719, 720, 721, 722, 723, 724, 725, 726, 727, 728, 729, 730, 731, 732, 733, 734, 735, 736, 737, 738, 739, 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, 751, 752, 753, 754, 755, 756, 757, 758, 759, 760, 761, 762, 763, 764, 765, 766, 767, 768, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], + "height":32, + "id":1, + "name":"Tile Layer 1", + "opacity":1, + "type":"tilelayer", + "visible":true, + "width":32, + "x":0, + "y":0 + }], + "nextlayerid":2, + "nextobjectid":1, + "orientation":"orthogonal", + "renderorder":"right-down", + "tiledversion":"1.7.0", + "tileheight":8, + "tilesets":[ + { + "firstgid":1, + "source":"narc_0005_tileset.json" + }], + "tilewidth":8, + "type":"map", + "version":"1.6", + "width":32 +}
\ No newline at end of file diff --git a/files/resource/eng/trial/trial/narc_0005_tileset.json b/files/resource/eng/trial/trial/narc_0005_tileset.json new file mode 100644 index 00000000..8c815a25 --- /dev/null +++ b/files/resource/eng/trial/trial/narc_0005_tileset.json @@ -0,0 +1,14 @@ +{ "columns":32, + "image":"narc_0004.png", + "imageheight":192, + "imagewidth":256, + "margin":0, + "name":"narc_0004", + "spacing":0, + "tilecount":768, + "tiledversion":"1.7.0", + "tileheight":8, + "tilewidth":8, + "type":"tileset", + "version":"1.6" +}
\ No newline at end of file diff --git a/files/resource/eng/trial/trial/narc_0006.NCLR b/files/resource/eng/trial/trial/narc_0006.NCLR Binary files differdeleted file mode 100644 index b022801d..00000000 --- a/files/resource/eng/trial/trial/narc_0006.NCLR +++ /dev/null diff --git a/files/resource/eng/trial/trial/narc_0006.pal b/files/resource/eng/trial/trial/narc_0006.pal new file mode 100644 index 00000000..4974f67b --- /dev/null +++ b/files/resource/eng/trial/trial/narc_0006.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +255 238 180 +255 213 115 +255 189 41 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/resource/eng/trial/trial/narc_0007.NCGR b/files/resource/eng/trial/trial/narc_0007.NCGR Binary files differdeleted file mode 100644 index 170b6168..00000000 --- a/files/resource/eng/trial/trial/narc_0007.NCGR +++ /dev/null diff --git a/files/resource/eng/trial/trial/narc_0007.png b/files/resource/eng/trial/trial/narc_0007.png Binary files differnew file mode 100644 index 00000000..0274c915 --- /dev/null +++ b/files/resource/eng/trial/trial/narc_0007.png diff --git a/filesystem.mk b/filesystem.mk index ce072c9c..c0cd6ac5 100644 --- a/filesystem.mk +++ b/filesystem.mk @@ -3266,6 +3266,70 @@ files/graphic/poketch.narc: \ files/graphic/poketch/narc_0010.NCGR.lz \ files/graphic/poketch/narc_0011.NSCR.lz +files/resource/eng/trial/trial.narc: \ + files/resource/eng/trial/trial/narc_0000.NCLR \ + files/resource/eng/trial/trial/narc_0001.NCGR \ + files/resource/eng/trial/trial/narc_0002.NSCR \ + files/resource/eng/trial/trial/narc_0003.NCLR \ + files/resource/eng/trial/trial/narc_0004.NCGR \ + files/resource/eng/trial/trial/narc_0005.NSCR \ + files/resource/eng/trial/trial/narc_0006.NCLR \ + files/resource/eng/trial/trial/narc_0007.NCGR + +files/graphic/field_board.narc: \ + files/graphic/field_board/narc_0000.NCGR \ + files/graphic/field_board/narc_0001.NCLR \ + files/graphic/field_board/narc_0002.NCGR \ + files/graphic/field_board/narc_0003.NCGR \ + files/graphic/field_board/narc_0004.NCGR \ + files/graphic/field_board/narc_0005.NCGR \ + files/graphic/field_board/narc_0006.NCGR \ + files/graphic/field_board/narc_0007.NCGR \ + files/graphic/field_board/narc_0008.NCGR \ + files/graphic/field_board/narc_0009.NCGR \ + files/graphic/field_board/narc_0010.NCGR \ + files/graphic/field_board/narc_0011.NCGR \ + files/graphic/field_board/narc_0012.NCGR \ + files/graphic/field_board/narc_0013.NCGR \ + files/graphic/field_board/narc_0014.NCGR \ + files/graphic/field_board/narc_0015.NCGR \ + files/graphic/field_board/narc_0016.NCGR \ + files/graphic/field_board/narc_0017.NCGR \ + files/graphic/field_board/narc_0018.NCGR \ + files/graphic/field_board/narc_0019.NCGR \ + files/graphic/field_board/narc_0020.NCGR \ + files/graphic/field_board/narc_0021.NCGR \ + files/graphic/field_board/narc_0022.NCGR \ + files/graphic/field_board/narc_0023.NCGR \ + files/graphic/field_board/narc_0024.NCGR \ + files/graphic/field_board/narc_0025.NCGR \ + files/graphic/field_board/narc_0026.NCGR \ + files/graphic/field_board/narc_0027.NCGR \ + files/graphic/field_board/narc_0028.NCGR \ + files/graphic/field_board/narc_0029.NCGR \ + files/graphic/field_board/narc_0030.NCGR \ + files/graphic/field_board/narc_0031.NCGR \ + files/graphic/field_board/narc_0032.NCGR \ + files/graphic/field_board/narc_0033.NCGR \ + files/graphic/field_board/narc_0034.NCGR \ + files/graphic/field_board/narc_0035.NCGR \ + files/graphic/field_board/narc_0036.NCGR \ + files/graphic/field_board/narc_0037.NCGR \ + files/graphic/field_board/narc_0038.NCGR \ + files/graphic/field_board/narc_0039.NCGR \ + files/graphic/field_board/narc_0040.NCGR \ + files/graphic/field_board/narc_0041.NCGR \ + files/graphic/field_board/narc_0042.NCGR \ + files/graphic/field_board/narc_0043.NCGR \ + files/graphic/field_board/narc_0044.NCGR \ + files/graphic/field_board/narc_0045.NCGR \ + files/graphic/field_board/narc_0046.NCGR \ + files/graphic/field_board/narc_0047.NCGR \ + files/graphic/field_board/narc_0048.NCGR \ + files/graphic/field_board/narc_0049.NCGR \ + files/graphic/field_board/narc_0050.NCGR \ + files/graphic/field_board/narc_0051.NCGR + ## Trainer names files/msgdata/msg/narc_0559.txt: files/poketool/trainer/trdata.json (echo " -"; $(GREP) -w '"name":' $< | cut -d'"' -f4) | $(SED) 's/^(.+)$$/{TRNAME}\1\r/g' > $@ diff --git a/graphics_rules.mk b/graphics_rules.mk index d36fa0c3..80f178f0 100644 --- a/graphics_rules.mk +++ b/graphics_rules.mk @@ -111,11 +111,16 @@ CLOBBER_SIZE_VERSION101_NCGR_FILES := files/graphic/bag_gra/narc_0002.NCGR \ files/poketool/icongra/poke_icon/narc_0034.NCGR \ files/poketool/icongra/poke_icon/narc_0035.NCGR \ files/poketool/icongra/poke_icon/narc_0036.NCGR \ - files/poketool/icongra/poke_icon/narc_0402.NCGR + files/poketool/icongra/poke_icon/narc_0402.NCGR \ + files/resource/eng/trial/trial/narc_0007.NCGR 4BPP_NCLR_FILES := files/application/wifi_earth/wifi_earth/narc_0006.NCLR \ files/demo/title/titledemo/narc_0016.NCLR \ - files/poketool/icongra/poke_icon/narc_0000.NCLR + files/graphic/field_board/narc_0001.NCLR \ + files/poketool/icongra/poke_icon/narc_0000.NCLR \ + files/resource/eng/trial/trial/narc_0000.NCLR \ + files/resource/eng/trial/trial/narc_0003.NCLR \ + files/resource/eng/trial/trial/narc_0006.NCLR \ 8BPP_NSCR_FILES := files/demo/title/titledemo/narc_0000.NSCR @@ -157,7 +162,60 @@ VERSION101_SOPC_NCGR_FILES := files/application/wifi_earth/wifi_earth/narc_0005. files/demo/title/titledemo/narc_0007.NCGR \ files/demo/title/titledemo/narc_0011.NCGR \ files/demo/title/titledemo/narc_0015.NCGR \ - files/graphic/poketch/narc_0010.NCGR + files/graphic/field_board/narc_0000.NCGR \ + files/graphic/field_board/narc_0002.NCGR \ + files/graphic/field_board/narc_0003.NCGR \ + files/graphic/field_board/narc_0004.NCGR \ + files/graphic/field_board/narc_0005.NCGR \ + files/graphic/field_board/narc_0006.NCGR \ + files/graphic/field_board/narc_0007.NCGR \ + files/graphic/field_board/narc_0008.NCGR \ + files/graphic/field_board/narc_0009.NCGR \ + files/graphic/field_board/narc_0010.NCGR \ + files/graphic/field_board/narc_0011.NCGR \ + files/graphic/field_board/narc_0012.NCGR \ + files/graphic/field_board/narc_0013.NCGR \ + files/graphic/field_board/narc_0014.NCGR \ + files/graphic/field_board/narc_0015.NCGR \ + files/graphic/field_board/narc_0016.NCGR \ + files/graphic/field_board/narc_0017.NCGR \ + files/graphic/field_board/narc_0018.NCGR \ + files/graphic/field_board/narc_0019.NCGR \ + files/graphic/field_board/narc_0020.NCGR \ + files/graphic/field_board/narc_0021.NCGR \ + files/graphic/field_board/narc_0022.NCGR \ + files/graphic/field_board/narc_0023.NCGR \ + files/graphic/field_board/narc_0024.NCGR \ + files/graphic/field_board/narc_0025.NCGR \ + files/graphic/field_board/narc_0026.NCGR \ + files/graphic/field_board/narc_0027.NCGR \ + files/graphic/field_board/narc_0028.NCGR \ + files/graphic/field_board/narc_0029.NCGR \ + files/graphic/field_board/narc_0030.NCGR \ + files/graphic/field_board/narc_0031.NCGR \ + files/graphic/field_board/narc_0032.NCGR \ + files/graphic/field_board/narc_0033.NCGR \ + files/graphic/field_board/narc_0034.NCGR \ + files/graphic/field_board/narc_0035.NCGR \ + files/graphic/field_board/narc_0036.NCGR \ + files/graphic/field_board/narc_0037.NCGR \ + files/graphic/field_board/narc_0038.NCGR \ + files/graphic/field_board/narc_0039.NCGR \ + files/graphic/field_board/narc_0040.NCGR \ + files/graphic/field_board/narc_0041.NCGR \ + files/graphic/field_board/narc_0042.NCGR \ + files/graphic/field_board/narc_0043.NCGR \ + files/graphic/field_board/narc_0044.NCGR \ + files/graphic/field_board/narc_0045.NCGR \ + files/graphic/field_board/narc_0046.NCGR \ + files/graphic/field_board/narc_0047.NCGR \ + files/graphic/field_board/narc_0048.NCGR \ + files/graphic/field_board/narc_0049.NCGR \ + files/graphic/field_board/narc_0050.NCGR \ + files/graphic/field_board/narc_0051.NCGR \ + files/graphic/poketch/narc_0010.NCGR \ + files/resource/eng/trial/trial/narc_0001.NCGR \ + files/resource/eng/trial/trial/narc_0004.NCGR 8BPP_COMP10_NOPAD_NCLR_PNG_FILES := files/poketool/trgra/trbgra/narc_0000.NCLR \ files/poketool/trgra/trbgra/narc_0002.NCLR \ @@ -444,6 +502,57 @@ NCGR_CLEAN_LIST := files/application/wifi_earth/wifi_earth/narc_0005.NCGR \ files/graphic/bag_gra/narc_0002.NCGR \ files/graphic/bag_gra/narc_0006.NCGR \ files/graphic/bag_gra/narc_0034.NCGR \ + files/graphic/field_board/narc_0000.NCGR \ + files/graphic/field_board/narc_0002.NCGR \ + files/graphic/field_board/narc_0003.NCGR \ + files/graphic/field_board/narc_0004.NCGR \ + files/graphic/field_board/narc_0005.NCGR \ + files/graphic/field_board/narc_0006.NCGR \ + files/graphic/field_board/narc_0007.NCGR \ + files/graphic/field_board/narc_0008.NCGR \ + files/graphic/field_board/narc_0009.NCGR \ + files/graphic/field_board/narc_0010.NCGR \ + files/graphic/field_board/narc_0011.NCGR \ + files/graphic/field_board/narc_0012.NCGR \ + files/graphic/field_board/narc_0013.NCGR \ + files/graphic/field_board/narc_0014.NCGR \ + files/graphic/field_board/narc_0015.NCGR \ + files/graphic/field_board/narc_0016.NCGR \ + files/graphic/field_board/narc_0017.NCGR \ + files/graphic/field_board/narc_0018.NCGR \ + files/graphic/field_board/narc_0019.NCGR \ + files/graphic/field_board/narc_0020.NCGR \ + files/graphic/field_board/narc_0021.NCGR \ + files/graphic/field_board/narc_0022.NCGR \ + files/graphic/field_board/narc_0023.NCGR \ + files/graphic/field_board/narc_0024.NCGR \ + files/graphic/field_board/narc_0025.NCGR \ + files/graphic/field_board/narc_0026.NCGR \ + files/graphic/field_board/narc_0027.NCGR \ + files/graphic/field_board/narc_0028.NCGR \ + files/graphic/field_board/narc_0029.NCGR \ + files/graphic/field_board/narc_0030.NCGR \ + files/graphic/field_board/narc_0031.NCGR \ + files/graphic/field_board/narc_0032.NCGR \ + files/graphic/field_board/narc_0033.NCGR \ + files/graphic/field_board/narc_0034.NCGR \ + files/graphic/field_board/narc_0035.NCGR \ + files/graphic/field_board/narc_0036.NCGR \ + files/graphic/field_board/narc_0037.NCGR \ + files/graphic/field_board/narc_0038.NCGR \ + files/graphic/field_board/narc_0039.NCGR \ + files/graphic/field_board/narc_0040.NCGR \ + files/graphic/field_board/narc_0041.NCGR \ + files/graphic/field_board/narc_0042.NCGR \ + files/graphic/field_board/narc_0043.NCGR \ + files/graphic/field_board/narc_0044.NCGR \ + files/graphic/field_board/narc_0045.NCGR \ + files/graphic/field_board/narc_0046.NCGR \ + files/graphic/field_board/narc_0047.NCGR \ + files/graphic/field_board/narc_0048.NCGR \ + files/graphic/field_board/narc_0049.NCGR \ + files/graphic/field_board/narc_0050.NCGR \ + files/graphic/field_board/narc_0051.NCGR \ files/itemtool/itemdata/item_icon/narc_0002.NCGR \ files/itemtool/itemdata/item_icon/narc_0004.NCGR \ files/itemtool/itemdata/item_icon/narc_0006.NCGR \ @@ -696,7 +805,9 @@ NCGR_CLEAN_LIST := files/application/wifi_earth/wifi_earth/narc_0005.NCGR \ files/poketool/trgra/trfgra/narc_0190.NCGR \ files/poketool/trgra/trfgra/narc_0192.NCGR \ files/poketool/trgra/trfgra/narc_0194.NCGR \ - + files/resource/eng/trial/trial/narc_0001.NCGR \ + files/resource/eng/trial/trial/narc_0004.NCGR \ + files/resource/eng/trial/trial/narc_0007.NCGR \ NCLR_CLEAN_LIST := files/application/wifi_earth/wifi_earth/narc_0006.NCLR \ files/data/cell0.NCLR \ @@ -709,6 +820,7 @@ NCLR_CLEAN_LIST := files/application/wifi_earth/wifi_earth/narc_0006.NCLR \ files/demo/title/titledemo/narc_0016.NCLR \ files/graphic/bag_gra/narc_0003.NCLR \ files/graphic/bag_gra/narc_0034.NCLR \ + files/graphic/field_board/narc_0001.NCLR \ files/itemtool/itemdata/item_icon/narc_0002.NCLR \ files/itemtool/itemdata/item_icon/narc_0004.NCLR \ files/itemtool/itemdata/item_icon/narc_0006.NCLR \ @@ -935,6 +1047,9 @@ NCLR_CLEAN_LIST := files/application/wifi_earth/wifi_earth/narc_0006.NCLR \ files/poketool/trgra/trfgra/narc_0190.NCLR \ files/poketool/trgra/trfgra/narc_0192.NCLR \ files/poketool/trgra/trfgra/narc_0194.NCLR \ + files/resource/eng/trial/trial/narc_0000.NCLR \ + files/resource/eng/trial/trial/narc_0003.NCLR \ + files/resource/eng/trial/trial/narc_0006.NCLR \ NCER_CLEAN_LIST := files/poketool/icongra/poke_icon/narc_0002.NCER \ files/poketool/icongra/poke_icon/narc_0004.NCER \ @@ -943,4 +1058,6 @@ NCER_CLEAN_LIST := files/poketool/icongra/poke_icon/narc_0002.NCER \ NSCR_CLEAN_LIST := files/demo/title/titledemo/narc_0000.NSCR \ files/demo/title/titledemo/narc_0008.NSCR \ files/demo/title/titledemo/narc_0012.NSCR \ - files/demo/title/titledemo/narc_0017.NSCR + files/demo/title/titledemo/narc_0017.NSCR \ + files/resource/eng/trial/trial/narc_0002.NSCR \ + files/resource/eng/trial/trial/narc_0005.NSCR diff --git a/include/map_header.h b/include/map_header.h index 20677025..60c8baaf 100644 --- a/include/map_header.h +++ b/include/map_header.h @@ -17,10 +17,10 @@ struct MapHeader u8 weather_type; u8 camera_type; u8 unk16; - u8 unk17_0:4; + u8 battle_bg:4; u8 is_bike_allowed:1; - u8 unk17_5:1; - u8 unk17_6:1; + u8 is_running_allowed:1; // unused + u8 is_escape_rope_allowed:1; u8 is_fly_allowed:1; }; @@ -38,24 +38,24 @@ u16 MapHeader_GetEventsBank(u32 mapno); u16 MapHeader_GetMapSec(u32 mapno); u8 MapHeader_GetWeatherType(u32 mapno); u8 MapHeader_GetCameraType(u32 mapno); -u8 MapHeader_GetField17_0(u32 mapno); -u8 MapHeader_GetField17_6(u32 mapno); +u8 MapHeader_GetBattleBg(u32 mapno); +u8 MapHeader_IsEscapeRopeAllowed(u32 mapno); u8 MapHeader_IsFlyAllowed(u32 mapno); u8 MapHeader_IsBikeAllowed(u32 mapno); u8 MapHeader_GetField16(u32 mapno); BOOL FUN_020348E4(u32 mapno); -BOOL MapHeader_MapIsOnOverworldMatrix(u32 mapno); +BOOL MapHeader_MapIsOnMainMatrix(u32 mapno); BOOL FUN_0203491C(u32 mapno); BOOL FUN_02034930(u32 mapno); BOOL FUN_02034944(u32 mapno); BOOL FUN_02034964(u32 mapno); BOOL FUN_02034984(u32 mapno); -BOOL FUN_02034998(u32 mapno); -BOOL FUN_020349AC(u32 mapno); -BOOL FUN_020349B8(u32 mapno); -BOOL FUN_020349CC(u32 mapno); -BOOL FUN_020349D8(u32 mapno); -BOOL FUN_020349E4(u16 a0); -u16 FUN_02034A04(u16 a0); +BOOL MapHeader_MapIsUnionRoom(u32 mapno); +BOOL MapHeader_MapIsMtCoronetFeebasRoom(u32 mapno); +BOOL MapHeader_MapIsTrophyGarden(u32 mapno); +BOOL MapHeader_MapIsAmitySquare(u32 mapno); +BOOL MapHeader_MapIsSpearPillar(u32 mapno); +BOOL MapHeader_MapIsPokemonCenterSecondFloor(u32 mapno); +u16 MapHeader_GetMapEvolutionMethod(u32 mapno); #endif //POKEDIAMOND_MAP_HEADER_H |
