Merge pull request #243 from red031000/master

venusaur, empoleon and OS_cache

arm9/asm/OS_cache.s

@@ -1,102 +0,0 @@
-    .include "asm/macros.inc"
-    .include "global.inc"
-
-    .text
-
-	arm_func_start DC_InvalidateAll
-DC_InvalidateAll: ; 0x020CC0B8
-	mov r0, #0x0
-	mcr p15, 0x0, r0, c7, c6, 0x0
-	bx lr
-
-	arm_func_start DC_StoreAll
-DC_StoreAll: ; 0x020CC0C4
-	mov r1, #0x0
-_020CC0C8:
-	mov r0, #0x0
-_020CC0CC:
-	orr r2, r1, r0
-	mcr p15, 0x0, r2, c7, c10, 0x2
-	add r0, r0, #0x20
-	cmp r0, #0x400
-	blt _020CC0CC
-	add r1, r1, #0x40000000
-	cmp r1, #0x0
-	bne _020CC0C8
-	bx lr
-
-	arm_func_start DC_FlushAll
-DC_FlushAll: ; 0x020CC0F0
-	mov r12, #0x0
-	mov r1, #0x0
-_020CC0F8:
-	mov r0, #0x0
-_020CC0FC:
-	orr r2, r1, r0
-	mcr p15, 0x0, r12, c7, c10, 0x4
-	mcr p15, 0x0, r2, c7, c14, 0x2
-	add r0, r0, #0x20
-	cmp r0, #0x400
-	blt _020CC0FC
-	add r1, r1, #0x40000000
-	cmp r1, #0x0
-	bne _020CC0F8
-	bx lr
-
-	arm_func_start DC_InvalidateRange
-DC_InvalidateRange: ; 0x020CC124
-	add r1, r1, r0
-	bic r0, r0, #0x1f
-_020CC12C:
-	mcr p15, 0x0, r0, c7, c6, 0x1
-	add r0, r0, #0x20
-	cmp r0, r1
-	blt _020CC12C
-	bx lr
-
-	arm_func_start DC_StoreRange
-DC_StoreRange: ; 0x020CC140
-	add r1, r1, r0
-	bic r0, r0, #0x1f
-_020CC148:
-	mcr p15, 0x0, r0, c7, c10, 0x1
-	add r0, r0, #0x20
-	cmp r0, r1
-	blt _020CC148
-	bx lr
-
-	arm_func_start DC_FlushRange
-DC_FlushRange: ; 0x020CC15C
-	mov r12, #0x0
-	add r1, r1, r0
-	bic r0, r0, #0x1f
-_020CC168:
-	mcr p15, 0x0, r12, c7, c10, 0x4
-	mcr p15, 0x0, r0, c7, c14, 0x1
-	add r0, r0, #0x20
-	cmp r0, r1
-	blt _020CC168
-	bx lr
-
-	arm_func_start DC_WaitWriteBufferEmpty
-DC_WaitWriteBufferEmpty: ; 0x020CC180
-	mov r0, #0x0
-	mcr p15, 0x0, r0, c7, c10, 0x4
-	bx lr
-
-	arm_func_start IC_InvalidateAll
-IC_InvalidateAll: ; 0x020CC18C
-	mov r0, #0x0
-	mcr p15, 0x0, r0, c7, c5, 0x0
-	bx lr
-
-	arm_func_start IC_InvalidateRange
-IC_InvalidateRange:
-	add r1, r1, r0
-	bic r0, r0, #0x1f
-_020CC1A0:
-	mcr p15, 0x0, r0, c7, c5, 0x1
-	add r0, r0, #0x20
-	cmp r0, r1
-	blt _020CC1A0
-	bx lr

arm9/lib/include/OS_cache.h

@@ -1,9 +1,16 @@
-#ifndef NITRO_OS_CACHE_H_
-#define NITRO_OS_CACHE_H_
+#ifndef POKEDIAMOND_OS_CACHE_H
+#define POKEDIAMOND_OS_CACHE_H
 
-void IC_InvalidateRange(void *startAddr, u32 nBytes);
-void IC_FlushRange(void *startAddr, u32 nBytes);
-void DC_InvalidateRange(void *startAddr, u32 nBytes);
-void DC_FlushRange(void *startAddr, u32 nBytes);
+#include "nitro/types.h"
 
