Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed looking back at pokemon when leaving door going south

Browse Source
This commit is contained in:
Suppai_Neko committed 2023-04-07 21:19:28 -07:00
2 parents d28afca972 9bee74dd25
commit aa31fc840f
170 files changed
+2717 -601
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/constants/event_objects.h
-202
View File
@@ -492,207 +492,6 @@
#define OBJ_EVENT_GFX_HOOH_FOLLOWER 488
#define OBJ_EVENT_GFX_CELEBI 489
#ifndef POKEMON_EXPANSION
#define OBJ_EVENT_GFX_GREAT_BALL 490
#define OBJ_EVENT_GFX_ULTRA_BALL 491
#define OBJ_EVENT_GFX_MASTER_BALL 492
#define OBJ_EVENT_GFX_SAFARI_BALL 493
#define OBJ_EVENT_GFX_NET_BALL 494
#define OBJ_EVENT_GFX_DIVE_BALL 495
#define OBJ_EVENT_GFX_NEST_BALL 496
#define OBJ_EVENT_GFX_REPEAT_BALL 497
#define OBJ_EVENT_GFX_TIMER_BALL 498
#define OBJ_EVENT_GFX_LUXURY_BALL 499
#define OBJ_EVENT_GFX_PREMIER_BALL 500
#define OBJ_EVENT_GFX_HEAL_BALL 501
#define OBJ_EVENT_GFX_DUSK_BALL 502
#define OBJ_EVENT_GFX_QUICK_BALL 503
#define OBJ_EVENT_GFX_LEVEL_BALL 504
#define OBJ_EVENT_GFX_LURE_BALL 505
#define OBJ_EVENT_GFX_MOON_BALL 506
#define OBJ_EVENT_GFX_FRIEND_BALL 507
#define OBJ_EVENT_GFX_LOVE_BALL 508
#define OBJ_EVENT_GFX_FAST_BALL 509
#define OBJ_EVENT_GFX_HEAVY_BALL 510
#define OBJ_EVENT_GFX_DREAM_BALL 511
#define OBJ_EVENT_GFX_SPORT_BALL 512
#define OBJ_EVENT_GFX_PARK_BALL 513
#define OBJ_EVENT_GFX_CHERISH_BALL 514
// Jump in numbers due to SPECIES_OLD_UNOWN constants
#define OBJ_EVENT_GFX_TREECKO 515
#define OBJ_EVENT_GFX_GROVYLE 516
#define OBJ_EVENT_GFX_SCEPTILE 517
#define OBJ_EVENT_GFX_TORCHIC 518
#define OBJ_EVENT_GFX_COMBUSKEN 519
#define OBJ_EVENT_GFX_BLAZIKEN 520
#define OBJ_EVENT_GFX_MUDKIP 521
#define OBJ_EVENT_GFX_MARSHTOMP 522
#define OBJ_EVENT_GFX_SWAMPERT 523
#define OBJ_EVENT_GFX_POOCHYENA_FOLLOWER 524
#define OBJ_EVENT_GFX_MIGHTYENA 525
#define OBJ_EVENT_GFX_ZIGZAGOON_FOLLOWER 526
#define OBJ_EVENT_GFX_LINOONE 527
#define OBJ_EVENT_GFX_WURMPLE 528
#define OBJ_EVENT_GFX_SILCOON 529
#define OBJ_EVENT_GFX_BEAUTIFLY 530
#define OBJ_EVENT_GFX_CASCOON 531
#define OBJ_EVENT_GFX_DUSTOX 532
#define OBJ_EVENT_GFX_LOTAD 533
#define OBJ_EVENT_GFX_LOMBRE 534
#define OBJ_EVENT_GFX_LUDICOLO 535
#define OBJ_EVENT_GFX_SEEDOT 536
#define OBJ_EVENT_GFX_NUZLEAF 537
#define OBJ_EVENT_GFX_SHIFTRY 538
#define OBJ_EVENT_GFX_NINCADA 539
#define OBJ_EVENT_GFX_NINJASK 540
#define OBJ_EVENT_GFX_SHEDINJA 541
#define OBJ_EVENT_GFX_TAILLOW 542
#define OBJ_EVENT_GFX_SWELLOW 543
#define OBJ_EVENT_GFX_SHROOMISH 544
#define OBJ_EVENT_GFX_BRELOOM 545
#define OBJ_EVENT_GFX_SPINDA 546
#define OBJ_EVENT_GFX_WINGULL_FOLLOWER 547
#define OBJ_EVENT_GFX_PELIPPER 548
#define OBJ_EVENT_GFX_SURSKIT 549
#define OBJ_EVENT_GFX_MASQUERAIN 550
#define OBJ_EVENT_GFX_WAILMER 551
#define OBJ_EVENT_GFX_WAILORD 552
#define OBJ_EVENT_GFX_SKITTY_FOLLOWER 553
#define OBJ_EVENT_GFX_DELCATTY 554
#define OBJ_EVENT_GFX_KECLEON_FOLLOWER 555
#define OBJ_EVENT_GFX_BALTOY 556
#define OBJ_EVENT_GFX_CLAYDOL 557
#define OBJ_EVENT_GFX_NOSEPASS 558
#define OBJ_EVENT_GFX_TORKOAL 559
#define OBJ_EVENT_GFX_SABLEYE 560
#define OBJ_EVENT_GFX_BARBOACH 561
#define OBJ_EVENT_GFX_WHISCASH 562
#define OBJ_EVENT_GFX_LUVDISC 563
#define OBJ_EVENT_GFX_CORPHISH 564
#define OBJ_EVENT_GFX_CRAWDAUNT 565
#define OBJ_EVENT_GFX_FEEBAS 566
#define OBJ_EVENT_GFX_MILOTIC 567
#define OBJ_EVENT_GFX_CARVANHA 568
#define OBJ_EVENT_GFX_SHARPEDO 569
#define OBJ_EVENT_GFX_TRAPINCH 570
#define OBJ_EVENT_GFX_VIBRAVA 571
#define OBJ_EVENT_GFX_FLYGON 572
#define OBJ_EVENT_GFX_MAKUHITA 573
#define OBJ_EVENT_GFX_HARIYAMA 574
#define OBJ_EVENT_GFX_ELECTRIKE 575
#define OBJ_EVENT_GFX_MANECTRIC 576
#define OBJ_EVENT_GFX_NUMEL 577
#define OBJ_EVENT_GFX_CAMERUPT 578
#define OBJ_EVENT_GFX_SPHEAL 579
#define OBJ_EVENT_GFX_SEALEO 580
#define OBJ_EVENT_GFX_WALREIN 581
#define OBJ_EVENT_GFX_CACNEA 582
#define OBJ_EVENT_GFX_CACTURNE 583
#define OBJ_EVENT_GFX_SNORUNT 584
#define OBJ_EVENT_GFX_GLALIE 585
#define OBJ_EVENT_GFX_LUNATONE 586
#define OBJ_EVENT_GFX_SOLROCK 587
#define OBJ_EVENT_GFX_AZURILL_FOLLOWER 588
#define OBJ_EVENT_GFX_SPOINK 589
#define OBJ_EVENT_GFX_GRUMPIG 590
#define OBJ_EVENT_GFX_PLUSLE 591
#define OBJ_EVENT_GFX_MINUN 592
#define OBJ_EVENT_GFX_MAWILE 593
#define OBJ_EVENT_GFX_MEDITITE 594
#define OBJ_EVENT_GFX_MEDICHAM 595
#define OBJ_EVENT_GFX_SWABLU 596
#define OBJ_EVENT_GFX_ALTARIA 597
#define OBJ_EVENT_GFX_WYNAUT 598
#define OBJ_EVENT_GFX_DUSKULL 599
#define OBJ_EVENT_GFX_DUSCLOPS_FOLLOWER 600
#define OBJ_EVENT_GFX_ROSELIA 601
#define OBJ_EVENT_GFX_SLAKOTH 602
#define OBJ_EVENT_GFX_VIGOROTH_FOLLOWER 603
#define OBJ_EVENT_GFX_SLAKING 604
#define OBJ_EVENT_GFX_GULPIN 605
#define OBJ_EVENT_GFX_SWALOT 606
#define OBJ_EVENT_GFX_TROPIUS 607
#define OBJ_EVENT_GFX_WHISMUR 608
#define OBJ_EVENT_GFX_LOUDRED 609
#define OBJ_EVENT_GFX_EXPLOUD 610
#define OBJ_EVENT_GFX_CLAMPERL 611
#define OBJ_EVENT_GFX_HUNTAIL 612
#define OBJ_EVENT_GFX_GOREBYSS 613
#define OBJ_EVENT_GFX_ABSOL 614
#define OBJ_EVENT_GFX_SHUPPET 615
#define OBJ_EVENT_GFX_BANETTE 616
#define OBJ_EVENT_GFX_SEVIPER 617
#define OBJ_EVENT_GFX_ZANGOOSE 618
#define OBJ_EVENT_GFX_RELICANTH 619
#define OBJ_EVENT_GFX_ARON 620
#define OBJ_EVENT_GFX_LAIRON 621
#define OBJ_EVENT_GFX_AGGRON 622
#define OBJ_EVENT_GFX_CASTFORM 623
#define OBJ_EVENT_GFX_VOLBEAT 624
#define OBJ_EVENT_GFX_ILLUMISE 625
#define OBJ_EVENT_GFX_LILEEP 626
#define OBJ_EVENT_GFX_CRADILY 627
#define OBJ_EVENT_GFX_ANORITH 628
#define OBJ_EVENT_GFX_ARMALDO 629
#define OBJ_EVENT_GFX_RALTS 630
#define OBJ_EVENT_GFX_KIRLIA_FOLLOWER 631
#define OBJ_EVENT_GFX_GARDEVOIR 632
#define OBJ_EVENT_GFX_BAGON 633
#define OBJ_EVENT_GFX_SHELGON 634
#define OBJ_EVENT_GFX_SALAMENCE 635
#define OBJ_EVENT_GFX_BELDUM 636
#define OBJ_EVENT_GFX_METANG 637
#define OBJ_EVENT_GFX_METAGROSS 638
#define OBJ_EVENT_GFX_REGIROCK_FOLLOWER 639
#define OBJ_EVENT_GFX_REGICE_FOLLOWER 640
#define OBJ_EVENT_GFX_REGISTEEL_FOLLOWER 641
#define OBJ_EVENT_GFX_KYOGRE 642
#define OBJ_EVENT_GFX_GROUDON 643
#define OBJ_EVENT_GFX_RAYQUAZA_FOLLOWER 644
#define OBJ_EVENT_GFX_LATIAS_FOLLOWER 645
#define OBJ_EVENT_GFX_LATIOS_FOLLOWER 646
#define OBJ_EVENT_GFX_JIRACHI 647
#define OBJ_EVENT_GFX_DEOXYS_NORMAL 648
#define OBJ_EVENT_GFX_CHIMECHO 649
// Other forms
#define OBJ_EVENT_GFX_DEOXYS_ATTACK 650
#define OBJ_EVENT_GFX_DEOXYS_DEFENSE 651
#define OBJ_EVENT_GFX_DEOXYS_SPEED 652
#define OBJ_EVENT_GFX_UNOWN_B 653
#define OBJ_EVENT_GFX_UNOWN_C 654
#define OBJ_EVENT_GFX_UNOWN_D 655
#define OBJ_EVENT_GFX_UNOWN_E 656
#define OBJ_EVENT_GFX_UNOWN_F 657
#define OBJ_EVENT_GFX_UNOWN_G 658
#define OBJ_EVENT_GFX_UNOWN_H 659
#define OBJ_EVENT_GFX_UNOWN_I 660
#define OBJ_EVENT_GFX_UNOWN_J 661
#define OBJ_EVENT_GFX_UNOWN_K 662
#define OBJ_EVENT_GFX_UNOWN_L 663
#define OBJ_EVENT_GFX_UNOWN_M 664
#define OBJ_EVENT_GFX_UNOWN_N 665
#define OBJ_EVENT_GFX_UNOWN_O 666
#define OBJ_EVENT_GFX_UNOWN_P 667
#define OBJ_EVENT_GFX_UNOWN_Q 668
#define OBJ_EVENT_GFX_UNOWN_R 669
#define OBJ_EVENT_GFX_UNOWN_S 670
#define OBJ_EVENT_GFX_UNOWN_T 671
#define OBJ_EVENT_GFX_UNOWN_U 672
#define OBJ_EVENT_GFX_UNOWN_V 673
#define OBJ_EVENT_GFX_UNOWN_W 674
#define OBJ_EVENT_GFX_UNOWN_X 675
#define OBJ_EVENT_GFX_UNOWN_Y 676
#define OBJ_EVENT_GFX_UNOWN_Z 677
#define OBJ_EVENT_GFX_UNOWN_EXCLAMATION 678
#define OBJ_EVENT_GFX_UNOWN_QUESTION 679
#define OBJ_EVENT_GFX_EXPANDING_SPARKLE 680
#else
// There are no OLD_UNOWN constants in the pokemon_expansion, and the species constants are reordered
#define OBJ_EVENT_GFX_TREECKO 490
#define OBJ_EVENT_GFX_GROVYLE 491
@@ -889,7 +688,6 @@
#define OBJ_EVENT_GFX_CHERISH_BALL 679
#define OBJ_EVENT_GFX_EXPANDING_SPARKLE 680
#endif
#define NUM_OBJ_EVENT_GFX 681
include/constants/flags.h
+9 -9
View File
@@ -1218,15 +1218,15 @@
#define FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET 0x491
#define FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL 0x492
#define FLAG_UNUSED_0x493 0x493 // Unused Flag
#define FLAG_UNUSED_0x494 0x494 // Unused Flag
#define FLAG_UNUSED_0x495 0x495 // Unused Flag
#define FLAG_UNUSED_0x496 0x496 // Unused Flag
#define FLAG_UNUSED_0x497 0x497 // Unused Flag
#define FLAG_UNUSED_0x498 0x498 // Unused Flag
#define FLAG_UNUSED_0x499 0x499 // Unused Flag
#define FLAG_UNUSED_0x49A 0x49A // Unused Flag
#define FLAG_UNUSED_0x49B 0x49B // Unused Flag
#define FLAG_ITEM_ROUTE_101ext_POTION 0x493
#define FLAG_ITEM_ROUTE_102ext_RARECANDY 0x494 // Unused Flag
#define FLAG_ITEM_TOWN_LITTLEROOT_POTION 0x495 // Unused Flag
#define FLAG_RECEIVED_FEEBASS 0x496 // Unused Flag
#define FLAG_ITEM_PETALBURGEXT2_WOODS_REVIVE 0x497 // Unused Flag
#define FLAG_LEAFS_ARRIVED 0x498 // Unused Flag
#define FLAG_STEVENS_CAVE_ROCK 0x499 // Unused Flag
#define FLAG_ITEM_GRANITE_CAVE_3F_SUPERPOTION 0x49A // Unused Flag
#define FLAG_ITEM_GRANITE_CAVE_3F_REVIVE 0x49B // Unused Flag
#define FLAG_UNUSED_0x49C 0x49C // Unused Flag
#define FLAG_UNUSED_0x49D 0x49D // Unused Flag
#define FLAG_UNUSED_0x49E 0x49E // Unused Flag
include/constants/global.h
+1 -1
View File
@@ -170,6 +170,6 @@
#define SIDEWAYS_STAIRS_IMPLEMENTED FALSE
#define POST_BATTLE_FOLLOWER_FIX FALSE
#define FAST_FOLLOWERS FALSE
#define FAST_FOLLOWERS TRUE
#endif // GUARD_CONSTANTS_GLOBAL_H
include/constants/layouts.h
+11
View File
@@ -446,5 +446,16 @@
#define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F 439
#define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F 440
#define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F_STAIRS_UNBLOCKED 441
#define LAYOUT_ROUTE101EXT 442
#define LAYOUT_ROUTE102EXT 443
#define LAYOUT_NEW_MAP1 444
#define LAYOUT_PETALBURGEXT 445
#define LAYOUT_PETALBURG_CITY_OLD_RESEARCH_BUILDING 446
#define LAYOUT_PETALBURG_WOODS_EXT 447
#define LAYOUT_ROUTE103EXT 448
#define LAYOUT_PETALBURG_WOODSEXT2 449
#define LAYOUT_RUSTBORO_CITY_LEAFS_HOUSE 450
#define LAYOUT_RUSTBORO_CITY_LEAFS_HOUSE_2F 451
#define LAYOUT_GRANITE_CAVE_B3F 452
#endif // GUARD_CONSTANTS_LAYOUTS_H
include/constants/map_groups.h
+68 -57
View File
@@ -6,63 +6,69 @@
//
// gMapGroup_TownsAndRoutes
#define MAP_PETALBURG_CITY (0 | (0 << 8))
#define MAP_SLATEPORT_CITY (1 | (0 << 8))
#define MAP_MAUVILLE_CITY (2 | (0 << 8))
#define MAP_RUSTBORO_CITY (3 | (0 << 8))
#define MAP_FORTREE_CITY (4 | (0 << 8))
#define MAP_LILYCOVE_CITY (5 | (0 << 8))
#define MAP_MOSSDEEP_CITY (6 | (0 << 8))
#define MAP_SOOTOPOLIS_CITY (7 | (0 << 8))
#define MAP_EVER_GRANDE_CITY (8 | (0 << 8))
#define MAP_LITTLEROOT_TOWN (9 | (0 << 8))
#define MAP_OLDALE_TOWN (10 | (0 << 8))
#define MAP_DEWFORD_TOWN (11 | (0 << 8))
#define MAP_LAVARIDGE_TOWN (12 | (0 << 8))
#define MAP_FALLARBOR_TOWN (13 | (0 << 8))
#define MAP_VERDANTURF_TOWN (14 | (0 << 8))
#define MAP_PACIFIDLOG_TOWN (15 | (0 << 8))
#define MAP_ROUTE101 (16 | (0 << 8))
#define MAP_ROUTE102 (17 | (0 << 8))
#define MAP_ROUTE103 (18 | (0 << 8))
#define MAP_ROUTE104 (19 | (0 << 8))
#define MAP_ROUTE105 (20 | (0 << 8))
#define MAP_ROUTE106 (21 | (0 << 8))
#define MAP_ROUTE107 (22 | (0 << 8))
#define MAP_ROUTE108 (23 | (0 << 8))
#define MAP_ROUTE109 (24 | (0 << 8))
#define MAP_ROUTE110 (25 | (0 << 8))
#define MAP_ROUTE111 (26 | (0 << 8))
#define MAP_ROUTE112 (27 | (0 << 8))
#define MAP_ROUTE113 (28 | (0 << 8))
#define MAP_ROUTE114 (29 | (0 << 8))
#define MAP_ROUTE115 (30 | (0 << 8))
#define MAP_ROUTE116 (31 | (0 << 8))
#define MAP_ROUTE117 (32 | (0 << 8))
#define MAP_ROUTE118 (33 | (0 << 8))
#define MAP_ROUTE119 (34 | (0 << 8))
#define MAP_ROUTE120 (35 | (0 << 8))
#define MAP_ROUTE121 (36 | (0 << 8))
#define MAP_ROUTE122 (37 | (0 << 8))
#define MAP_ROUTE123 (38 | (0 << 8))
#define MAP_ROUTE124 (39 | (0 << 8))
#define MAP_ROUTE125 (40 | (0 << 8))
#define MAP_ROUTE126 (41 | (0 << 8))
#define MAP_ROUTE127 (42 | (0 << 8))
#define MAP_ROUTE128 (43 | (0 << 8))
#define MAP_ROUTE129 (44 | (0 << 8))
#define MAP_ROUTE130 (45 | (0 << 8))
#define MAP_ROUTE131 (46 | (0 << 8))
#define MAP_ROUTE132 (47 | (0 << 8))
#define MAP_ROUTE133 (48 | (0 << 8))
#define MAP_ROUTE134 (49 | (0 << 8))
#define MAP_UNDERWATER_ROUTE124 (50 | (0 << 8))
#define MAP_UNDERWATER_ROUTE126 (51 | (0 << 8))
#define MAP_UNDERWATER_ROUTE127 (52 | (0 << 8))
#define MAP_UNDERWATER_ROUTE128 (53 | (0 << 8))
#define MAP_UNDERWATER_ROUTE129 (54 | (0 << 8))
#define MAP_UNDERWATER_ROUTE105 (55 | (0 << 8))
#define MAP_UNDERWATER_ROUTE125 (56 | (0 << 8))
#define MAP_PETALBURG_CITY (0 | (0 << 8))
#define MAP_SLATEPORT_CITY (1 | (0 << 8))
#define MAP_MAUVILLE_CITY (2 | (0 << 8))
#define MAP_RUSTBORO_CITY (3 | (0 << 8))
#define MAP_FORTREE_CITY (4 | (0 << 8))
#define MAP_LILYCOVE_CITY (5 | (0 << 8))
#define MAP_MOSSDEEP_CITY (6 | (0 << 8))
#define MAP_SOOTOPOLIS_CITY (7 | (0 << 8))
#define MAP_EVER_GRANDE_CITY (8 | (0 << 8))
#define MAP_LITTLEROOT_TOWN (9 | (0 << 8))
#define MAP_OLDALE_TOWN (10 | (0 << 8))
#define MAP_DEWFORD_TOWN (11 | (0 << 8))
#define MAP_LAVARIDGE_TOWN (12 | (0 << 8))
#define MAP_FALLARBOR_TOWN (13 | (0 << 8))
#define MAP_VERDANTURF_TOWN (14 | (0 << 8))
#define MAP_PACIFIDLOG_TOWN (15 | (0 << 8))
#define MAP_ROUTE101 (16 | (0 << 8))
#define MAP_ROUTE102 (17 | (0 << 8))
#define MAP_ROUTE103 (18 | (0 << 8))
#define MAP_ROUTE104 (19 | (0 << 8))
#define MAP_ROUTE105 (20 | (0 << 8))
#define MAP_ROUTE106 (21 | (0 << 8))
#define MAP_ROUTE107 (22 | (0 << 8))
#define MAP_ROUTE108 (23 | (0 << 8))
#define MAP_ROUTE109 (24 | (0 << 8))
#define MAP_ROUTE110 (25 | (0 << 8))
#define MAP_ROUTE111 (26 | (0 << 8))
#define MAP_ROUTE112 (27 | (0 << 8))
#define MAP_ROUTE113 (28 | (0 << 8))
#define MAP_ROUTE114 (29 | (0 << 8))
#define MAP_ROUTE115 (30 | (0 << 8))
#define MAP_ROUTE116 (31 | (0 << 8))
#define MAP_ROUTE117 (32 | (0 << 8))
#define MAP_ROUTE118 (33 | (0 << 8))
#define MAP_ROUTE119 (34 | (0 << 8))
#define MAP_ROUTE120 (35 | (0 << 8))
#define MAP_ROUTE121 (36 | (0 << 8))
#define MAP_ROUTE122 (37 | (0 << 8))
#define MAP_ROUTE123 (38 | (0 << 8))
#define MAP_ROUTE124 (39 | (0 << 8))
#define MAP_ROUTE125 (40 | (0 << 8))
#define MAP_ROUTE126 (41 | (0 << 8))
#define MAP_ROUTE127 (42 | (0 << 8))
#define MAP_ROUTE128 (43 | (0 << 8))
#define MAP_ROUTE129 (44 | (0 << 8))
#define MAP_ROUTE130 (45 | (0 << 8))
#define MAP_ROUTE131 (46 | (0 << 8))
#define MAP_ROUTE132 (47 | (0 << 8))
#define MAP_ROUTE133 (48 | (0 << 8))
#define MAP_ROUTE134 (49 | (0 << 8))
#define MAP_UNDERWATER_ROUTE124 (50 | (0 << 8))
#define MAP_UNDERWATER_ROUTE126 (51 | (0 << 8))
#define MAP_UNDERWATER_ROUTE127 (52 | (0 << 8))
#define MAP_UNDERWATER_ROUTE128 (53 | (0 << 8))
#define MAP_UNDERWATER_ROUTE129 (54 | (0 << 8))
#define MAP_UNDERWATER_ROUTE105 (55 | (0 << 8))
#define MAP_UNDERWATER_ROUTE125 (56 | (0 << 8))
#define MAP_ROUTE101EXT (57 | (0 << 8))
#define MAP_ROUTE102EXT (58 | (0 << 8))
#define MAP_NEW_MAP1 (59 | (0 << 8))
#define MAP_PETALBURGEXT (60 | (0 << 8))
#define MAP_PETALBURG_CITY_OLD_RESEARCH_BUILDING (61 | (0 << 8))
#define MAP_ROUTE103EXT (62 | (0 << 8))
// gMapGroup_IndoorLittleroot
#define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F (0 | (1 << 8))
@@ -178,6 +184,8 @@
#define MAP_RUSTBORO_CITY_FLAT2_2F (14 | (11 << 8))
#define MAP_RUSTBORO_CITY_FLAT2_3F (15 | (11 << 8))
#define MAP_RUSTBORO_CITY_HOUSE3 (16 | (11 << 8))
#define MAP_RUSTBORO_CITY_LEAFS_HOUSE (17 | (11 << 8))
#define MAP_RUSTBORO_CITY_LEAFS_HOUSE_2F (18 | (11 << 8))
// gMapGroup_IndoorFortree
#define MAP_FORTREE_CITY_HOUSE1 (0 | (12 << 8))
@@ -400,6 +408,9 @@
#define MAP_TERRA_CAVE_END (105 | (24 << 8))
#define MAP_ALTERING_CAVE (106 | (24 << 8))
#define MAP_METEOR_FALLS_STEVENS_CAVE (107 | (24 << 8))
#define MAP_PETALBURG_WOODS_EXT (108 | (24 << 8))
#define MAP_PETALBURG_WOODSEXT2 (109 | (24 << 8))
#define MAP_GRANITE_CAVE_B3F (110 | (24 << 8))
// gMapGroup_IndoorDynamic
#define MAP_SECRET_BASE_RED_CAVE1 (0 | (25 << 8))
include/constants/opponents.h
+5 -2
View File
@@ -856,12 +856,15 @@
#define TRAINER_LEAF 852
#define TRAINER_BRENDAN_PLACEHOLDER 853
#define TRAINER_MAY_PLACEHOLDER 854
#define TRAINER_BART 855
#define TRAINER_LEWIS 856
#define TRAINER_COLEMAN 867
// NOTE: Because each Trainer uses a flag to determine when they are defeated, there is only space for 9 additional trainers before trainer flag space overflows
// More space can be made by shifting flags around in constants/flags.h or changing how trainer flags are handled
// MAX_TRAINERS_COUNT can be increased but will take up additional saveblock space
#define TRAINERS_COUNT 855
#define MAX_TRAINERS_COUNT 864
#define TRAINERS_COUNT 868
#define MAX_TRAINERS_COUNT 900//864
#endif // GUARD_CONSTANTS_OPPONENTS_H
include/global.h
+1
View File
@@ -150,6 +150,7 @@
// Converts a string to a compound literal, essentially making it a pointer to const u8
#define COMPOUND_STRING(str) (const u8[]) _(str)
// This produces an error at compile-time if expr is zero.
// It looks like file.c:line: size of array `id' is negative
#define STATIC_ASSERT(expr, id) typedef char id[(expr) ? 1 : -1];