diff options
| author | Cleverking2003 <30466983+Cleverking2003@users.noreply.github.com> | 2020-07-02 22:44:49 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-02 22:44:49 +0300 |
| commit | 30694cdc38e8824d56f6e6b89da9753b01ccb17b (patch) | |
| tree | 6b3eba63186be3ad51f0a36ef15970282260a07c | |
| parent | 43866e9cb9e829f33a549b2d56cf3f70e1f98d52 (diff) | |
| parent | 99ada0fe1010c1530e4d799c4fdf264c9301d701 (diff) | |
Merge pull request #210 from PikalaxALT/pikalax_work
misc naming and cleanup
162 files changed, 449 insertions, 155 deletions
diff --git a/arm9/asm/unk_02023C40.s b/arm9/asm/unk_02023C40.s index 46a01c79..d4276bce 100644 --- a/arm9/asm/unk_02023C40.s +++ b/arm9/asm/unk_02023C40.s @@ -973,7 +973,7 @@ FUN_020242C8: ; 0x020242C8 add r6, r1, #0x0 add r5, r0, #0x0 add r0, r6, #0x0 - mov r1, #0x12 + mov r1, #0x12 ; BASE_GENDER_RATIO add r4, r2, #0x0 bl GetMonBaseStat cmp r0, #0xff diff --git a/arm9/asm/unk_0207C328.s b/arm9/asm/unk_0207C328.s index 486788c4..bf0bb784 100644 --- a/arm9/asm/unk_0207C328.s +++ b/arm9/asm/unk_0207C328.s @@ -1892,7 +1892,7 @@ _0207D00C: mov r0, #0x97 lsl r0, r0, #0x2 ldrh r0, [r4, r0] - mov r1, #0x1c + mov r1, #0x1c ; BASE_FLIP bl GetMonBaseStat add r2, r0, #0x0 ldr r0, _0207D068 ; =0x00000454 diff --git a/arm9/asm/unk_0207EF6C.s b/arm9/asm/unk_0207EF6C.s index 7050dea9..0ef763b0 100644 --- a/arm9/asm/unk_0207EF6C.s +++ b/arm9/asm/unk_0207EF6C.s @@ -1168,7 +1168,7 @@ _0207F876: mov r0, #0x97 lsl r0, r0, #0x2 ldrh r0, [r4, r0] - mov r1, #0x1c + mov r1, #0x1c ; BASE_FLIP bl GetMonBaseStat mov r1, #0x1 eor r0, r1 diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index 11800b6f..aa0610f2 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -44401,7 +44401,7 @@ MOD05_021ECF14: ; 0x021ECF14 add r6, r1, #0 add r5, r0, #0 add r0, r6, #0 - mov r1, #0x13 + mov r1, #0x13 ; BASE_EGG_CYCLES add r4, r3, #0 bl GetMonBaseStat add r1, sp, #0x10 @@ -44511,7 +44511,7 @@ MOD05_021ED00C: ; 0x021ED00C str r1, [sp, #0x10] add r7, r0, #0 ldr r0, [sp, #0x10] - mov r1, #0x13 + mov r1, #0x13 ; BASE_EGG_CYCLES add r5, r2, #0 add r6, r3, #0 bl GetMonBaseStat @@ -44782,11 +44782,11 @@ _021ED228: bl GetGenderBySpeciesAndPersonality stmia r7!, {r0} ldrh r0, [r4] - mov r1, #0x16 + mov r1, #0x16 ; BASE_EGG_GROUP_1 bl GetMonBaseStat strh r0, [r6] ldrh r0, [r4] - mov r1, #0x17 + mov r1, #0x17 ; GASE_EGG_GROUP_2 bl GetMonBaseStat strh r0, [r6, #2] ldr r0, [sp] diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index 81c8d551..b8101755 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -6631,7 +6631,7 @@ MOD06_0223C854: ; 0x0223C854 cmp r0, #0x38 bne _0223C8BE ldr r0, [sp, #0x10] - mov r1, #0x12 + mov r1, #0x12 ; BASE_GENDER_RATIO bl GetMonBaseStat cmp r0, #0 beq _0223C8E0 @@ -6753,7 +6753,7 @@ MOD06_0223C968: ; 0x0223C968 add r4, r0, #0 bl ZeroMonData add r0, r7, #0 - mov r1, #0x12 + mov r1, #0x12 ; BASE_GENDER_RATIO mov r6, #1 bl GetMonBaseStat cmp r0, #0 @@ -7384,13 +7384,13 @@ _0223CE6A: lsl r0, r5, #3 str r0, [sp, #0xc] ldr r0, [r6, r0] - mov r1, #6 + mov r1, #6 ; BASE_TYPE1 bl GetMonBaseStat lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp, #8] ldr r0, [sp, #0xc] - mov r1, #7 + mov r1, #7 ; BASE_TYPE2 ldr r0, [r6, r0] bl GetMonBaseStat lsl r0, r0, #0x18 @@ -22731,7 +22731,7 @@ _0224499C: mov r0, #0 strb r0, [r5, #0x1e] ldr r0, _02244A30 ; =gGameLanguage - mov r1, #0x19 + mov r1, #0x19 ; BASE_ABILITY_2 ldrb r0, [r0] strb r0, [r5, #0x1f] ldrh r0, [r5] @@ -22750,7 +22750,7 @@ _0224499C: b _022449F2 _022449CC: ldrh r0, [r5] - mov r1, #0x18 + mov r1, #0x18 ; BASE_ABILITY_1 lsl r0, r0, #0x15 lsr r0, r0, #0x15 bl GetMonBaseStat @@ -22760,7 +22760,7 @@ _022449CC: b _022449F2 _022449E0: ldrh r0, [r5] - mov r1, #0x18 + mov r1, #0x18 ; BASE_ABILITY_1 lsl r0, r0, #0x15 lsr r0, r0, #0x15 bl GetMonBaseStat @@ -23297,7 +23297,7 @@ MOD06_02244DC4: ; 0x02244DC4 lsl r0, r0, #2 str r1, [r7, r0] add r0, r4, #0 - mov r1, #0x12 + mov r1, #0x12 ; BASE_GENDER_RATIO bl GetMonBaseStat lsl r0, r0, #0x18 lsr r0, r0, #0x18 diff --git a/arm9/modules/11/asm/module_11.s b/arm9/modules/11/asm/module_11.s index 33ba2c25..7a18d017 100644 --- a/arm9/modules/11/asm/module_11.s +++ b/arm9/modules/11/asm/module_11.s @@ -12541,8 +12541,8 @@ _022338F0: _022338F4: .word 0x00002150 _022338F8: .word 0x0000214C - thumb_func_start MOD11_022338FC -MOD11_022338FC: ; 0x022338FC + thumb_func_start CalcExperienceGain +CalcExperienceGain: ; 0x022338FC push {r3, r4, r5, r6, r7, lr} sub sp, #8 add r5, r1, #0 @@ -12643,7 +12643,7 @@ _022339C6: mov r0, #0xb5 lsl r0, r0, #6 ldrh r0, [r1, r0] - mov r1, #9 + mov r1, #9 ; BASE_EXP_YIELD bl GetMonBaseStat lsl r0, r0, #0x10 lsr r1, r0, #0x10 @@ -20686,7 +20686,7 @@ _02237900: add r4, r0, #0 ldr r0, [sp, #4] add r1, r6, #0 - mov r2, #1 + mov r2, #1 ; BASE_ATK bl GetMonBaseStat_HandleFormeConversion ldr r1, _02237AB0 ; =0x00002144 ldr r2, _02237AB4 ; =0x00003044 @@ -20716,7 +20716,7 @@ _02237900: ldrh r0, [r2, r1] add r1, #0x26 ldrb r1, [r2, r1] - mov r2, #2 + mov r2, #2 ; BASE_DEF lsl r1, r1, #0x1b lsr r1, r1, #0x1b bl GetMonBaseStat_HandleFormeConversion @@ -28407,7 +28407,7 @@ _0223B634: bl MOD11_02254EA8 ldr r0, [r4] ldr r1, [r4, #4] - bl MOD11_0223BFD8 + bl CalcBallShakesOnMonCatch str r0, [r4, #0x38] cmp r0, #4 bge _0223B656 @@ -29507,8 +29507,8 @@ _0223BFD0: .align 2, 0 _0223BFD4: .word 0x0000241C - thumb_func_start MOD11_0223BFD8 -MOD11_0223BFD8: ; 0x0223BFD8 + thumb_func_start CalcBallShakesOnMonCatch +CalcBallShakesOnMonCatch: ; 0x0223BFD8 push {r3, r4, r5, r6, r7, lr} add r6, r0, #0 add r4, r1, #0 @@ -29532,7 +29532,7 @@ _0223BFEE: mov r0, #0xb5 lsl r0, r0, #6 ldrh r0, [r1, r0] - mov r1, #8 + mov r1, #8 ; BASE_CATCH_RATE bl GetMonBaseStat ldr r1, _0223C200 ; =0x0000311C ldr r2, _0223C204 ; =MOD11_0225DCF0 @@ -29541,7 +29541,7 @@ _0223BFEE: ldrb r2, [r2, r1] mul r2, r0 add r0, r2, #0 - ldr r2, _0223C208 ; =MOD11_0225DCF1 + ldr r2, _0223C208 ; =MOD11_0225DCF0 + 1 ldrb r1, [r2, r1] bl _u32_div_f str r0, [sp] @@ -29553,7 +29553,7 @@ _0223C026: mov r0, #0xb5 lsl r0, r0, #6 ldrh r0, [r1, r0] - mov r1, #8 + mov r1, #8 ; BASE_CATCH_RATE bl GetMonBaseStat str r0, [sp] _0223C03A: @@ -29795,7 +29795,7 @@ _0223C1FA: nop _0223C200: .word 0x0000311C _0223C204: .word MOD11_0225DCF0 -_0223C208: .word MOD11_0225DCF1 +_0223C208: .word MOD11_0225DCF0 + 1 _0223C20C: .word 0x00002D74 _0223C210: .word MOD11_0225DC28 _0223C214: .word 0x00002D90 @@ -72922,7 +72922,7 @@ MOD11_02250F94: ; 0x02250F94 bl MOD11_02243420 lsl r0, r0, #0x10 lsr r0, r0, #0x10 - mov r1, #0x1a + mov r1, #0x1a ; BASE_GREAT_MARSH_RATE bl GetMonBaseStat ldr r2, _0225100C ; =MOD11_0225E830 lsl r1, r5, #1 @@ -98802,13 +98802,19 @@ MOD11_0225DCD8: ; 0x0225DCD8 .global MOD11_0225DCF0 MOD11_0225DCF0: ; 0x0225DCF0 - .byte 0x0A - - .global MOD11_0225DCF1 -MOD11_0225DCF1: ; 0x0225DCF1 - .byte 0x28, 0x0A, 0x23, 0x0A, 0x1E, 0x0A, 0x19 - .byte 0x0A, 0x14, 0x0A, 0x0F, 0x0A, 0x0A, 0x0F, 0x0A, 0x14, 0x0A, 0x19, 0x0A, 0x1E, 0x0A, 0x23, 0x0A - .byte 0x28, 0x0A + .byte 10, 40 + .byte 10, 35 + .byte 10, 30 + .byte 10, 25 + .byte 10, 20 + .byte 10, 15 + .byte 10, 10 + .byte 15, 10 + .byte 20, 10 + .byte 25, 10 + .byte 30, 10 + .byte 35, 10 + .byte 40, 10 .global MOD11_0225DD0A MOD11_0225DD0A: ; 0x0225DD0A @@ -98854,7 +98860,7 @@ MOD11_0225DDE4: ; 0x0225DDE4 .word MOD11_022333D4, MOD11_02233408, MOD11_022334A8, MOD11_022334D4 .word MOD11_02233538, MOD11_02233598, MOD11_02233604, MOD11_0223363C .word MOD11_022336EC, MOD11_022337A4, MOD11_022337C0, MOD11_022337E0 - .word MOD11_0223380C, MOD11_022338A0, MOD11_022338FC, MOD11_02233A78 + .word MOD11_0223380C, MOD11_022338A0, CalcExperienceGain, MOD11_02233A78 .word MOD11_02233AB8, MOD11_02233AD0, MOD11_02233AE8, MOD11_02233BC0 .word MOD11_02233C94, MOD11_02233D34, MOD11_02233D7C, MOD11_02233DCC .word MOD11_02233DE4, MOD11_02233E54, MOD11_02233F48, MOD11_02234558 diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index 2f0cd49b..5cf8939b 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -21842,7 +21842,7 @@ _021E204A: lsl r0, r0, #0x10 lsr r1, r0, #0x10 add r0, r7, #0 - mov r2, #0x1b + mov r2, #0x1b ; BASE_COLOR bl GetMonBaseStat_HandleFormeConversion lsl r0, r0, #0x18 lsr r1, r0, #0x18 diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index dc26f8cb..d4e8ee86 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -30398,12 +30398,12 @@ MOD16_021E5554: ; 0x021E5554 str r0, [sp, #0x30] ldr r1, [sp, #0x30] add r0, r7, #0 - mov r2, #6 + mov r2, #6 ; BASE_TYPE1 bl GetMonBaseStat_HandleFormeConversion add r6, r0, #0 ldr r1, [sp, #0x30] add r0, r7, #0 - mov r2, #7 + mov r2, #7 ; BASE_TYPE2 bl GetMonBaseStat_HandleFormeConversion add r7, r0, #0 add r0, r6, #0 @@ -32777,7 +32777,7 @@ _021E66EC: MOD16_021E66F4: ; 0x021E66F4 push {r3, r4, r5, lr} add r4, r1, #0 - mov r1, #0x12 + mov r1, #0x12 ; BASE_GENDER_RATIO add r5, r0, #0 bl GetMonBaseStat cmp r0, #0 @@ -51966,13 +51966,13 @@ MOD16_021EF6E0: ; 0x021EF6E0 add r5, r0, #0 add r7, r1, #0 ldr r0, [sp, #0x60] - mov r1, #6 + mov r1, #6 ; BASE_TYPE1 str r2, [sp] str r3, [sp, #4] bl GetMonBaseStat add r4, r0, #0 ldr r0, [sp, #0x60] - mov r1, #7 + mov r1, #7 ; BASE_TYPE2 bl GetMonBaseStat add r6, r0, #0 add r0, r4, #0 @@ -55189,11 +55189,11 @@ _021F0F88: sub r3, #0x80 add r7, r5, r3 ldrh r0, [r7, r6] - mov r1, #0x18 + mov r1, #0x18 ; BASE_ABILITY_1 bl GetMonBaseStat add r4, r0, #0 ldrh r0, [r7, r6] - mov r1, #0x19 + mov r1, #0x19 ; BASE_ABILITY_2 bl GetMonBaseStat add r6, r0, #0 cmp r4, #0 @@ -55300,11 +55300,11 @@ _021F1046: mul r1, r0 ldrh r0, [r6, r1] str r1, [sp] - mov r1, #0x18 + mov r1, #0x18 ; BASE_ABILITY_1 bl GetMonBaseStat add r4, r0, #0 ldr r0, [sp] - mov r1, #0x19 + mov r1, #0x19 ; BASE_ABILITY_2 ldrh r0, [r6, r0] bl GetMonBaseStat cmp r4, #0 diff --git a/arm9/modules/28/asm/module_28.s b/arm9/modules/28/asm/module_28.s index beb0e25c..290e264f 100644 --- a/arm9/modules/28/asm/module_28.s +++ b/arm9/modules/28/asm/module_28.s @@ -759,7 +759,7 @@ _02254DDC: bl ErrorHandling _02254DE0: ldrh r0, [r4, #8] - mov r1, #0x1c + mov r1, #0x1c ; BASE_FLIP bl GetMonBaseStat mov r1, #0x59 lsl r1, r1, #2 diff --git a/arm9/modules/35/asm/module_35.s b/arm9/modules/35/asm/module_35.s index a07a6426..707bc4d9 100644 --- a/arm9/modules/35/asm/module_35.s +++ b/arm9/modules/35/asm/module_35.s @@ -924,7 +924,7 @@ _02254F00: cmp r0, #0 beq _02254F36 ldrh r0, [r6, #0x1c] - mov r1, #0x1c + mov r1, #0x1c ; BASE_FLIP bl GetMonBaseStat cmp r0, #0 ldr r0, [r7, #0x24] diff --git a/arm9/modules/39/asm/module_39.s b/arm9/modules/39/asm/module_39.s index ec2bff78..97390152 100644 --- a/arm9/modules/39/asm/module_39.s +++ b/arm9/modules/39/asm/module_39.s @@ -1007,7 +1007,7 @@ MOD39_02254FA4: ; 0x02254FA4 b _02254FCC _02254FBA: add r0, r7, #0 - mov r1, #0x1c + mov r1, #0x1c ; BASE_FLIP bl GetMonBaseStat cmp r0, #0 beq _02254FCA diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s index f6d62b38..2c54f2b5 100644 --- a/arm9/modules/65/asm/module_65.s +++ b/arm9/modules/65/asm/module_65.s @@ -3387,7 +3387,7 @@ MOD65_021D8F34: ; 0x021D8F34 add r1, #0x36 strb r0, [r1] ldrh r0, [r4, #0x34] - mov r1, #0x1c + mov r1, #0x1c ; BASE_FLIP bl GetMonBaseStat mov r1, #1 eor r1, r0 diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index 81137308..4c994929 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -1386,7 +1386,7 @@ MOD71_0222E118: ; 0x0222E118 ldrh r0, [r4] cmp r0, #0 beq _0222E18E - mov r1, #0x1c + mov r1, #0x1c ; BASE_FLIP bl GetMonBaseStat strh r0, [r4, #0xa] _0222E18E: diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index 257ac70a..d99385a4 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -6810,7 +6810,7 @@ _02230BD4: ldrsh r0, [r4, r0] cmp r0, #0 beq _02230C04 - mov r1, #0x12 + mov r1, #0x12 ; BASE_GENDER_RATIO bl GetMonBaseStat mov r1, #0xfe lsl r1, r1, #4 @@ -7820,7 +7820,7 @@ _0223138C: mov r3, #2 bl MOD80_02233EA4 add r0, r5, #0 - mov r1, #0x12 + mov r1, #0x12 ; BASE_GENDER_RATIO bl GetMonBaseStat mov r1, #0xfe lsl r1, r1, #4 @@ -12477,7 +12477,7 @@ _0223398C: ldr r0, _02233A5C ; =0x000005DC bl FUN_020054C8 add r0, r5, #0 - mov r1, #0x12 + mov r1, #0x12 ; BASE_GENDER_RATIO bl GetMonBaseStat mov r1, #0xfe lsl r1, r1, #4 diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index 4f7d4453..6ee359f9 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -198,7 +198,7 @@ MOD81_02237FE8: ; 0x02237FE8 mov r1, #5 mov r2, #0 bl GetBoxMonData - mov r1, #0x1c + mov r1, #0x1c ; BASE_FLIP bl GetMonBaseStat cmp r0, #0 bne _02238000 diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index d490ad35..bbde3e98 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -15391,7 +15391,7 @@ _02234E86: mul r1, r2 add r0, r0, r1 add r1, r6, #0 - bl MOD83_02237F6C + bl MigrateBoxMon ldr r0, [sp] add r1, r6, #0 add r2, r4, #0 @@ -15880,13 +15880,13 @@ MOD83_0223526C: ; 0x0223526C mov r0, #0x50 mul r0, r2 add r0, r1, r0 - ldr r3, _0223528C ; =MOD83_02237A10 + ldr r3, _0223528C ; =AGB_GetBoxMonData mov r1, #0xb mov r2, #0 bx r3 .align 2, 0 _02235288: .word 0x0000E880 -_0223528C: .word MOD83_02237A10 +_0223528C: .word AGB_GetBoxMonData thumb_func_end MOD83_0223526C thumb_func_start MOD83_02235290 @@ -15901,13 +15901,13 @@ MOD83_02235290: ; 0x02235290 mov r0, #0x50 mul r0, r2 add r0, r1, r0 - ldr r3, _022352B0 ; =MOD83_02237A10 + ldr r3, _022352B0 ; =AGB_GetBoxMonData mov r1, #0x2d mov r2, #0 bx r3 .align 2, 0 _022352AC: .word 0x0000E880 -_022352B0: .word MOD83_02237A10 +_022352B0: .word AGB_GetBoxMonData thumb_func_end MOD83_02235290 thumb_func_start MOD83_022352B4 @@ -15923,12 +15923,12 @@ MOD83_022352B4: ; 0x022352B4 mul r0, r2 add r0, r1, r0 mov r1, #0 - ldr r3, _022352D4 ; =MOD83_02237A10 + ldr r3, _022352D4 ; =AGB_GetBoxMonData add r2, r1, #0 bx r3 .align 2, 0 _022352D0: .word 0x0000E880 -_022352D4: .word MOD83_02237A10 +_022352D4: .word AGB_GetBoxMonData thumb_func_end MOD83_022352B4 thumb_func_start MOD83_022352D8 @@ -16244,7 +16244,7 @@ _02235512: add r0, r0, r7 mov r1, #5 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData cmp r0, #0 beq _022355D2 ldr r1, _02235638 ; =0x0000E884 @@ -16302,7 +16302,7 @@ _02235512: add r0, r0, r7 mov r1, #0xc mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData cmp r0, #0 beq _022355C4 mov r0, #0x6b @@ -16667,7 +16667,7 @@ MOD83_0223588C: ; 0x0223588C add r0, r2, r0 mov r1, #0x41 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData mov r1, #0x67 lsl r1, r1, #2 cmp r0, r1 @@ -16703,7 +16703,7 @@ _022358E2: add r0, r4, r6 add r1, #0xd add r2, r7, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData ldr r3, _02235914 ; =0x0223B2B8 add r2, r0, #0 mov r1, #0 @@ -16745,7 +16745,7 @@ MOD83_02235918: ; 0x02235918 add r0, r2, r0 mov r1, #0xc mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData ldr r1, _02235960 ; =0x0223B2C8 ldrh r1, [r1, #0x30] cmp r1, #0 @@ -16788,7 +16788,7 @@ MOD83_02235968: ; 0x02235968 add r0, r2, r0 mov r1, #0xb mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData bl MOD83_02234C74 pop {r3, pc} .align 2, 0 @@ -17123,7 +17123,7 @@ MOD83_02235BF4: ; 0x02235BF4 add r0, r6, #0 mov r1, #8 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData lsl r0, r0, #0x18 lsr r1, r0, #0x18 b _02235C1A @@ -17226,11 +17226,11 @@ _02235CCA: add r0, r4, #0 mov r1, #2 add r2, #2 - bl MOD83_02237A10 + bl AGB_GetBoxMonData add r0, r4, #0 mov r1, #3 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData add r3, r0, #0 add r0, sp, #0x1c add r0, #2 @@ -17263,7 +17263,7 @@ _02235CCA: add r0, r4, #0 mov r1, #0xb mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData bl MOD83_02237EBC str r0, [sp, #4] ldr r1, [sp, #4] @@ -17288,7 +17288,7 @@ _02235CCA: add r0, r4, #0 mov r1, #0xc mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData cmp r0, #0 beq _02235DAC lsl r0, r0, #0x10 @@ -18289,7 +18289,7 @@ _022365A6: add r0, r0, #4 add r0, r0, r7 add r0, r0, r5 - bl MOD83_02237A10 + bl AGB_GetBoxMonData cmp r0, #0 beq _022365C0 add r6, r6, #1 @@ -21094,8 +21094,8 @@ _022379FA: .align 2, 0 thumb_func_end MOD83_02237988 - thumb_func_start MOD83_02237A10 -MOD83_02237A10: ; 0x02237A10 + thumb_func_start AGB_GetBoxMonData +AGB_GetBoxMonData: ; 0x02237A10 push {r3, r4, r5, r6, r7, lr} sub sp, #0x10 mov r4, #0 @@ -21613,7 +21613,7 @@ _02237D88: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 - thumb_func_end MOD83_02237A10 + thumb_func_end AGB_GetBoxMonData thumb_func_start MOD83_02237D90 MOD83_02237D90: ; 0x02237D90 @@ -21800,13 +21800,13 @@ MOD83_02237EDC: ; 0x02237EDC add r5, r0, #0 mov r1, #0xb mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData bl MOD83_02237EBC add r4, r0, #0 add r0, r5, #0 mov r1, #0x19 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData add r1, r0, #0 lsl r0, r4, #0x10 lsr r0, r0, #0x10 @@ -21827,10 +21827,10 @@ MOD83_02237F04: ; 0x02237F04 add r0, r4, #0 mov r1, #0x2e mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData add r6, r0, #0 add r0, r5, #0 - mov r1, #0x19 + mov r1, #0x19 ; BASE_ABILITY_2 bl GetMonBaseStat cmp r0, #0 beq _02237F5E @@ -21841,7 +21841,7 @@ _02237F32: cmp r5, r1 bne _02237F42 add r0, r5, #0 - mov r1, #0x18 + mov r1, #0x18 ; BASE_ABILITY_1 bl GetMonBaseStat b _02237F4A _02237F42: @@ -21856,12 +21856,12 @@ _02237F4A: tst r1, r6 bne _02237F66 add r0, r5, #0 - mov r1, #0x18 + mov r1, #0x18 ; BASE_ABILITY_1 bl GetMonBaseStat pop {r4, r5, r6, pc} _02237F5E: add r0, r5, #0 - mov r1, #0x18 + mov r1, #0x18 ; BASE_ABILITY_1 bl GetMonBaseStat _02237F66: pop {r4, r5, r6, pc} @@ -21869,8 +21869,8 @@ _02237F66: _02237F68: .word MOD83_0223B4C0 thumb_func_end MOD83_02237F04 - thumb_func_start MOD83_02237F6C -MOD83_02237F6C: ; 0x02237F6C + thumb_func_start MigrateBoxMon +MigrateBoxMon: ; 0x02237F6C push {r3, r4, r5, r6, r7, lr} sub sp, #0x30 add r4, r1, #0 @@ -21883,7 +21883,7 @@ MOD83_02237F6C: ; 0x02237F6C str r0, [sp] add r0, r6, #0 add r2, r1, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0 @@ -21892,7 +21892,7 @@ MOD83_02237F6C: ; 0x02237F6C add r0, r6, #0 mov r1, #0xb mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] bl MOD83_02237EBC str r0, [sp, #8] @@ -21903,7 +21903,7 @@ MOD83_02237F6C: ; 0x02237F6C add r0, r6, #0 mov r1, #0xc mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] cmp r0, #0 beq _02237FCE @@ -21919,7 +21919,7 @@ _02237FCE: add r0, r6, #0 mov r1, #1 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #7 @@ -21928,7 +21928,7 @@ _02237FCE: add r0, r6, #0 mov r1, #0x19 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #8 @@ -21951,7 +21951,7 @@ _02237FCE: add r0, r6, #0 mov r1, #8 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0xb @@ -21960,7 +21960,7 @@ _02237FCE: add r0, r6, #0 mov r1, #3 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #4] add r0, r4, #0 mov r1, #0xc @@ -21969,7 +21969,7 @@ _02237FCE: add r0, r6, #0 mov r1, #0x1a mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0xd @@ -21978,7 +21978,7 @@ _02237FCE: add r0, r6, #0 mov r1, #0x1b mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0xe @@ -21987,7 +21987,7 @@ _02237FCE: add r0, r6, #0 mov r1, #0x1c mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0xf @@ -21996,7 +21996,7 @@ _02237FCE: add r0, r6, #0 mov r1, #0x1d mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x10 @@ -22005,7 +22005,7 @@ _02237FCE: add r0, r6, #0 mov r1, #0x1e mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x11 @@ -22014,7 +22014,7 @@ _02237FCE: add r0, r6, #0 mov r1, #0x1f mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x12 @@ -22023,7 +22023,7 @@ _02237FCE: add r0, r6, #0 mov r1, #0x16 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x13 @@ -22032,7 +22032,7 @@ _02237FCE: add r0, r6, #0 mov r1, #0x17 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x14 @@ -22041,7 +22041,7 @@ _02237FCE: add r0, r6, #0 mov r1, #0x18 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x15 @@ -22050,7 +22050,7 @@ _02237FCE: add r0, r6, #0 mov r1, #0x21 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x16 @@ -22059,7 +22059,7 @@ _02237FCE: add r0, r6, #0 mov r1, #0x2f mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x17 @@ -22068,7 +22068,7 @@ _02237FCE: add r0, r6, #0 mov r1, #0x30 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x18 @@ -22081,7 +22081,7 @@ _0223815E: add r0, r6, #0 add r1, #0xd mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData add r1, r5, #0 str r0, [sp, #8] add r0, r4, #0 @@ -22091,7 +22091,7 @@ _0223815E: add r0, r6, #0 mov r1, #0x15 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData mov r1, #3 lsl r1, r7 str r0, [sp, #8] @@ -22121,7 +22121,7 @@ _0223815E: add r0, r6, #0 mov r1, #0x27 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x46 @@ -22130,7 +22130,7 @@ _0223815E: add r0, r6, #0 mov r1, #0x28 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x47 @@ -22139,7 +22139,7 @@ _0223815E: add r0, r6, #0 mov r1, #0x29 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x48 @@ -22148,7 +22148,7 @@ _0223815E: add r0, r6, #0 mov r1, #0x2a mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x49 @@ -22157,7 +22157,7 @@ _0223815E: add r0, r6, #0 mov r1, #0x2b mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x4a @@ -22166,7 +22166,7 @@ _0223815E: add r0, r6, #0 mov r1, #0x2c mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x4b @@ -22175,7 +22175,7 @@ _0223815E: add r0, r6, #0 mov r1, #0x2d mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x4c @@ -22184,7 +22184,7 @@ _0223815E: add r0, r6, #0 mov r1, #0x32 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData add r7, r0, #0 cmp r7, #4 bgt _02238282 @@ -22206,7 +22206,7 @@ _02238282: add r0, r6, #0 mov r1, #0x33 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData add r7, r0, #0 cmp r7, #4 bgt _022382AE @@ -22228,7 +22228,7 @@ _022382AE: add r0, r6, #0 mov r1, #0x34 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData add r7, r0, #0 cmp r7, #4 bgt _022382DA @@ -22250,7 +22250,7 @@ _022382DA: add r0, r6, #0 mov r1, #0x35 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData add r7, r0, #0 cmp r7, #4 bgt _02238306 @@ -22272,7 +22272,7 @@ _02238306: add r0, r6, #0 mov r1, #0x36 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData add r7, r0, #0 cmp r7, #4 bgt _02238332 @@ -22294,7 +22294,7 @@ _02238332: add r0, r6, #0 mov r1, #0x43 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x62 @@ -22303,7 +22303,7 @@ _02238332: add r0, r6, #0 mov r1, #0x44 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x63 @@ -22312,7 +22312,7 @@ _02238332: add r0, r6, #0 mov r1, #0x45 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x64 @@ -22321,7 +22321,7 @@ _02238332: add r0, r6, #0 mov r1, #0x46 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x65 @@ -22330,7 +22330,7 @@ _02238332: add r0, r6, #0 mov r1, #0x47 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x66 @@ -22339,7 +22339,7 @@ _02238332: add r0, r6, #0 mov r1, #0x48 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x67 @@ -22348,7 +22348,7 @@ _02238332: add r0, r6, #0 mov r1, #0x49 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x68 @@ -22357,7 +22357,7 @@ _02238332: add r0, r6, #0 mov r1, #0x4a mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x69 @@ -22366,7 +22366,7 @@ _02238332: add r0, r6, #0 mov r1, #0x4b mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x6a @@ -22375,7 +22375,7 @@ _02238332: add r0, r6, #0 mov r1, #0x4c mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x6b @@ -22384,7 +22384,7 @@ _02238332: add r0, r6, #0 mov r1, #0x4d mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x6c @@ -22393,7 +22393,7 @@ _02238332: add r0, r6, #0 mov r1, #0x4e mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x6d @@ -22402,7 +22402,7 @@ _02238332: add r0, r6, #0 mov r1, #0x50 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x6e @@ -22424,7 +22424,7 @@ _02238332: mov r1, #0 add r0, r6, #0 add r2, r1, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData add r3, r0, #0 mov r7, #3 lsl r0, r7, #8 @@ -22498,7 +22498,7 @@ _022384FE: add r0, r6, #0 mov r1, #2 add r2, sp, #0x24 - bl MOD83_02237A10 + bl AGB_GetBoxMonData ldr r3, [sp, #4] add r0, sp, #0x24 add r1, sp, #0xc @@ -22511,7 +22511,7 @@ _022384FE: add r0, r6, #0 mov r1, #3 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData ldr r1, _022385F8 ; =gGameLanguage ldrb r1, [r1] cmp r1, r0 @@ -22526,7 +22526,7 @@ _0223853E: add r0, r6, #0 mov r1, #0x25 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x79 @@ -22535,7 +22535,7 @@ _0223853E: add r0, r6, #0 mov r1, #7 add r2, sp, #0x24 - bl MOD83_02237A10 + bl AGB_GetBoxMonData ldr r3, [sp, #4] add r0, sp, #0x24 add r1, sp, #0xc @@ -22548,7 +22548,7 @@ _0223853E: add r0, r6, #0 mov r1, #0x23 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x98 @@ -22557,7 +22557,7 @@ _0223853E: add r0, r6, #0 mov r1, #0x22 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x99 @@ -22566,7 +22566,7 @@ _0223853E: add r0, r6, #0 mov r1, #0x26 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x9a @@ -22575,7 +22575,7 @@ _0223853E: add r0, r6, #0 mov r1, #0x24 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x9b @@ -22584,7 +22584,7 @@ _0223853E: add r0, r6, #0 mov r1, #0x31 mov r2, #0 - bl MOD83_02237A10 + bl AGB_GetBoxMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x9c @@ -22599,7 +22599,7 @@ _0223853E: _022385F0: .word 0x00000182 _022385F4: .word gUnk021C4918 _022385F8: .word gGameLanguage - thumb_func_end MOD83_02237F6C + thumb_func_end MigrateBoxMon thumb_func_start MOD83_022385FC MOD83_022385FC: ; 0x022385FC diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c index 39739474..e56faac3 100644 --- a/arm9/src/pokemon.c +++ b/arm9/src/pokemon.c @@ -1870,16 +1870,16 @@ int GetPersonalAttr(struct BaseStats * baseStats, enum BaseStat attr) case BASE_FLIP: ret = baseStats->flip; break; - case BASE_UNKNOWN_29: + case BASE_TMHM_1: ret = (int)baseStats->unk1C; break; - case BASE_UNKNOWN_30: + case BASE_TMHM_2: ret = (int)baseStats->unk20; break; - case BASE_UNKNOWN_31: + case BASE_TMHM_3: ret = (int)baseStats->unk24; break; - case BASE_UNKNOWN_32: + case BASE_TMHM_4: ret = (int)baseStats->unk28; break; } @@ -3397,22 +3397,22 @@ BOOL FUN_0206A16C(u16 species, int forme, u32 a2) if (a2 < 32) { r4 = 1ul << a2; - r2 = BASE_UNKNOWN_29; + r2 = BASE_TMHM_1; } else if (a2 < 64) { r4 = 1ul << (a2 - 32); - r2 = BASE_UNKNOWN_30; + r2 = BASE_TMHM_2; } else if (a2 < 96) { r4 = 1ul << (a2 - 64); - r2 = BASE_UNKNOWN_31; + r2 = BASE_TMHM_3; } else { r4 = 1ul << (a2 - 96); - r2 = BASE_UNKNOWN_32; + r2 = BASE_TMHM_4; } return !!(GetMonBaseStat_HandleFormeConversion(species, forme, r2) & r4); } diff --git a/files/application/custom_ball/data/cb_data/.knarcignore b/files/application/custom_ball/data/cb_data/.knarcignore index bf482591..4a8f44ff 100644 --- a/files/application/custom_ball/data/cb_data/.knarcignore +++ b/files/application/custom_ball/data/cb_data/.knarcignore @@ -570,3 +570,5 @@ narc_0007.NANR narc_0167.NCER narc_0173.NCER narc_0198.NCGR +*.png +*.pal diff --git a/files/application/wifi_earth/wifi_earth/.knarcignore b/files/application/wifi_earth/wifi_earth/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/application/wifi_earth/wifi_earth/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/application/wifi_earth/wifi_earth_place/.knarcignore b/files/application/wifi_earth/wifi_earth_place/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/application/wifi_earth/wifi_earth_place/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/application/zukanlist/zkn_data/zukan_data/.knarcignore b/files/application/zukanlist/zkn_data/zukan_data/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/application/zukanlist/zkn_data/zukan_data/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/application/zukanlist/zkn_data/zukan_enc_diamond/.knarcignore b/files/application/zukanlist/zkn_data/zukan_enc_diamond/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/application/zukanlist/zkn_data/zukan_enc_diamond/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/application/zukanlist/zkn_data/zukan_enc_pearl/.knarcignore b/files/application/zukanlist/zkn_data/zukan_enc_pearl/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/application/zukanlist/zkn_data/zukan_enc_pearl/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/arc/bm_anime/.knarcignore b/files/arc/bm_anime/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/arc/bm_anime/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/arc/bm_anime_list/.knarcignore b/files/arc/bm_anime_list/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/arc/bm_anime_list/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/arc/encdata_ex/.knarcignore b/files/arc/encdata_ex/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/arc/encdata_ex/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/arc/ppark/.knarcignore b/files/arc/ppark/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/arc/ppark/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/arc/ship_demo/.knarcignore b/files/arc/ship_demo/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/arc/ship_demo/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/arc/tv/.knarcignore b/files/arc/tv/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/arc/tv/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/battle/b_tower/btdpm/.knarcignore b/files/battle/b_tower/btdpm/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/battle/b_tower/btdpm/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/battle/b_tower/btdtr/.knarcignore b/files/battle/b_tower/btdtr/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/battle/b_tower/btdtr/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/battle/graphic/b_bag_gra/.knarcignore b/files/battle/graphic/b_bag_gra/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/battle/graphic/b_bag_gra/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/battle/graphic/b_plist_gra/.knarcignore b/files/battle/graphic/b_plist_gra/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/battle/graphic/b_plist_gra/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/battle/graphic/batt_bg/.knarcignore b/files/battle/graphic/batt_bg/.knarcignore index 87e4761e..a731b78c 100644 --- a/files/battle/graphic/batt_bg/.knarcignore +++ b/files/battle/graphic/batt_bg/.knarcignore @@ -313,3 +313,5 @@ narc_0006.NCGR narc_0012.NCGR narc_0013.NCGR narc_0007.NCGR +*.png +*.pal diff --git a/files/battle/graphic/batt_obj/.knarcignore b/files/battle/graphic/batt_obj/.knarcignore index 602eb393..9cb3ee46 100644 --- a/files/battle/graphic/batt_obj/.knarcignore +++ b/files/battle/graphic/batt_obj/.knarcignore @@ -406,3 +406,5 @@ narc_0239.NCGR narc_0167.NCGR narc_0173.NCGR narc_0198.NCGR +*.png +*.pal diff --git a/files/battle/graphic/vs_demo_gra/.knarcignore b/files/battle/graphic/vs_demo_gra/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/battle/graphic/vs_demo_gra/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/battle/skill/be_seq/.knarcignore b/files/battle/skill/be_seq/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/battle/skill/be_seq/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/battle/skill/sub_seq/.knarcignore b/files/battle/skill/sub_seq/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/battle/skill/sub_seq/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/battle/skill/waza_seq/.knarcignore b/files/battle/skill/waza_seq/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/battle/skill/waza_seq/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/battle/tr_ai/tr_ai_seq/.knarcignore b/files/battle/tr_ai/tr_ai_seq/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/battle/tr_ai/tr_ai_seq/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/contest/data/contest_data/.knarcignore b/files/contest/data/contest_data/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/contest/data/contest_data/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/contest/graphic/contest_bg/.knarcignore b/files/contest/graphic/contest_bg/.knarcignore index 380ea82a..b0421812 100644 --- a/files/contest/graphic/contest_bg/.knarcignore +++ b/files/contest/graphic/contest_bg/.knarcignore @@ -56,3 +56,5 @@ narc_0006.NSCR narc_0012.NSCR narc_0013.NCGR narc_0007.NSCR +*.png +*.pal diff --git a/files/contest/graphic/contest_obj/.knarcignore b/files/contest/graphic/contest_obj/.knarcignore index 50fc0652..dd534e57 100644 --- a/files/contest/graphic/contest_obj/.knarcignore +++ b/files/contest/graphic/contest_obj/.knarcignore @@ -168,3 +168,5 @@ narc_0039.NCGR narc_0038.NCER narc_0012.NANR narc_0013.NCER +*.png +*.pal diff --git a/files/data/demo_climax/.knarcignore b/files/data/demo_climax/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/data/demo_climax/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/data/field_cutin/.knarcignore b/files/data/field_cutin/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/data/field_cutin/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/data/mmodel/fldeff/.knarcignore b/files/data/mmodel/fldeff/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/data/mmodel/fldeff/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/data/mmodel/mmodel/.knarcignore b/files/data/mmodel/mmodel/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/data/mmodel/mmodel/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/data/namein/.knarcignore b/files/data/namein/.knarcignore index 782c2d28..9f6797b2 100644 --- a/files/data/namein/.knarcignore +++ b/files/data/namein/.knarcignore @@ -32,3 +32,5 @@ narc_0006.NSCR narc_0012.NCER narc_0013.NCER narc_0007.NSCR +*.png +*.pal diff --git a/files/data/slot/.knarcignore b/files/data/slot/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/data/slot/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/data/tradelist/.knarcignore b/files/data/tradelist/.knarcignore index 72292bfd..d1c850f5 100644 --- a/files/data/tradelist/.knarcignore +++ b/files/data/tradelist/.knarcignore @@ -22,3 +22,5 @@ narc_0010.NCGR narc_0006.NSCR narc_0012.NANR narc_0007.NCGR +*.png +*.pal diff --git a/files/data/trapmark/.knarcignore b/files/data/trapmark/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/data/trapmark/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/data/ug_anim/.knarcignore b/files/data/ug_anim/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/data/ug_anim/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/data/ug_fossil/.knarcignore b/files/data/ug_fossil/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/data/ug_fossil/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/data/ug_parts/.knarcignore b/files/data/ug_parts/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/data/ug_parts/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/data/ug_radar/.knarcignore b/files/data/ug_radar/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/data/ug_radar/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/data/ug_trap/.knarcignore b/files/data/ug_trap/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/data/ug_trap/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/data/ugeffect_obj_graphic/.knarcignore b/files/data/ugeffect_obj_graphic/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/data/ugeffect_obj_graphic/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/data/underg_radar/.knarcignore b/files/data/underg_radar/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/data/underg_radar/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/data/weather_sys/.knarcignore b/files/data/weather_sys/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/data/weather_sys/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/data/wifinote/.knarcignore b/files/data/wifinote/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/data/wifinote/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/data/wifip2pmatch/.knarcignore b/files/data/wifip2pmatch/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/data/wifip2pmatch/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/demo/egg/data/egg_data/.knarcignore b/files/demo/egg/data/egg_data/.knarcignore index a3432fd9..1238dd02 100644 --- a/files/demo/egg/data/egg_data/.knarcignore +++ b/files/demo/egg/data/egg_data/.knarcignore @@ -14,3 +14,5 @@ narc_0005.NANR narc_0004.NCGR narc_0006.NCER narc_0007.NCGR +*.png +*.pal diff --git a/files/demo/egg/data/particle/egg_demo_particle/.knarcignore b/files/demo/egg/data/particle/egg_demo_particle/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/demo/egg/data/particle/egg_demo_particle/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/demo/intro/intro/.knarcignore b/files/demo/intro/intro/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/demo/intro/intro/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/demo/intro/intro_tv/.knarcignore b/files/demo/intro/intro_tv/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/demo/intro/intro_tv/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/demo/shinka/data/particle/shinka_demo_particle/.knarcignore b/files/demo/shinka/data/particle/shinka_demo_particle/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/demo/shinka/data/particle/shinka_demo_particle/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/demo/syoujyou/syoujyou/.knarcignore b/files/demo/syoujyou/syoujyou/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/demo/syoujyou/syoujyou/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/demo/title/op_demo/.knarcignore b/files/demo/title/op_demo/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/demo/title/op_demo/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/demo/title/titledemo/.knarcignore b/files/demo/title/titledemo/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/demo/title/titledemo/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/fielddata/areadata/area_build_model/area_build/.knarcignore b/files/fielddata/areadata/area_build_model/area_build/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/fielddata/areadata/area_build_model/area_build/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/fielddata/areadata/area_build_model/areabm_texset/.knarcignore b/files/fielddata/areadata/area_build_model/areabm_texset/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/fielddata/areadata/area_build_model/areabm_texset/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/fielddata/areadata/area_data/.knarcignore b/files/fielddata/areadata/area_data/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/fielddata/areadata/area_data/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/fielddata/areadata/area_map_tex/map_tex_set/.knarcignore b/files/fielddata/areadata/area_map_tex/map_tex_set/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/fielddata/areadata/area_map_tex/map_tex_set/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/fielddata/areadata/area_move_model/move_model_list/.knarcignore b/files/fielddata/areadata/area_move_model/move_model_list/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/fielddata/areadata/area_move_model/move_model_list/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/fielddata/build_model/build_model/.knarcignore b/files/fielddata/build_model/build_model/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/fielddata/build_model/build_model/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/fielddata/encountdata/d_enc_data/.knarcignore b/files/fielddata/encountdata/d_enc_data/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/fielddata/encountdata/d_enc_data/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/fielddata/encountdata/p_enc_data/.knarcignore b/files/fielddata/encountdata/p_enc_data/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/fielddata/encountdata/p_enc_data/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/fielddata/eventdata/zone_event_release/.knarcignore b/files/fielddata/eventdata/zone_event_release/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/fielddata/eventdata/zone_event_release/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/fielddata/land_data/land_data_release/.knarcignore b/files/fielddata/land_data/land_data_release/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/fielddata/land_data/land_data_release/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/fielddata/mapmatrix/map_matrix/.knarcignore b/files/fielddata/mapmatrix/map_matrix/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/fielddata/mapmatrix/map_matrix/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/fielddata/mm_list/move_model_list/.knarcignore b/files/fielddata/mm_list/move_model_list/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/fielddata/mm_list/move_model_list/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/fielddata/pokemon_trade/fld_trade/.knarcignore b/files/fielddata/pokemon_trade/fld_trade/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/fielddata/pokemon_trade/fld_trade/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/fielddata/script/scr_seq_release/.knarcignore b/files/fielddata/script/scr_seq_release/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/fielddata/script/scr_seq_release/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/graphic/bag_gra/.knarcignore b/files/graphic/bag_gra/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/graphic/bag_gra/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/graphic/box/.knarcignore b/files/graphic/box/.knarcignore index 4a009957..e3c86f75 100644 --- a/files/graphic/box/.knarcignore +++ b/files/graphic/box/.knarcignore @@ -176,3 +176,5 @@ narc_0006.NSCR narc_0012.NCGR narc_0013.NCER narc_0007.NSCR +*.png +*.pal diff --git a/files/graphic/btower/.knarcignore b/files/graphic/btower/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/graphic/btower/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/graphic/config_gra/.knarcignore b/files/graphic/config_gra/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/graphic/config_gra/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/graphic/demo_trade/.knarcignore b/files/graphic/demo_trade/.knarcignore index ec69478b..d441a0dd 100644 --- a/files/graphic/demo_trade/.knarcignore +++ b/files/graphic/demo_trade/.knarcignore @@ -36,3 +36,5 @@ narc_0004.NSCR narc_0012.NANR narc_0013.NCGR narc_0007.NCER +*.png +*.pal diff --git a/files/graphic/dendou_demo/.knarcignore b/files/graphic/dendou_demo/.knarcignore index a55976eb..52feacb5 100644 --- a/files/graphic/dendou_demo/.knarcignore +++ b/files/graphic/dendou_demo/.knarcignore @@ -6,3 +6,5 @@ narc_0003.NCGR narc_0002.NSCR narc_0000.NSCR narc_0001.NSCR +*.png +*.pal diff --git a/files/graphic/dendou_pc/.knarcignore b/files/graphic/dendou_pc/.knarcignore index 0ad081da..27328f46 100644 --- a/files/graphic/dendou_pc/.knarcignore +++ b/files/graphic/dendou_pc/.knarcignore @@ -2,3 +2,5 @@ narc_0000.NSCR narc_0001.NCGR narc_0000.NSCR narc_0001.NCGR +*.png +*.pal diff --git a/files/graphic/ending/.knarcignore b/files/graphic/ending/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/graphic/ending/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/graphic/ev_pokeselect/.knarcignore b/files/graphic/ev_pokeselect/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/graphic/ev_pokeselect/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/graphic/f_note_gra/.knarcignore b/files/graphic/f_note_gra/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/graphic/f_note_gra/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/graphic/field_board/.knarcignore b/files/graphic/field_board/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/graphic/field_board/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/graphic/field_encounteffect/.knarcignore b/files/graphic/field_encounteffect/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/graphic/field_encounteffect/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/graphic/fld_comact/.knarcignore b/files/graphic/fld_comact/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/graphic/fld_comact/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/graphic/font/.knarcignore b/files/graphic/font/.knarcignore index ee641bb2..0c3c0013 100644 --- a/files/graphic/font/.knarcignore +++ b/files/graphic/font/.knarcignore @@ -1,2 +1,4 @@ narc_0004.NCGR narc_0004.NCGR +*.png +*.pal diff --git a/files/graphic/fontoam/.knarcignore b/files/graphic/fontoam/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/graphic/fontoam/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/graphic/hiden_effect/.knarcignore b/files/graphic/hiden_effect/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/graphic/hiden_effect/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/graphic/imageclip/.knarcignore b/files/graphic/imageclip/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/graphic/imageclip/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/graphic/mail_gra/.knarcignore b/files/graphic/mail_gra/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/graphic/mail_gra/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/graphic/menu_gra/.knarcignore b/files/graphic/menu_gra/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/graphic/menu_gra/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/graphic/mysign/.knarcignore b/files/graphic/mysign/.knarcignore index de3aebeb..c161407d 100644 --- a/files/graphic/mysign/.knarcignore +++ b/files/graphic/mysign/.knarcignore @@ -12,3 +12,5 @@ narc_0005.NSCR narc_0004.NCGR narc_0006.NSCR narc_0007.NCGR +*.png +*.pal diff --git a/files/graphic/mystery/.knarcignore b/files/graphic/mystery/.knarcignore index 0fa5c845..aed29ac0 100644 --- a/files/graphic/mystery/.knarcignore +++ b/files/graphic/mystery/.knarcignore @@ -56,3 +56,5 @@ narc_0010.NCGR narc_0038.NCER narc_0006.NCGR narc_0013.NANR +*.png +*.pal diff --git a/files/graphic/ntag_gra/.knarcignore b/files/graphic/ntag_gra/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/graphic/ntag_gra/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/graphic/nutmixer/.knarcignore b/files/graphic/nutmixer/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/graphic/nutmixer/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/graphic/oekaki/.knarcignore b/files/graphic/oekaki/.knarcignore index 93538eba..e0cbc929 100644 --- a/files/graphic/oekaki/.knarcignore +++ b/files/graphic/oekaki/.knarcignore @@ -12,3 +12,5 @@ narc_0005.NSCR narc_0004.NSCR narc_0006.NCGR narc_0007.NCER +*.png +*.pal diff --git a/files/graphic/opening/.knarcignore b/files/graphic/opening/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/graphic/opening/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/graphic/plist_gra/.knarcignore b/files/graphic/plist_gra/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/graphic/plist_gra/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/graphic/pmsi/.knarcignore b/files/graphic/pmsi/.knarcignore index 120200e9..d8f328ec 100644 --- a/files/graphic/pmsi/.knarcignore +++ b/files/graphic/pmsi/.knarcignore @@ -42,3 +42,5 @@ narc_0004.NSCR narc_0012.NSCR narc_0013.NSCR narc_0007.NCER +*.png +*.pal diff --git a/files/graphic/poketch/.knarcignore b/files/graphic/poketch/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/graphic/poketch/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/graphic/poru_gra/.knarcignore b/files/graphic/poru_gra/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/graphic/poru_gra/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/graphic/poruact/.knarcignore b/files/graphic/poruact/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/graphic/poruact/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/graphic/porudemo/.knarcignore b/files/graphic/porudemo/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/graphic/porudemo/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/graphic/pst_gra/.knarcignore b/files/graphic/pst_gra/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/graphic/pst_gra/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/graphic/ranking/.knarcignore b/files/graphic/ranking/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/graphic/ranking/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/graphic/record/.knarcignore b/files/graphic/record/.knarcignore index 95e7407e..fe0b830c 100644 --- a/files/graphic/record/.knarcignore +++ b/files/graphic/record/.knarcignore @@ -20,3 +20,5 @@ narc_0010.NCER narc_0006.NANR narc_0012.NCGR narc_0013.NCER +*.png +*.pal diff --git a/files/graphic/shop_gra/.knarcignore b/files/graphic/shop_gra/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/graphic/shop_gra/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/graphic/tmap_gra/.knarcignore b/files/graphic/tmap_gra/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/graphic/tmap_gra/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/graphic/touch_subwindow/.knarcignore b/files/graphic/touch_subwindow/.knarcignore index aa63e72d..45df3f8c 100644 --- a/files/graphic/touch_subwindow/.knarcignore +++ b/files/graphic/touch_subwindow/.knarcignore @@ -16,3 +16,5 @@ narc_0005.NSCR narc_0004.NSCR narc_0006.NSCR narc_0007.NSCR +*.png +*.pal diff --git a/files/graphic/trainer_case/.knarcignore b/files/graphic/trainer_case/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/graphic/trainer_case/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/graphic/unionroom/.knarcignore b/files/graphic/unionroom/.knarcignore index 9e57cd76..c815650b 100644 --- a/files/graphic/unionroom/.knarcignore +++ b/files/graphic/unionroom/.knarcignore @@ -10,3 +10,5 @@ narc_0005.NCGR narc_0004.NSCR narc_0006.NCER narc_0007.NANR +*.png +*.pal diff --git a/files/graphic/waza_oshie_gra/.knarcignore b/files/graphic/waza_oshie_gra/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/graphic/waza_oshie_gra/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/graphic/winframe/.knarcignore b/files/graphic/winframe/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/graphic/winframe/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/graphic/worldtrade/.knarcignore b/files/graphic/worldtrade/.knarcignore index 9d3dc3cd..1463b542 100644 --- a/files/graphic/worldtrade/.knarcignore +++ b/files/graphic/worldtrade/.knarcignore @@ -54,3 +54,5 @@ narc_0011.NCGR narc_0010.NCGR narc_0012.NCGR narc_0013.NCGR +*.png +*.pal diff --git a/files/itemtool/itemdata/item_data/.knarcignore b/files/itemtool/itemdata/item_data/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/itemtool/itemdata/item_data/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/itemtool/itemdata/item_icon/.knarcignore b/files/itemtool/itemdata/item_icon/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/itemtool/itemdata/item_icon/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/itemtool/itemdata/nuts_data/.knarcignore b/files/itemtool/itemdata/nuts_data/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/itemtool/itemdata/nuts_data/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/msgdata/msg/.knarcignore b/files/msgdata/msg/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/msgdata/msg/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/msgdata/scenario/scr_msg/.knarcignore b/files/msgdata/scenario/scr_msg/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/msgdata/scenario/scr_msg/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/particledata/particledata/.knarcignore b/files/particledata/particledata/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/particledata/particledata/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/pokeanime/poke_anm/.knarcignore b/files/pokeanime/poke_anm/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/pokeanime/poke_anm/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/poketool/icongra/poke_icon/.knarcignore b/files/poketool/icongra/poke_icon/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/poketool/icongra/poke_icon/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/poketool/pokeanm/pokeanm/.knarcignore b/files/poketool/pokeanm/pokeanm/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/poketool/pokeanm/pokeanm/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/poketool/pokefoot/pokefoot/.knarcignore b/files/poketool/pokefoot/pokefoot/.knarcignore index 6a00562b..d04cbe37 100644 --- a/files/poketool/pokefoot/pokefoot/.knarcignore +++ b/files/poketool/pokefoot/pokefoot/.knarcignore @@ -990,3 +990,5 @@ narc_0403.NCGR narc_0417.NCGR narc_0371.NCGR narc_0359.NCGR +*.png +*.pal diff --git a/files/poketool/pokegra/height/.knarcignore b/files/poketool/pokegra/height/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/poketool/pokegra/height/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/poketool/pokegra/height_o/.knarcignore b/files/poketool/pokegra/height_o/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/poketool/pokegra/height_o/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/poketool/pokegra/otherpoke/.knarcignore b/files/poketool/pokegra/otherpoke/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/poketool/pokegra/otherpoke/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/poketool/pokegra/poke_shadow/.knarcignore b/files/poketool/pokegra/poke_shadow/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/poketool/pokegra/poke_shadow/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/poketool/pokegra/poke_shadow_ofx/.knarcignore b/files/poketool/pokegra/poke_shadow_ofx/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/poketool/pokegra/poke_shadow_ofx/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/poketool/pokegra/poke_yofs/.knarcignore b/files/poketool/pokegra/poke_yofs/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/poketool/pokegra/poke_yofs/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/poketool/pokegra/pokegra/.knarcignore b/files/poketool/pokegra/pokegra/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/poketool/pokegra/pokegra/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/poketool/pokezukan/.knarcignore b/files/poketool/pokezukan/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/poketool/pokezukan/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/poketool/shinzukan/.knarcignore b/files/poketool/shinzukan/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/poketool/shinzukan/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/poketool/trainer/trdata/.knarcignore b/files/poketool/trainer/trdata/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/poketool/trainer/trdata/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/poketool/trainer/trpoke/.knarcignore b/files/poketool/trainer/trpoke/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/poketool/trainer/trpoke/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/poketool/trgra/trbgra/.knarcignore b/files/poketool/trgra/trbgra/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/poketool/trgra/trbgra/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/poketool/trgra/trfgra/.knarcignore b/files/poketool/trgra/trfgra/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/poketool/trgra/trfgra/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/poketool/trmsg/trtbl/.knarcignore b/files/poketool/trmsg/trtbl/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/poketool/trmsg/trtbl/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/poketool/trmsg/trtblofs/.knarcignore b/files/poketool/trmsg/trtblofs/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/poketool/trmsg/trtblofs/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/poketool/waza/waza_tbl/.knarcignore b/files/poketool/waza/waza_tbl/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/poketool/waza/waza_tbl/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/resource/eng/trial/trial/.knarcignore b/files/resource/eng/trial/trial/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/resource/eng/trial/trial/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/resource/eng/zukan/zukan/.knarcignore b/files/resource/eng/zukan/zukan/.knarcignore index e917dae9..fefaf0f6 100644 --- a/files/resource/eng/zukan/zukan/.knarcignore +++ b/files/resource/eng/zukan/zukan/.knarcignore @@ -204,3 +204,5 @@ narc_0028.NCGR narc_0029.NCGR narc_0039.NSCR narc_0038.NSCR +*.png +*.pal diff --git a/files/wazaeffect/effectclact/wecell/.knarcignore b/files/wazaeffect/effectclact/wecell/.knarcignore index 4c5250e1..0587bc3d 100644 --- a/files/wazaeffect/effectclact/wecell/.knarcignore +++ b/files/wazaeffect/effectclact/wecell/.knarcignore @@ -72,3 +72,5 @@ narc_0006.NCER narc_0012.NCER narc_0013.NCER narc_0007.NCER +*.png +*.pal diff --git a/files/wazaeffect/effectclact/wecellanm/.knarcignore b/files/wazaeffect/effectclact/wecellanm/.knarcignore index 0c1eca71..ea953534 100644 --- a/files/wazaeffect/effectclact/wecellanm/.knarcignore +++ b/files/wazaeffect/effectclact/wecellanm/.knarcignore @@ -72,3 +72,5 @@ narc_0006.NANR narc_0012.NANR narc_0013.NANR narc_0007.NANR +*.png +*.pal diff --git a/files/wazaeffect/effectclact/wechar/.knarcignore b/files/wazaeffect/effectclact/wechar/.knarcignore index 6f78fd1b..c90d0ac8 100644 --- a/files/wazaeffect/effectclact/wechar/.knarcignore +++ b/files/wazaeffect/effectclact/wechar/.knarcignore @@ -72,3 +72,5 @@ narc_0006.NCGR narc_0012.NCGR narc_0013.NCGR narc_0007.NCGR +*.png +*.pal diff --git a/files/wazaeffect/effectclact/wepltt/.knarcignore b/files/wazaeffect/effectclact/wepltt/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/wazaeffect/effectclact/wepltt/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/wazaeffect/effectdata/ball_particle/.knarcignore b/files/wazaeffect/effectdata/ball_particle/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/wazaeffect/effectdata/ball_particle/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/wazaeffect/effectdata/waza_particle/.knarcignore b/files/wazaeffect/effectdata/waza_particle/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/wazaeffect/effectdata/waza_particle/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/wazaeffect/pt_debug/debug_particle/.knarcignore b/files/wazaeffect/pt_debug/debug_particle/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/wazaeffect/pt_debug/debug_particle/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/files/wazaeffect/we_sub/.knarcignore b/files/wazaeffect/we_sub/.knarcignore new file mode 100644 index 00000000..2856080a --- /dev/null +++ b/files/wazaeffect/we_sub/.knarcignore @@ -0,0 +1,2 @@ +*.png +*.pal diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 0f9ba25c..c83847c6 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -316,10 +316,10 @@ enum BaseStat { BASE_GREAT_MARSH_RATE, BASE_COLOR, BASE_FLIP, - BASE_UNKNOWN_29, - BASE_UNKNOWN_30, - BASE_UNKNOWN_31, - BASE_UNKNOWN_32, + BASE_TMHM_1, + BASE_TMHM_2, + BASE_TMHM_3, + BASE_TMHM_4, }; typedef enum { |