-#endif //NITRO_OS_CACHE_H_
+void DC_InvalidateAll(void);
+void DC_StoreAll(void);
+void DC_FlushAll(void);
+void DC_InvalidateRange(register void *startAddr, register u32 nBytes);
+void DC_StoreRange(register void *startAddr, register u32 nBytes);
+void DC_FlushRange(register const void *startAddr, register u32 nBytes);
+void DC_WaitWriteBufferEmpty(void);
+void IC_InvalidateAll(void);
+void IC_InvalidateRange(register void *startAddr, register u32 nBytes);
+
+#endif //POKEDIAMOND_OS_CACHE_H

arm9/lib/src/OS_cache.c

@@ -0,0 +1,126 @@
+#include "OS_cache.h"
+#include "nitro/types.h"
+#include "function_target.h"
+
+ARM_FUNC asm void DC_InvalidateAll(void)
+{
+    mov r0, #0
+    mcr p15, 0, r0, c7, c6, 0 //Invalidate Entire Data Cache
+    bx lr
+}
+
+ARM_FUNC asm void DC_StoreAll(void)
+{
+    mov r1, #0
+
+_020CC0C8:
+    mov r0, #0
+
+_020CC0CC:
+    orr r2, r1, r0
+    mcr p15, 0, r2, c7, c10, 2 //Clean Data Cache Line Set/Index
+    add r0, r0, #32
+    cmp r0, #0x400
+    blt _020CC0CC
+
+    add r1, r1, #0x40000000
+    cmp r1, #0
+    bne _020CC0C8
+
+    bx lr
+}
+
+ARM_FUNC asm void DC_FlushAll(void)
+{
+    mov r12, #0
+    mov r1, #0
+
+_020CC0F8:
+    mov r0, #0
+
+_020CC0FC:
+    orr r2, r1, r0
+    mcr p15, 0, r12, c7, c10, 4 //Drain Write Buffer
+    mcr p15, 0, r2, c7, c14, 2 //Clean and Invalidate Data Cache Line Set/Index
+    add r0, r0, #32
+    cmp r0, #0x400
+    blt _020CC0FC
+
+    add r1, r1, #0x40000000
+    cmp r1, #0
+    bne _020CC0F8
+
+    bx lr
+}
+
+ARM_FUNC asm void DC_InvalidateRange(register void *startAddr, register u32 nBytes)
+{
+    add r1, r1, r0
+    bic r0, r0, #31
+
+_020CC12C:
+    mcr p15, 0, r0, c7, c6, 1 //Invalidated Data Cache Line Virtual Address
+    add r0, r0, #32
+    cmp r0, r1
+    blt _020CC12C
+
+    bx lr
+}
+
+ARM_FUNC asm void DC_StoreRange(register void *startAddr, register u32 nBytes)
+{
+    add r1, r1, r0
+    bic r0, r0, #31
+
+_020CC148:
+    mcr p15, 0, r0, c7, c10, 1 //Clean Data Cache Line Virtual Address
+    add r0, r0, #32
+    cmp r0, r1
+    blt _020CC148
+
+    bx lr
+}
+
+ARM_FUNC asm void DC_FlushRange(register const void *startAddr, register u32 nBytes)
+{
+    mov r12, #0
+    add r1, r1, r0
+    bic r0, r0, #31
+
+_020CC168:
+    mcr p15, 0, r12, c7, c10, 4 //Drain Write Buffer
+    mcr p15, 0, r0, c7, c14, 1 //Clean and Invalidate Data Cache Line Virtual Address
+    add r0, r0, #32
+    cmp r0, r1
+    blt _020CC168
+
+    bx lr
+}
+
+ARM_FUNC asm void DC_WaitWriteBufferEmpty(void)
+{
+    mov r0, #0
+    mcr p15, 0, r0, c7, c10, 4 //Drain Write Buffer
+    bx lr
+}
+
+ARM_FUNC asm void IC_InvalidateAll(void)
+{
+    mov r0, #0
+    mcr p15, 0, r0, c7, c5, 0 //Invalidate Entire Instruction Cache
+    bx lr
+}
+
+ARM_FUNC asm void IC_InvalidateRange(register void *startAddr, register u32 nBytes)
+{
+    add r1, r1, r0
+    bic r0, r0, #31
+
+_020CC1A0:
+    mcr p15, 0, r0, c7, c5, 1 //Invalidate Instruction Cache Line Virtual Address
+    add r0, r0, #32
+    cmp r0, r1
+    blt _020CC1A0
+
+    bx lr
+}

arm9/lib/src/OS_protectionRegion.c

