diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/decorations/mystery_gift_decos.asm | 2 | ||||
| -rw-r--r-- | data/engine_flags.asm | 196 | ||||
| -rw-r--r-- | data/items/buena_prizes.asm | 2 | ||||
| -rw-r--r-- | data/items/marts.asm | 2 | ||||
| -rw-r--r-- | data/items/mom_phone.asm | 4 | ||||
| -rw-r--r-- | data/items/mystery_gift_items.asm | 2 | ||||
| -rw-r--r-- | data/maps/flypoints.asm | 48 | ||||
| -rw-r--r-- | data/radio/oaks_pkmn_talk_routes.asm | 2 | ||||
| -rw-r--r-- | data/radio/pnp_hidden_places.asm | 2 | ||||
| -rw-r--r-- | data/sprites/facings.asm | 4 | ||||
| -rw-r--r-- | data/trainers/gendered_trainers.asm | 4 | ||||
| -rw-r--r-- | data/wild/unlocked_unowns.asm | 20 |
12 files changed, 152 insertions, 136 deletions
diff --git a/data/decorations/mystery_gift_decos.asm b/data/decorations/mystery_gift_decos.asm index bdd4694c6..94a5935de 100644 --- a/data/decorations/mystery_gift_decos.asm +++ b/data/decorations/mystery_gift_decos.asm @@ -36,5 +36,5 @@ MysteryGiftDecos: ; 2c74a db DECOFLAG_PIKACHU_BED db DECOFLAG_GRIMER_DOLL db DECOFLAG_UNOWN_DOLL -MysteryGiftDecosEnd +.End ; 2c76f diff --git a/data/engine_flags.asm b/data/engine_flags.asm index 42f30813a..119697466 100644 --- a/data/engine_flags.asm +++ b/data/engine_flags.asm @@ -1,10 +1,11 @@ engine_flag: MACRO - dwb \1, 1 << \2 +; location, bit +; (all locations are in WRAM bank 1) + dwb \1 + (\2 / 8), 1 << (\2 % 8) ENDM EngineFlags: ; 80462 - ; location, bit - ; (all locations are in WRAM bank 1) +; entries correspond to ENGINE_* constants ; pokegear engine_flag wPokegearFlags, POKEGEAR_RADIO_CARD_F ; $0 @@ -31,7 +32,7 @@ EngineFlags: ; 80462 engine_flag wStatusFlags, 3 ; pokerus engine_flag wStatusFlags, 4 ; rocket signal on ch20 engine_flag wStatusFlags, 6 ; credits skip - engine_flag wStatusFlags, 7 ; bug contest on ; $10 + engine_flag wStatusFlags, 7 ; bug contest on ; $10 engine_flag wStatusFlags2, 2 ; bug contest timer engine_flag wStatusFlags2, 1 ; safari zone? engine_flag wStatusFlags2, 0 ; rockets in radio tower @@ -40,7 +41,7 @@ EngineFlags: ; 80462 engine_flag wStatusFlags2, 6 ; berry -> berry juice when trading? engine_flag wStatusFlags2, 7 ; rockets in mahogany - engine_flag wBikeFlags, 0 ; strength active ; $18 + engine_flag wBikeFlags, 0 ; strength active ; $18 engine_flag wBikeFlags, 1 ; always on bike (cant surf) engine_flag wBikeFlags, 2 ; downhill (cycling road) @@ -63,50 +64,48 @@ EngineFlags: ; 80462 engine_flag wKantoBadges, EARTHBADGE ; unown sets - engine_flag wUnlockedUnowns, 0 ; 1 - engine_flag wUnlockedUnowns, 1 ; 2 - engine_flag wUnlockedUnowns, 2 ; 3 - engine_flag wUnlockedUnowns, 3 ; 4 - engine_flag wUnlockedUnowns, 4 ; 5 - engine_flag wUnlockedUnowns, 5 ; 6 ; $30 - engine_flag wUnlockedUnowns, 6 ; 7 - engine_flag wUnlockedUnowns, 7 ; 8 + engine_flag wUnlockedUnowns, 0 ; A-K + engine_flag wUnlockedUnowns, 1 ; L-R + engine_flag wUnlockedUnowns, 2 ; S-W + engine_flag wUnlockedUnowns, 3 ; X-Z + engine_flag wUnlockedUnowns, 4 ; unused 5 + engine_flag wUnlockedUnowns, 5 ; unused 6 ; $30 + engine_flag wUnlockedUnowns, 6 ; unused 7 + engine_flag wUnlockedUnowns, 7 ; unused 8 ; fly - engine_flag wVisitedSpawns, 0 ; your house - engine_flag wVisitedSpawns, 1 ; viridian pokecenter - engine_flag wVisitedSpawns, 2 ; pallet - engine_flag wVisitedSpawns, 3 ; viridian - engine_flag wVisitedSpawns, 4 ; pewter - engine_flag wVisitedSpawns, 5 ; cerulean ; $38 - engine_flag wVisitedSpawns, 6 ; rock tunnel - engine_flag wVisitedSpawns, 7 ; vermilion - engine_flag wVisitedSpawns + 1, 0 ; lavender - engine_flag wVisitedSpawns + 1, 1 ; saffron - engine_flag wVisitedSpawns + 1, 2 ; celadon - engine_flag wVisitedSpawns + 1, 3 ; fuchsia - engine_flag wVisitedSpawns + 1, 4 ; cinnabar - engine_flag wVisitedSpawns + 1, 5 ; indigo plateau ; $40 - engine_flag wVisitedSpawns + 1, 6 ; new bark - engine_flag wVisitedSpawns + 1, 7 ; cherrygrove - engine_flag wVisitedSpawns + 2, 0 ; violet - ; union cave - engine_flag wVisitedSpawns + 2, 2 ; azalea - engine_flag wVisitedSpawns + 2, 3 ; cianwood - engine_flag wVisitedSpawns + 2, 4 ; goldenrod - engine_flag wVisitedSpawns + 2, 5 ; olivine - engine_flag wVisitedSpawns + 2, 6 ; ecruteak ; $48 - engine_flag wVisitedSpawns + 2, 7 ; mahogany - engine_flag wVisitedSpawns + 3, 0 ; lake of rage - engine_flag wVisitedSpawns + 3, 1 ; blackthorn - engine_flag wVisitedSpawns + 3, 2 ; silver cave - ; fast ship - engine_flag wVisitedSpawns + 3, 4 ; unused + engine_flag wVisitedSpawns, SPAWN_HOME + engine_flag wVisitedSpawns, SPAWN_DEBUG + engine_flag wVisitedSpawns, SPAWN_PALLET + engine_flag wVisitedSpawns, SPAWN_VIRIDIAN + engine_flag wVisitedSpawns, SPAWN_PEWTER + engine_flag wVisitedSpawns, SPAWN_CERULEAN ; $38 + engine_flag wVisitedSpawns, SPAWN_ROCK_TUNNEL + engine_flag wVisitedSpawns, SPAWN_VERMILION + engine_flag wVisitedSpawns, SPAWN_LAVENDER + engine_flag wVisitedSpawns, SPAWN_SAFFRON + engine_flag wVisitedSpawns, SPAWN_CELADON + engine_flag wVisitedSpawns, SPAWN_FUCHSIA + engine_flag wVisitedSpawns, SPAWN_CINNABAR + engine_flag wVisitedSpawns, SPAWN_INDIGO ; $40 + engine_flag wVisitedSpawns, SPAWN_NEW_BARK + engine_flag wVisitedSpawns, SPAWN_CHERRYGROVE + engine_flag wVisitedSpawns, SPAWN_VIOLET + engine_flag wVisitedSpawns, SPAWN_AZALEA + engine_flag wVisitedSpawns, SPAWN_CIANWOOD + engine_flag wVisitedSpawns, SPAWN_GOLDENROD + engine_flag wVisitedSpawns, SPAWN_OLIVINE + engine_flag wVisitedSpawns, SPAWN_ECRUTEAK ; $48 + engine_flag wVisitedSpawns, SPAWN_MAHOGANY + engine_flag wVisitedSpawns, SPAWN_LAKE_OF_RAGE + engine_flag wVisitedSpawns, SPAWN_BLACKTHORN + engine_flag wVisitedSpawns, SPAWN_MT_SILVER + engine_flag wVisitedSpawns, NUM_SPAWNS ; unused engine_flag wLuckyNumberShowFlag, 0 ; lucky number show engine_flag wStatusFlags2, 3 ; ???? - engine_flag wDailyFlags, 0 ; kurt making balls ; $50 + engine_flag wDailyFlags, 0 ; kurt making balls ; $50 engine_flag wDailyFlags, 1 ; ???? engine_flag wDailyFlags, 2 ; special wilddata? engine_flag wDailyFlags, 3 ; time capsule (24h wait) @@ -115,7 +114,7 @@ EngineFlags: ; 80462 engine_flag wDailyFlags, 6 ; goldenrod underground merchant closed engine_flag wDailyFlags, 7 ; fought in trainer hall today - engine_flag wWeeklyFlags, 0 ; mt moon square clefairy ; $58 + engine_flag wWeeklyFlags, 0 ; mt moon square clefairy ; $58 engine_flag wWeeklyFlags, 1 ; union cave lapras engine_flag wWeeklyFlags, 2 ; goldenrod underground haircut used engine_flag wWeeklyFlags, 3 ; goldenrod mall happiness event floor05 object07 @@ -134,73 +133,70 @@ EngineFlags: ; 80462 engine_flag wCelebiEvent, 2 ; have gs ball after kurt examined it ; rematches - engine_flag wDailyRematchFlags, 0 ; jack - engine_flag wDailyRematchFlags, 1 ; huey - engine_flag wDailyRematchFlags, 2 ; gaven - engine_flag wDailyRematchFlags, 3 ; beth ; $68 - engine_flag wDailyRematchFlags, 4 ; jose - engine_flag wDailyRematchFlags, 5 ; reena - engine_flag wDailyRematchFlags, 6 ; joey - engine_flag wDailyRematchFlags, 7 ; wade - engine_flag wDailyRematchFlags + 1, 0 ; ralph - engine_flag wDailyRematchFlags + 1, 1 ; liz - engine_flag wDailyRematchFlags + 1, 2 ; anthony - engine_flag wDailyRematchFlags + 1, 3 ; todd ; $70 - engine_flag wDailyRematchFlags + 1, 4 ; gina - engine_flag wDailyRematchFlags + 1, 5 ; arnie - engine_flag wDailyRematchFlags + 1, 6 ; alan - engine_flag wDailyRematchFlags + 1, 7 ; dana - engine_flag wDailyRematchFlags + 2, 0 ; chad - engine_flag wDailyRematchFlags + 2, 1 ; tully - engine_flag wDailyRematchFlags + 2, 2 ; brent - engine_flag wDailyRematchFlags + 2, 3 ; tiffany ; $78 - engine_flag wDailyRematchFlags + 2, 4 ; vance - engine_flag wDailyRematchFlags + 2, 5 ; wilton - engine_flag wDailyRematchFlags + 2, 6 ; parry - engine_flag wDailyRematchFlags + 2, 7 ; erin + engine_flag wDailyRematchFlags, 0 ; jack + engine_flag wDailyRematchFlags, 1 ; huey + engine_flag wDailyRematchFlags, 2 ; gaven + engine_flag wDailyRematchFlags, 3 ; beth ; $68 + engine_flag wDailyRematchFlags, 4 ; jose + engine_flag wDailyRematchFlags, 5 ; reena + engine_flag wDailyRematchFlags, 6 ; joey + engine_flag wDailyRematchFlags, 7 ; wade + engine_flag wDailyRematchFlags, 8 ; ralph + engine_flag wDailyRematchFlags, 9 ; liz + engine_flag wDailyRematchFlags, 10 ; anthony + engine_flag wDailyRematchFlags, 11 ; todd ; $70 + engine_flag wDailyRematchFlags, 12 ; gina + engine_flag wDailyRematchFlags, 13 ; arnie + engine_flag wDailyRematchFlags, 14 ; alan + engine_flag wDailyRematchFlags, 15 ; dana + engine_flag wDailyRematchFlags, 16 ; chad + engine_flag wDailyRematchFlags, 17 ; tully + engine_flag wDailyRematchFlags, 18 ; brent + engine_flag wDailyRematchFlags, 19 ; tiffany ; $78 + engine_flag wDailyRematchFlags, 20 ; vance + engine_flag wDailyRematchFlags, 21 ; wilton + engine_flag wDailyRematchFlags, 22 ; parry + engine_flag wDailyRematchFlags, 23 ; erin engine_flag wDailyPhoneItemFlags, 0 ; beverly has nugget engine_flag wDailyPhoneItemFlags, 1 ; jose has star piece engine_flag wDailyPhoneItemFlags, 2 ; wade has item (see EVENT_WADE_HAS_*** in constants/event_flags.asm) - engine_flag wDailyPhoneItemFlags, 3 ; gina has leaf stone ; $80 + engine_flag wDailyPhoneItemFlags, 3 ; gina has leaf stone ; $80 engine_flag wDailyPhoneItemFlags, 4 ; alan has fire stone engine_flag wDailyPhoneItemFlags, 5 ; liz has thunderstone engine_flag wDailyPhoneItemFlags, 6 ; derek has nugget engine_flag wDailyPhoneItemFlags, 7 ; tully has water stone - - engine_flag wDailyPhoneItemFlags + 1, 0 ; tiffany has pink bow - engine_flag wDailyPhoneItemFlags + 1, 1 ; wilton has item (see EVENT_WILTON_HAS_*** in constants/event_flags.asm) - - engine_flag wDailyPhoneTimeOfDayFlags, 0 - engine_flag wDailyPhoneTimeOfDayFlags, 1 ; $88 - engine_flag wDailyPhoneTimeOfDayFlags, 2 - engine_flag wDailyPhoneTimeOfDayFlags, 3 - engine_flag wDailyPhoneTimeOfDayFlags, 4 - engine_flag wDailyPhoneTimeOfDayFlags, 5 - engine_flag wDailyPhoneTimeOfDayFlags, 6 - engine_flag wDailyPhoneTimeOfDayFlags, 7 - - engine_flag wDailyPhoneTimeOfDayFlags + 1, 0 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 1 ; $90 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 2 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 3 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 4 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 5 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 6 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 7 - - engine_flag wDailyPhoneTimeOfDayFlags + 2, 0 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 1 ; $98 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 2 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 3 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 4 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 5 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 6 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 7 + engine_flag wDailyPhoneItemFlags, 8 ; tiffany has pink bow + engine_flag wDailyPhoneItemFlags, 9 ; wilton has item (see EVENT_WILTON_HAS_*** in constants/event_flags.asm) + + engine_flag wDailyPhoneTimeOfDayFlags, 0 ; jack + engine_flag wDailyPhoneTimeOfDayFlags, 1 ; huey ; $88 + engine_flag wDailyPhoneTimeOfDayFlags, 2 ; gaven + engine_flag wDailyPhoneTimeOfDayFlags, 3 ; beth + engine_flag wDailyPhoneTimeOfDayFlags, 4 ; jose + engine_flag wDailyPhoneTimeOfDayFlags, 5 ; reena + engine_flag wDailyPhoneTimeOfDayFlags, 6 ; joey + engine_flag wDailyPhoneTimeOfDayFlags, 7 ; wade + engine_flag wDailyPhoneTimeOfDayFlags, 8 ; ralph + engine_flag wDailyPhoneTimeOfDayFlags, 9 ; liz ; $90 + engine_flag wDailyPhoneTimeOfDayFlags, 10 ; anthony + engine_flag wDailyPhoneTimeOfDayFlags, 11 ; todd + engine_flag wDailyPhoneTimeOfDayFlags, 12 ; gina + engine_flag wDailyPhoneTimeOfDayFlags, 13 ; arnie + engine_flag wDailyPhoneTimeOfDayFlags, 14 ; alan + engine_flag wDailyPhoneTimeOfDayFlags, 15 ; dana + engine_flag wDailyPhoneTimeOfDayFlags, 16 ; chad + engine_flag wDailyPhoneTimeOfDayFlags, 17 ; tully ; $98 + engine_flag wDailyPhoneTimeOfDayFlags, 18 ; brent + engine_flag wDailyPhoneTimeOfDayFlags, 19 ; tiffany + engine_flag wDailyPhoneTimeOfDayFlags, 20 ; vance + engine_flag wDailyPhoneTimeOfDayFlags, 21 ; wilton + engine_flag wDailyPhoneTimeOfDayFlags, 22 ; parry + engine_flag wDailyPhoneTimeOfDayFlags, 23 ; erin engine_flag wPlayerSpriteSetupFlags, 2 ; female player has been transformed into male - engine_flag wSwarmFlags, 2 ; dunsparce swarm ; $a0 + engine_flag wSwarmFlags, 2 ; dunsparce swarm ; $a0 engine_flag wSwarmFlags, 3 ; yanma swarm ; 80648 diff --git a/data/items/buena_prizes.asm b/data/items/buena_prizes.asm index d0a0e6b88..baac8a56d 100644 --- a/data/items/buena_prizes.asm +++ b/data/items/buena_prizes.asm @@ -9,5 +9,5 @@ BuenaPrizeItems: ; 8b15e db CARBOS, 5 db CALCIUM, 5 db HP_UP, 5 -BuenaPrizeItemsEnd: +.End ; 8b170 diff --git a/data/items/marts.asm b/data/items/marts.asm index fd156225d..a9fad3e69 100644 --- a/data/items/marts.asm +++ b/data/items/marts.asm @@ -34,7 +34,7 @@ Marts: ; 160a9 dw MartMtMoon dw MartIndigoPlateau dw MartUnderground -MartsEnd +.End ; 160ed diff --git a/data/items/mom_phone.asm b/data/items/mom_phone.asm index 288a14acc..5a5087c0e 100644 --- a/data/items/mom_phone.asm +++ b/data/items/mom_phone.asm @@ -11,7 +11,7 @@ MomItems_1: ; fd136 momitem 0, 180, MOM_ITEM, POKE_BALL momitem 0, 450, MOM_ITEM, ESCAPE_ROPE momitem 0, 500, MOM_ITEM, GREAT_BALL -MomItems_1End: ; fd15e +.End ; fd15e MomItems_2: ; fd15e momitem 900, 600, MOM_ITEM, SUPER_POTION @@ -24,4 +24,4 @@ MomItems_2: ; fd15e momitem 40000, 900, MOM_ITEM, HYPER_POTION momitem 50000, 8000, MOM_DOLL, DECO_PIKACHU_DOLL momitem 100000, 22800, MOM_DOLL, DECO_BIG_SNORLAX_DOLL -MomItems_2End: ; fd1ae +.End ; fd1ae diff --git a/data/items/mystery_gift_items.asm b/data/items/mystery_gift_items.asm index b2379071e..7f7125ef7 100644 --- a/data/items/mystery_gift_items.asm +++ b/data/items/mystery_gift_items.asm @@ -36,5 +36,5 @@ MysteryGiftItems: ; 2c725 db RARE_CANDY db BLUESKY_MAIL db MIRAGE_MAIL -MysteryGiftItemsEnd: +.End ; 2c74a diff --git a/data/maps/flypoints.asm b/data/maps/flypoints.asm index b41db0ea1..c24cd8d89 100644 --- a/data/maps/flypoints.asm +++ b/data/maps/flypoints.asm @@ -7,32 +7,32 @@ Flypoints: ; 91c5e ; landmark, spawn point const_def ; Johto - flypoint NEW_BARK, NEW_BARK_TOWN - flypoint CHERRYGROVE, CHERRYGROVE_CITY - flypoint VIOLET, VIOLET_CITY - flypoint AZALEA, AZALEA_TOWN - flypoint GOLDENROD, GOLDENROD_CITY - flypoint ECRUTEAK, ECRUTEAK_CITY - flypoint OLIVINE, OLIVINE_CITY - flypoint CIANWOOD, CIANWOOD_CITY - flypoint MAHOGANY, MAHOGANY_TOWN - flypoint LAKE, LAKE_OF_RAGE - flypoint BLACKTHORN, BLACKTHORN_CITY - flypoint MT_SILVER, SILVER_CAVE + flypoint NEW_BARK, NEW_BARK_TOWN + flypoint CHERRYGROVE, CHERRYGROVE_CITY + flypoint VIOLET, VIOLET_CITY + flypoint AZALEA, AZALEA_TOWN + flypoint GOLDENROD, GOLDENROD_CITY + flypoint ECRUTEAK, ECRUTEAK_CITY + flypoint OLIVINE, OLIVINE_CITY + flypoint CIANWOOD, CIANWOOD_CITY + flypoint MAHOGANY, MAHOGANY_TOWN + flypoint LAKE_OF_RAGE, LAKE_OF_RAGE + flypoint BLACKTHORN, BLACKTHORN_CITY + flypoint MT_SILVER, SILVER_CAVE ; Kanto KANTO_FLYPOINT EQU const_value - flypoint PALLET, PALLET_TOWN - flypoint VIRIDIAN, VIRIDIAN_CITY - flypoint PEWTER, PEWTER_CITY - flypoint CERULEAN, CERULEAN_CITY - flypoint VERMILION, VERMILION_CITY - flypoint ROCK_TUNNEL, ROCK_TUNNEL - flypoint LAVENDER, LAVENDER_TOWN - flypoint CELADON, CELADON_CITY - flypoint SAFFRON, SAFFRON_CITY - flypoint FUCHSIA, FUCHSIA_CITY - flypoint CINNABAR, CINNABAR_ISLAND - flypoint INDIGO, INDIGO_PLATEAU + flypoint PALLET, PALLET_TOWN + flypoint VIRIDIAN, VIRIDIAN_CITY + flypoint PEWTER, PEWTER_CITY + flypoint CERULEAN, CERULEAN_CITY + flypoint VERMILION, VERMILION_CITY + flypoint ROCK_TUNNEL, ROCK_TUNNEL + flypoint LAVENDER, LAVENDER_TOWN + flypoint CELADON, CELADON_CITY + flypoint SAFFRON, SAFFRON_CITY + flypoint FUCHSIA, FUCHSIA_CITY + flypoint CINNABAR, CINNABAR_ISLAND + flypoint INDIGO, INDIGO_PLATEAU db -1 ; 91c8f diff --git a/data/radio/oaks_pkmn_talk_routes.asm b/data/radio/oaks_pkmn_talk_routes.asm index ad7b6529d..419c4ec79 100644 --- a/data/radio/oaks_pkmn_talk_routes.asm +++ b/data/radio/oaks_pkmn_talk_routes.asm @@ -16,4 +16,4 @@ OaksPkmnTalkRoutes: map ROUTE_45 map ROUTE_36 map ROUTE_31 -OaksPkmnTalkRoutesEnd +.End diff --git a/data/radio/pnp_hidden_places.asm b/data/radio/pnp_hidden_places.asm index 4cf1987d3..3314976f5 100644 --- a/data/radio/pnp_hidden_places.asm +++ b/data/radio/pnp_hidden_places.asm @@ -10,4 +10,4 @@ PnP_HiddenPlaces: map ROUTE_16 map ROUTE_14 map CINNABAR_POKECENTER_2F_BETA -PnP_HiddenPlacesEnd +.End diff --git a/data/sprites/facings.asm b/data/sprites/facings.asm index 4d2a55364..166455707 100644 --- a/data/sprites/facings.asm +++ b/data/sprites/facings.asm @@ -32,10 +32,10 @@ Facings: ; 4049 dw FacingBoulderDust2 dw FacingGrass1 dw FacingGrass2 -FacingsEnd: +.End dw 0 -NUM_FACINGS EQU (FacingsEnd - Facings) / 2 +NUM_FACINGS EQU (Facings.End - Facings) / 2 ; Tables used as a reference to transform OAM data. diff --git a/data/trainers/gendered_trainers.asm b/data/trainers/gendered_trainers.asm index 758e3f0a4..90df4c5f8 100644 --- a/data/trainers/gendered_trainers.asm +++ b/data/trainers/gendered_trainers.asm @@ -26,7 +26,7 @@ MaleTrainers: ; 4e95d db SAGE db BIKER db SCIENTIST -MaleTrainersEnd +.End FemaleTrainers: ; 4e976 db MEDIUM @@ -39,4 +39,4 @@ FemaleTrainers: ; 4e976 db KIMONO_GIRL db POKEFANF db COOLTRAINERF -FemaleTrainersEnd +.End diff --git a/data/wild/unlocked_unowns.asm b/data/wild/unlocked_unowns.asm new file mode 100644 index 000000000..71b639036 --- /dev/null +++ b/data/wild/unlocked_unowns.asm @@ -0,0 +1,20 @@ +UnlockedUnownLetterSets: +; entries correspond to wUnlockedUnowns bits + dw .Set1 ; ENGINE_UNLOCKED_UNOWNS_A_TO_K + dw .Set2 ; ENGINE_UNLOCKED_UNOWNS_L_TO_R + dw .Set3 ; ENGINE_UNLOCKED_UNOWNS_S_TO_W + dw .Set4 ; ENGINE_UNLOCKED_UNOWNS_X_TO_Z +.End + +.Set1: + ; A B C D E F G H I J K + db 01, 02, 03, 04, 05, 06, 07, 08, 09, 10, 11, -1 +.Set2: + ; L M N O P Q R + db 12, 13, 14, 15, 16, 17, 18, -1 +.Set3: + ; S T U V W + db 19, 20, 21, 22, 23, -1 +.Set4: + ; X Y Z + db 24, 25, 26, -1 |