Fix forms for Gen 4 stuff & add Spiky-eared Pichu form

Methylnaltrexone · Nov 2, 2018 · ae53aae · ae53aae
1 parent 7896f6f
commit ae53aae
Show file tree

Hide file tree

Showing 5 changed files with 207 additions and 174 deletions.
diff --git a/assets/romfs/gfx/types_spritesheet.t3x b/assets/romfs/gfx/types_spritesheet.t3x
diff --git a/include/gui/types_spritesheet.h b/include/gui/types_spritesheet.h
@@ -220,175 +220,176 @@
 #define types_spritesheet_142_1_idx 216
 #define types_spritesheet_150_1_idx 217
 #define types_spritesheet_150_2_idx 218
-#define types_spritesheet_181_1_idx 219
-#define types_spritesheet_208_1_idx 220
-#define types_spritesheet_212_1_idx 221
-#define types_spritesheet_214_1_idx 222
-#define types_spritesheet_229_1_idx 223
-#define types_spritesheet_248_1_idx 224
-#define types_spritesheet_254_1_idx 225
-#define types_spritesheet_257_1_idx 226
-#define types_spritesheet_260_1_idx 227
-#define types_spritesheet_282_1_idx 228
-#define types_spritesheet_302_1_idx 229
-#define types_spritesheet_303_1_idx 230
-#define types_spritesheet_306_1_idx 231
-#define types_spritesheet_308_1_idx 232
-#define types_spritesheet_310_1_idx 233
-#define types_spritesheet_319_1_idx 234
-#define types_spritesheet_323_1_idx 235
-#define types_spritesheet_334_1_idx 236
-#define types_spritesheet_351_1_idx 237
-#define types_spritesheet_351_2_idx 238
-#define types_spritesheet_351_3_idx 239
-#define types_spritesheet_354_1_idx 240
-#define types_spritesheet_359_1_idx 241
-#define types_spritesheet_362_1_idx 242
-#define types_spritesheet_373_1_idx 243
-#define types_spritesheet_376_1_idx 244
-#define types_spritesheet_380_1_idx 245
-#define types_spritesheet_381_1_idx 246
-#define types_spritesheet_382_1_idx 247
-#define types_spritesheet_383_1_idx 248
-#define types_spritesheet_384_1_idx 249
-#define types_spritesheet_386_1_idx 250
-#define types_spritesheet_386_2_idx 251
-#define types_spritesheet_386_3_idx 252
-#define types_spritesheet_413_1_idx 253
-#define types_spritesheet_413_2_idx 254
-#define types_spritesheet_421_1_idx 255
-#define types_spritesheet_422_1_idx 256
-#define types_spritesheet_423_1_idx 257
-#define types_spritesheet_428_1_idx 258
-#define types_spritesheet_445_1_idx 259
-#define types_spritesheet_448_1_idx 260
-#define types_spritesheet_460_1_idx 261
-#define types_spritesheet_475_1_idx 262
-#define types_spritesheet_479_1_idx 263
-#define types_spritesheet_479_2_idx 264
-#define types_spritesheet_479_3_idx 265
-#define types_spritesheet_479_4_idx 266
-#define types_spritesheet_479_5_idx 267
-#define types_spritesheet_487_1_idx 268
-#define types_spritesheet_492_1_idx 269
-#define types_spritesheet_531_1_idx 270
-#define types_spritesheet_550_1_idx 271
-#define types_spritesheet_555_1_idx 272
-#define types_spritesheet_585_1_idx 273
-#define types_spritesheet_585_2_idx 274
-#define types_spritesheet_585_3_idx 275
-#define types_spritesheet_586_1_idx 276
-#define types_spritesheet_586_2_idx 277
-#define types_spritesheet_586_3_idx 278
-#define types_spritesheet_641_1_idx 279
-#define types_spritesheet_642_1_idx 280
-#define types_spritesheet_645_1_idx 281
-#define types_spritesheet_646_1_idx 282
-#define types_spritesheet_646_2_idx 283
-#define types_spritesheet_647_1_idx 284
-#define types_spritesheet_648_1_idx 285
-#define types_spritesheet_658_1_idx 286
-#define types_spritesheet_658_2_idx 287
-#define types_spritesheet_666_1_idx 288
-#define types_spritesheet_666_2_idx 289
-#define types_spritesheet_666_3_idx 290
-#define types_spritesheet_666_4_idx 291
-#define types_spritesheet_666_5_idx 292
-#define types_spritesheet_666_6_idx 293
-#define types_spritesheet_666_7_idx 294
-#define types_spritesheet_666_8_idx 295
-#define types_spritesheet_666_9_idx 296
-#define types_spritesheet_666_10_idx 297
-#define types_spritesheet_666_11_idx 298
-#define types_spritesheet_666_12_idx 299
-#define types_spritesheet_666_13_idx 300
-#define types_spritesheet_666_14_idx 301
-#define types_spritesheet_666_15_idx 302
-#define types_spritesheet_666_16_idx 303
-#define types_spritesheet_666_17_idx 304
-#define types_spritesheet_666_18_idx 305
-#define types_spritesheet_666_19_idx 306
-#define types_spritesheet_669_1_idx 307
-#define types_spritesheet_669_2_idx 308
-#define types_spritesheet_669_3_idx 309
-#define types_spritesheet_669_4_idx 310
-#define types_spritesheet_670_1_idx 311
-#define types_spritesheet_670_2_idx 312
-#define types_spritesheet_670_3_idx 313
-#define types_spritesheet_670_4_idx 314
-#define types_spritesheet_670_5_idx 315
-#define types_spritesheet_671_1_idx 316
-#define types_spritesheet_671_2_idx 317
-#define types_spritesheet_671_3_idx 318
-#define types_spritesheet_671_4_idx 319
-#define types_spritesheet_676_1_idx 320
-#define types_spritesheet_676_2_idx 321
-#define types_spritesheet_676_3_idx 322
-#define types_spritesheet_676_4_idx 323
-#define types_spritesheet_676_5_idx 324
-#define types_spritesheet_676_6_idx 325
-#define types_spritesheet_676_7_idx 326
-#define types_spritesheet_676_8_idx 327
-#define types_spritesheet_676_9_idx 328
-#define types_spritesheet_678_1_idx 329
-#define types_spritesheet_681_1_idx 330
-#define types_spritesheet_718_1_idx 331
-#define types_spritesheet_718_2_idx 332
-#define types_spritesheet_718_3_idx 333
-#define types_spritesheet_718_4_idx 334
-#define types_spritesheet_719_1_idx 335
-#define types_spritesheet_720_1_idx 336
-#define types_spritesheet_735_1_idx 337
-#define types_spritesheet_738_1_idx 338
-#define types_spritesheet_741_1_idx 339
-#define types_spritesheet_741_2_idx 340
-#define types_spritesheet_741_3_idx 341
-#define types_spritesheet_743_1_idx 342
-#define types_spritesheet_744_1_idx 343
-#define types_spritesheet_745_1_idx 344
-#define types_spritesheet_745_2_idx 345
-#define types_spritesheet_746_1_idx 346
-#define types_spritesheet_752_1_idx 347
-#define types_spritesheet_754_1_idx 348
-#define types_spritesheet_758_1_idx 349
-#define types_spritesheet_774_7_idx 350
-#define types_spritesheet_774_8_idx 351
-#define types_spritesheet_774_9_idx 352
-#define types_spritesheet_774_10_idx 353
-#define types_spritesheet_774_11_idx 354
-#define types_spritesheet_774_12_idx 355
-#define types_spritesheet_774_13_idx 356
-#define types_spritesheet_777_1_idx 357
-#define types_spritesheet_778_2_idx 358
-#define types_spritesheet_784_1_idx 359
-#define types_spritesheet_800_1_idx 360
-#define types_spritesheet_800_2_idx 361
-#define types_spritesheet_800_3_idx 362
-#define types_spritesheet_801_1_idx 363
-#define types_spritesheet_201_1_idx 364
-#define types_spritesheet_201_2_idx 365
-#define types_spritesheet_201_3_idx 366
-#define types_spritesheet_201_4_idx 367
-#define types_spritesheet_201_5_idx 368
-#define types_spritesheet_201_6_idx 369
-#define types_spritesheet_201_7_idx 370
-#define types_spritesheet_201_8_idx 371
-#define types_spritesheet_201_9_idx 372
-#define types_spritesheet_201_10_idx 373
-#define types_spritesheet_201_11_idx 374
-#define types_spritesheet_201_12_idx 375
-#define types_spritesheet_201_13_idx 376
-#define types_spritesheet_201_14_idx 377
-#define types_spritesheet_201_15_idx 378
-#define types_spritesheet_201_16_idx 379
-#define types_spritesheet_201_17_idx 380
-#define types_spritesheet_201_18_idx 381
-#define types_spritesheet_201_19_idx 382
-#define types_spritesheet_201_20_idx 383
-#define types_spritesheet_201_21_idx 384
-#define types_spritesheet_201_22_idx 385
-#define types_spritesheet_201_23_idx 386
-#define types_spritesheet_201_24_idx 387
-#define types_spritesheet_201_25_idx 388
-#define types_spritesheet_201_26_idx 389
-#define types_spritesheet_201_27_idx 390
+#define types_spritesheet_172_1_idx 219
+#define types_spritesheet_181_1_idx 220
+#define types_spritesheet_208_1_idx 221
+#define types_spritesheet_212_1_idx 222
+#define types_spritesheet_214_1_idx 223
+#define types_spritesheet_229_1_idx 224
+#define types_spritesheet_248_1_idx 225
+#define types_spritesheet_254_1_idx 226
+#define types_spritesheet_257_1_idx 227
+#define types_spritesheet_260_1_idx 228
+#define types_spritesheet_282_1_idx 229
+#define types_spritesheet_302_1_idx 230
+#define types_spritesheet_303_1_idx 231
+#define types_spritesheet_306_1_idx 232
+#define types_spritesheet_308_1_idx 233
+#define types_spritesheet_310_1_idx 234
+#define types_spritesheet_319_1_idx 235
+#define types_spritesheet_323_1_idx 236
+#define types_spritesheet_334_1_idx 237
+#define types_spritesheet_351_1_idx 238
+#define types_spritesheet_351_2_idx 239
+#define types_spritesheet_351_3_idx 240
+#define types_spritesheet_354_1_idx 241
+#define types_spritesheet_359_1_idx 242
+#define types_spritesheet_362_1_idx 243
+#define types_spritesheet_373_1_idx 244
+#define types_spritesheet_376_1_idx 245
+#define types_spritesheet_380_1_idx 246
+#define types_spritesheet_381_1_idx 247
+#define types_spritesheet_382_1_idx 248
+#define types_spritesheet_383_1_idx 249
+#define types_spritesheet_384_1_idx 250
+#define types_spritesheet_386_1_idx 251
+#define types_spritesheet_386_2_idx 252
+#define types_spritesheet_386_3_idx 253
+#define types_spritesheet_413_1_idx 254
+#define types_spritesheet_413_2_idx 255
+#define types_spritesheet_421_1_idx 256
+#define types_spritesheet_422_1_idx 257
+#define types_spritesheet_423_1_idx 258
+#define types_spritesheet_428_1_idx 259
+#define types_spritesheet_445_1_idx 260
+#define types_spritesheet_448_1_idx 261
+#define types_spritesheet_460_1_idx 262
+#define types_spritesheet_475_1_idx 263
+#define types_spritesheet_479_1_idx 264
+#define types_spritesheet_479_2_idx 265
+#define types_spritesheet_479_3_idx 266
+#define types_spritesheet_479_4_idx 267
+#define types_spritesheet_479_5_idx 268
+#define types_spritesheet_487_1_idx 269
+#define types_spritesheet_492_1_idx 270
+#define types_spritesheet_531_1_idx 271
+#define types_spritesheet_550_1_idx 272
+#define types_spritesheet_555_1_idx 273
+#define types_spritesheet_585_1_idx 274
+#define types_spritesheet_585_2_idx 275
+#define types_spritesheet_585_3_idx 276
+#define types_spritesheet_586_1_idx 277
+#define types_spritesheet_586_2_idx 278
+#define types_spritesheet_586_3_idx 279
+#define types_spritesheet_641_1_idx 280
+#define types_spritesheet_642_1_idx 281
+#define types_spritesheet_645_1_idx 282
+#define types_spritesheet_646_1_idx 283
+#define types_spritesheet_646_2_idx 284
+#define types_spritesheet_647_1_idx 285
+#define types_spritesheet_648_1_idx 286
+#define types_spritesheet_658_1_idx 287
+#define types_spritesheet_658_2_idx 288
+#define types_spritesheet_666_1_idx 289
+#define types_spritesheet_666_2_idx 290
+#define types_spritesheet_666_3_idx 291
+#define types_spritesheet_666_4_idx 292
+#define types_spritesheet_666_5_idx 293
+#define types_spritesheet_666_6_idx 294
+#define types_spritesheet_666_7_idx 295
+#define types_spritesheet_666_8_idx 296
+#define types_spritesheet_666_9_idx 297
+#define types_spritesheet_666_10_idx 298
+#define types_spritesheet_666_11_idx 299
+#define types_spritesheet_666_12_idx 300
+#define types_spritesheet_666_13_idx 301
+#define types_spritesheet_666_14_idx 302
+#define types_spritesheet_666_15_idx 303
+#define types_spritesheet_666_16_idx 304
+#define types_spritesheet_666_17_idx 305
+#define types_spritesheet_666_18_idx 306
+#define types_spritesheet_666_19_idx 307
+#define types_spritesheet_669_1_idx 308
+#define types_spritesheet_669_2_idx 309
+#define types_spritesheet_669_3_idx 310
+#define types_spritesheet_669_4_idx 311
+#define types_spritesheet_670_1_idx 312
+#define types_spritesheet_670_2_idx 313
+#define types_spritesheet_670_3_idx 314
+#define types_spritesheet_670_4_idx 315
+#define types_spritesheet_670_5_idx 316
+#define types_spritesheet_671_1_idx 317
+#define types_spritesheet_671_2_idx 318
+#define types_spritesheet_671_3_idx 319
+#define types_spritesheet_671_4_idx 320
+#define types_spritesheet_676_1_idx 321
+#define types_spritesheet_676_2_idx 322
+#define types_spritesheet_676_3_idx 323
+#define types_spritesheet_676_4_idx 324
+#define types_spritesheet_676_5_idx 325
+#define types_spritesheet_676_6_idx 326
+#define types_spritesheet_676_7_idx 327
+#define types_spritesheet_676_8_idx 328
+#define types_spritesheet_676_9_idx 329
+#define types_spritesheet_678_1_idx 330
+#define types_spritesheet_681_1_idx 331
+#define types_spritesheet_718_1_idx 332
+#define types_spritesheet_718_2_idx 333
+#define types_spritesheet_718_3_idx 334
+#define types_spritesheet_718_4_idx 335
+#define types_spritesheet_719_1_idx 336
+#define types_spritesheet_720_1_idx 337
+#define types_spritesheet_735_1_idx 338
+#define types_spritesheet_738_1_idx 339
+#define types_spritesheet_741_1_idx 340
+#define types_spritesheet_741_2_idx 341
+#define types_spritesheet_741_3_idx 342
+#define types_spritesheet_743_1_idx 343
+#define types_spritesheet_744_1_idx 344
+#define types_spritesheet_745_1_idx 345
+#define types_spritesheet_745_2_idx 346
+#define types_spritesheet_746_1_idx 347
+#define types_spritesheet_752_1_idx 348
+#define types_spritesheet_754_1_idx 349
+#define types_spritesheet_758_1_idx 350
+#define types_spritesheet_774_7_idx 351
+#define types_spritesheet_774_8_idx 352
+#define types_spritesheet_774_9_idx 353
+#define types_spritesheet_774_10_idx 354
+#define types_spritesheet_774_11_idx 355
+#define types_spritesheet_774_12_idx 356
+#define types_spritesheet_774_13_idx 357
+#define types_spritesheet_777_1_idx 358
+#define types_spritesheet_778_2_idx 359
+#define types_spritesheet_784_1_idx 360
+#define types_spritesheet_800_1_idx 361
+#define types_spritesheet_800_2_idx 362
+#define types_spritesheet_800_3_idx 363
+#define types_spritesheet_801_1_idx 364
+#define types_spritesheet_201_1_idx 365
+#define types_spritesheet_201_2_idx 366
+#define types_spritesheet_201_3_idx 367
+#define types_spritesheet_201_4_idx 368
+#define types_spritesheet_201_5_idx 369
+#define types_spritesheet_201_6_idx 370
+#define types_spritesheet_201_7_idx 371
+#define types_spritesheet_201_8_idx 372
+#define types_spritesheet_201_9_idx 373
+#define types_spritesheet_201_10_idx 374
+#define types_spritesheet_201_11_idx 375
+#define types_spritesheet_201_12_idx 376
+#define types_spritesheet_201_13_idx 377
+#define types_spritesheet_201_14_idx 378
+#define types_spritesheet_201_15_idx 379
+#define types_spritesheet_201_16_idx 380
+#define types_spritesheet_201_17_idx 381
+#define types_spritesheet_201_18_idx 382
+#define types_spritesheet_201_19_idx 383
+#define types_spritesheet_201_20_idx 384
+#define types_spritesheet_201_21_idx 385
+#define types_spritesheet_201_22_idx 386
+#define types_spritesheet_201_23_idx 387
+#define types_spritesheet_201_24_idx 388
+#define types_spritesheet_201_25_idx 389
+#define types_spritesheet_201_26_idx 390
+#define types_spritesheet_201_27_idx 391
diff --git a/source/gui/gui.cpp b/source/gui/gui.cpp
@@ -1023,6 +1023,8 @@ void Gui::pkm(int species, int form, int generation, int x, int y, float scale,
             case 208:
                 imageOffsetFromBack += 1;
             case 181:
+                imageOffsetFromBack += 1;
+            case 172:
                 imageOffsetFromBack += 2;
             case 150:
                 imageOffsetFromBack += 1;

diff --git a/source/gui/screen/HexEditScreen.cpp b/source/gui/screen/HexEditScreen.cpp
@@ -361,7 +361,21 @@ namespace {
         switch (TitleLoader::save->generation())
         {
             case 4:
-                formCounter = PersonalDPPtHGSS::formCount;
+                formCounter = [](u16 species) -> u8 {
+                if (species == 201)
+                {
+                    return 28;
+                }
+                else
+                {
+                    u8 count = PersonalDPPtHGSS::formCount(species);
+                    if (count == 0)
+                    {
+                        return 1;
+                    }
+                    return count;
+                }
+            };
                 break;
             case 5:
                 formCounter = PersonalBWB2W2::formCount;