@@ -1,27 +1,23 @@
-//
-// Created by red031000 on 2020-04-24.
-//
-
 #include "function_target.h"
 #include "OS_protectionRegion.h"
 
 ARM_FUNC asm void OS_SetDPermissionsForProtectionRegion(register u32 setMask, register u32 flags)
 {
-    mrc p15, 0x0, r2, c5, c0, 0x2
+    mrc p15, 0x0, r2, c5, c0, 0x2 //Extended Access Permission Data Protection Region
     bic r2, r2, r0
     orr r2, r2, r1
-    mcr p15, 0x0, r2, c5, c0, 0x2
+    mcr p15, 0x0, r2, c5, c0, 0x2 //Extended Access Permission Data Protection Region
     bx lr
 }
 
 ARM_FUNC asm void OS_SetProtectionRegion1(u32 param)
 {
-    mcr p15, 0x0, r0, c6, c1, 0x0
+    mcr p15, 0x0, r0, c6, c1, 0x0 //Protection Unit Data Region 1
     bx lr
 }
 
 ARM_FUNC asm void OS_SetProtectionRegion2(u32 param)
 {
-    mcr p15, 0x0, r0, c6, c2, 0x0
+    mcr p15, 0x0, r0, c6, c2, 0x0 //Protection Unit Data Region 2
     bx lr
 }

arm9/lib/src/OS_protectionUnit.c

@@ -1,22 +1,18 @@
-//
-// Created by red031000 on 2020-05-24.
-//
-
 #include "function_target.h"
 #include "OS_protectionUnit.h"
 
 ARM_FUNC asm void OS_EnableProtectionUnit(void)
 {
-    mrc p15, 0x0, r0, c1, c0, 0x0
+    mrc p15, 0x0, r0, c1, c0, 0x0 //Control Register
     orr r0, r0, #0x1
-    mcr p15, 0x0, r0, c1, c0, 0x0
+    mcr p15, 0x0, r0, c1, c0, 0x0 //Control Register
     bx lr
 }
 
 ARM_FUNC asm void OS_DisableProtectionUnit(void)
 {
-    mrc p15, 0x0, r0, c1, c0, 0x0
+    mrc p15, 0x0, r0, c1, c0, 0x0 //Control Register
     bic r0, r0, #0x1
-    mcr p15, 0x0, r0, c1, c0, 0x0
+    mcr p15, 0x0, r0, c1, c0, 0x0 //Control Register
     bx lr
 }

arm9/lib/src/OS_reset.c

@@ -5,6 +5,7 @@
 #include "OS_interrupt.h"
 #include "OS_system.h"
 #include "OS_spinLock.h"
+#include "OS_cache.h"
 #include "sections.h"
 
 static u16 OSi_IsInitReset = 0;
@@ -16,10 +17,6 @@ extern void PXI_SetFifoRecvCallback(u32 param1, void* callback);
 extern u32 PXI_SendWordByFifo(u32 param1, u32 data, u32 param2);
 extern void CARD_LockRom(u16 lockId);
 extern void MI_StopDma(u32 dma);
-extern void DC_StoreAll(void);
-extern void DC_InvalidateAll(void);
-extern void IC_InvalidateAll(void);
-extern void DC_WaitWriteBufferEmpty(void);
 
 ARM_FUNC void OS_InitReset(void) {
     if (OSi_IsInitReset) {

arm9/lib/src/OS_tcm.c

@@ -1,12 +1,8 @@
-//
-// Created by red031000 on 2020-05-05.
-//
-
 #include "OS_tcm.h"
 #include "function_target.h"
 
 ARM_FUNC asm u32 OS_GetDTCMAddress(void) {
-    mrc p15, 0x0, r0, c9, c1, 0x0
+    mrc p15, 0x0, r0, c9, c1, 0x0 //Data TCM Base
     ldr r1, =OSi_TCM_REGION_BASE_MASK
     and r0, r0, r1
     bx lr

arm9/lib/src/OS_terminate_proc.c

@@ -11,6 +11,6 @@ ARM_FUNC void OS_Terminate(void) {
 
 ARM_FUNC asm void OS_Halt(void) {
     mov r0, #0x0
-    mcr p15, 0x0, r0, c7, c0, 0x4
+    mcr p15, 0x0, r0, c7, c0, 0x4 //Wait For Interrupt (Halt)
     bx lr
 }

arm9/lib/src/SND_command.c

@@ -1,6 +1,7 @@
 #include "SND_command.h"
 #include "SND_work.h"
 #include "OS_system.h"
+#include "OS_cache.h"
 
 #define SND_CMD_WAIT_QUEUE_COUNT 8
 
@@ -21,7 +22,6 @@ static struct SNDCommand *sFreeList;
 extern s32 PXI_SendWordByFifo(u32, u32, u32);
 extern void PXI_SetFifoRecvCallback(u32, void (*)(s32, s32));
 extern BOOL PXI_IsCallbackReady(u32, u32);
-extern void DC_FlushRange(void*, u32);
 
 static void InitPXI(void);
 static void RequestCommandProc(void);

arm9/lib/src/SND_work.c

@@ -1,12 +1,10 @@
 #include "SND_work.h"
 #include "SND_alarm.h"
 #include "SND_main.h"
+#include "OS_cache.h"
 
 struct SNDSharedWork *SNDi_SharedWork;
 
-void DC_InvalidateRange(void *mem, u32 size);
-void DC_FlushRange(void *mem, u32 size);
-
 u32 SND_GetPlayerStatus(void) {
     DC_InvalidateRange(&SNDi_SharedWork->playerStatus, 4);
     return SNDi_SharedWork->playerStatus;

files/poketool/icongra/poke_icon/.gitignore

@@ -0,0 +1,6 @@
+narc_0000.NCLR
+narc_0007.NCGR
+narc_0008.NCGR
+narc_0009.NCGR
+narc_0010.NCGR
+narc_0402.NCGR

files/poketool/icongra/poke_icon/narc_0000.pal

@@ -0,0 +1,259 @@
+JASC-PAL
+0100
+256
+74 156 57
+131 131 115
+189 189 189
+255 255 255
+189 164 65
+246 246 41
+213 98 65
+246 148 41
+139 123 255
+98 74 205
+238 115 156
+255 180 164
+164 197 255
+106 172 156
+98 98 90
+65 65 65
+90 139 205
+115 115 115
+189 189 189
+255 255 255
+123 156 74
+156 205 74
+148 246 74
+238 115 156
+246 148 246
+189 164 90
+246 230 41
+246 246 172
+213 213 106
+230 74 41
+98 98 90
+65 65 65
+98 156 131
+123 123 123
+189 189 180
+255 255 255
+115 115 205
+164 172 246
+180 131 90
+238 197 139
+197 172 41
+246 246 41
+246 98 82
+148 123 205
+197 164 205
+189 41 156
+98 98 90
+65 65 65
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

files/poketool/pokegra/pokegra/.gitignore

@@ -10,3 +10,15 @@ narc_0014.NCGR
 narc_0015.NCGR
 narc_0016.NCLR
 narc_0017.NCLR
+narc_0018.NCGR
+narc_0019.NCGR
+narc_0020.NCGR
+narc_0021.NCGR
+narc_0022.NCLR
+narc_0023.NCLR
+narc_2370.NCGR
+narc_2371.NCGR
+narc_2372.NCGR
+narc_2373.NCGR
+narc_2374.NCLR
+narc_2375.NCLR

files/poketool/pokegra/pokegra/narc_0022.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+205 205 172
+16 82 65
+32 139 115
+82 205 172
+131 238 222
+222 65 65
+255 131 115
+131 49 0
+189 106 49
+222 189 41
+255 238 82
+16 16 16
+57 139 41
+106 189 74
+148 238 148
+255 255 255

files/poketool/pokegra/pokegra/narc_0023.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+205 205 172
+57 90 32
+123 164 49
+164 213 74
+205 238 82
+230 139 0
+255 213 0
+131 74 0
+189 106 49
+222 213 41
+255 255 222
+16 16 16
+32 115 49
+82 164 41
+131 213 82
+255 255 255

files/poketool/pokegra/pokegra/narc_2374.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+139 205 131
+156 205 255
+115 164 238
+82 139 230
+74 115 172
+41 90 148
+16 57 115
+16 32 65
+255 230 131
+238 205 98
+189 139 106
+222 238 255
+189 205 222
+123 82 65
+16 16 16
+255 255 255

files/poketool/pokegra/pokegra/narc_2375.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+139 205 131
+180 246 238
+139 213 205
+98 189 172
+98 197 213
+32 115 123
+32 123 148
+8 82 98
+255 246 131
+230 222 90
+148 148 65
+222 238 255
+189 205 222
+115 115 57
+16 16 16
+255 255 255

filesystem.mk

@@ -2296,7 +2296,27 @@ files/poketool/pokegra/pokegra.narc: \
         files/poketool/pokegra/pokegra/narc_0014.NCGR \
         files/poketool/pokegra/pokegra/narc_0015.NCGR \
         files/poketool/pokegra/pokegra/narc_0016.NCLR \
-        files/poketool/pokegra/pokegra/narc_0017.NCLR
+        files/poketool/pokegra/pokegra/narc_0017.NCLR \
+        files/poketool/pokegra/pokegra/narc_0018.NCGR \
+        files/poketool/pokegra/pokegra/narc_0019.NCGR \
+        files/poketool/pokegra/pokegra/narc_0020.NCGR \
+        files/poketool/pokegra/pokegra/narc_0021.NCGR \
+        files/poketool/pokegra/pokegra/narc_0022.NCLR \
+        files/poketool/pokegra/pokegra/narc_0023.NCLR \
+        files/poketool/pokegra/pokegra/narc_2370.NCGR \
+        files/poketool/pokegra/pokegra/narc_2371.NCGR \
+        files/poketool/pokegra/pokegra/narc_2372.NCGR \
+        files/poketool/pokegra/pokegra/narc_2373.NCGR \
+        files/poketool/pokegra/pokegra/narc_2374.NCLR \
+        files/poketool/pokegra/pokegra/narc_2375.NCLR
+
+files/poketool/icongra/poke_icon.narc: \
+        files/poketool/icongra/poke_icon/narc_0000.NCLR \
+        files/poketool/icongra/poke_icon/narc_0007.NCGR \
+        files/poketool/icongra/poke_icon/narc_0008.NCGR \
+        files/poketool/icongra/poke_icon/narc_0009.NCGR \
+        files/poketool/icongra/poke_icon/narc_0010.NCGR \
+        files/poketool/icongra/poke_icon/narc_0402.NCGR
 
 .PHONY: filesystem
 

graphics_rules.mk

@@ -67,9 +67,15 @@ CLOBBER_SIZE_VERSION101_NCGR_FILES := files/graphic/bag_gra/narc_0002.NCGR \
                                       files/itemtool/itemdata/item_icon/narc_0140.NCGR \
                                       files/itemtool/itemdata/item_icon/narc_0142.NCGR \
                                       files/itemtool/itemdata/item_icon/narc_0144.NCGR \
-                                      files/itemtool/itemdata/item_icon/narc_0146.NCGR
+                                      files/itemtool/itemdata/item_icon/narc_0146.NCGR \
+                                      files/poketool/icongra/poke_icon/narc_0007.NCGR \
+                                      files/poketool/icongra/poke_icon/narc_0008.NCGR \
+                                      files/poketool/icongra/poke_icon/narc_0009.NCGR \
+                                      files/poketool/icongra/poke_icon/narc_0010.NCGR \
+                                      files/poketool/icongra/poke_icon/narc_0402.NCGR
 
-4BPP_NCLR_FILES := files/demo/title/titledemo/narc_0016.NCLR
+4BPP_NCLR_FILES := files/demo/title/titledemo/narc_0016.NCLR \
+                   files/poketool/icongra/poke_icon/narc_0000.NCLR
 
 IR_NCLR_FILES := files/itemtool/itemdata/item_icon/narc_0028.NCLR \
                  files/itemtool/itemdata/item_icon/narc_0029.NCLR \
@@ -121,7 +127,11 @@ VERSION101_SOPC_NCGR_FILES := files/demo/title/titledemo/narc_0007.NCGR \
 8BPP_COMP10_NOPAD_NCLR_PAL_FILES := files/poketool/pokegra/pokegra/narc_0010.NCLR \
                                     files/poketool/pokegra/pokegra/narc_0011.NCLR \
                                     files/poketool/pokegra/pokegra/narc_0016.NCLR \
-                                    files/poketool/pokegra/pokegra/narc_0017.NCLR
+                                    files/poketool/pokegra/pokegra/narc_0017.NCLR \
+                                    files/poketool/pokegra/pokegra/narc_0022.NCLR \
+                                    files/poketool/pokegra/pokegra/narc_0023.NCLR \
+                                    files/poketool/pokegra/pokegra/narc_2374.NCLR \
+                                    files/poketool/pokegra/pokegra/narc_2375.NCLR
 
 SCANNED_NCGR_FILES := files/poketool/pokegra/pokegra/narc_0006.NCGR \
                       files/poketool/pokegra/pokegra/narc_0007.NCGR \
@@ -131,6 +141,14 @@ SCANNED_NCGR_FILES := files/poketool/pokegra/pokegra/narc_0006.NCGR \
                       files/poketool/pokegra/pokegra/narc_0013.NCGR \
                       files/poketool/pokegra/pokegra/narc_0014.NCGR \
                       files/poketool/pokegra/pokegra/narc_0015.NCGR \
+                      files/poketool/pokegra/pokegra/narc_0018.NCGR \
+                      files/poketool/pokegra/pokegra/narc_0019.NCGR \
+                      files/poketool/pokegra/pokegra/narc_0020.NCGR \
+                      files/poketool/pokegra/pokegra/narc_0021.NCGR \
+                      files/poketool/pokegra/pokegra/narc_2370.NCGR \
+                      files/poketool/pokegra/pokegra/narc_2371.NCGR \
+                      files/poketool/pokegra/pokegra/narc_2372.NCGR \
+                      files/poketool/pokegra/pokegra/narc_2373.NCGR \
                       files/poketool/trgra/trbgra/narc_0000.NCGR \
                       files/poketool/trgra/trbgra/narc_0002.NCGR \
                       files/poketool/trgra/trbgra/narc_0004.NCGR \
@@ -210,6 +228,11 @@ NCGR_CLEAN_LIST := files/data/cell0.NCGR \
                    files/itemtool/itemdata/item_icon/narc_0142.NCGR \
                    files/itemtool/itemdata/item_icon/narc_0144.NCGR \
                    files/itemtool/itemdata/item_icon/narc_0146.NCGR \
+                   files/poketool/icongra/poke_icon/narc_0007.NCGR \
+                   files/poketool/icongra/poke_icon/narc_0008.NCGR \
+                   files/poketool/icongra/poke_icon/narc_0009.NCGR \
+                   files/poketool/icongra/poke_icon/narc_0010.NCGR \
+                   files/poketool/icongra/poke_icon/narc_0402.NCGR \
                    files/poketool/pokegra/pokegra/narc_0006.NCGR \
                    files/poketool/pokegra/pokegra/narc_0007.NCGR \
                    files/poketool/pokegra/pokegra/narc_0008.NCGR \
@@ -218,6 +241,14 @@ NCGR_CLEAN_LIST := files/data/cell0.NCGR \
                    files/poketool/pokegra/pokegra/narc_0013.NCGR \
                    files/poketool/pokegra/pokegra/narc_0014.NCGR \
                    files/poketool/pokegra/pokegra/narc_0015.NCGR \
+                   files/poketool/pokegra/pokegra/narc_0018.NCGR \
+                   files/poketool/pokegra/pokegra/narc_0019.NCGR \
+                   files/poketool/pokegra/pokegra/narc_0020.NCGR \
+                   files/poketool/pokegra/pokegra/narc_0021.NCGR \
+                   files/poketool/pokegra/pokegra/narc_2370.NCGR \
+                   files/poketool/pokegra/pokegra/narc_2371.NCGR \
+                   files/poketool/pokegra/pokegra/narc_2372.NCGR \
+                   files/poketool/pokegra/pokegra/narc_2373.NCGR \
                    files/poketool/trgra/trbgra/narc_0000.NCGR \
                    files/poketool/trgra/trbgra/narc_0002.NCGR \
                    files/poketool/trgra/trbgra/narc_0004.NCGR \
@@ -323,10 +354,15 @@ NCLR_CLEAN_LIST := files/data/cell0.NCLR \
                    files/itemtool/itemdata/item_icon/narc_0142.NCLR \
                    files/itemtool/itemdata/item_icon/narc_0144.NCLR \
                    files/itemtool/itemdata/item_icon/narc_0146.NCLR \
+                   files/poketool/icongra/poke_icon/narc_0000.NCLR \
                    files/poketool/pokegra/pokegra/narc_0010.NCLR \
                    files/poketool/pokegra/pokegra/narc_0011.NCLR \
                    files/poketool/pokegra/pokegra/narc_0016.NCLR \
                    files/poketool/pokegra/pokegra/narc_0017.NCLR \
+                   files/poketool/pokegra/pokegra/narc_0022.NCLR \
+                   files/poketool/pokegra/pokegra/narc_0023.NCLR \
+                   files/poketool/pokegra/pokegra/narc_2374.NCLR \
+                   files/poketool/pokegra/pokegra/narc_2375.NCLR \
                    files/poketool/trgra/trbgra/narc_0000.NCLR \
                    files/poketool/trgra/trbgra/narc_0002.NCLR \
                    files/poketool/trgra/trbgra/narc_0004.NCLR \