pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

wUnlockedUnowns engine flag constants

Browse Source 
Use local labels for "End"ings
This commit is contained in:
Rangi 2018-01-22 13:00:35 -05:00
parent 6ecf18aa52
commit 7cef012335
31 changed files with 199 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
constants/engine_flags.asm
View File

@ -54,14 +54,14 @@
const ENGINE_VOLCANOBADGE const ENGINE_VOLCANOBADGE
const ENGINE_EARTHBADGE const ENGINE_EARTHBADGE
; wUnlockedUnowns ; wUnlockedUnowns
const ENGINE_UNLOCKED_UNOWNS_1 const ENGINE_UNLOCKED_UNOWNS_A_TO_K
const ENGINE_UNLOCKED_UNOWNS_2 const ENGINE_UNLOCKED_UNOWNS_L_TO_R
const ENGINE_UNLOCKED_UNOWNS_3 const ENGINE_UNLOCKED_UNOWNS_S_TO_W
const ENGINE_UNLOCKED_UNOWNS_4 const ENGINE_UNLOCKED_UNOWNS_X_TO_Z
const ENGINE_UNLOCKED_UNOWNS_5 const ENGINE_UNLOCKED_UNOWNS_UNUSED_5
const ENGINE_UNLOCKED_UNOWNS_6 ; 30 const ENGINE_UNLOCKED_UNOWNS_UNUSED_6 ; 30
const ENGINE_UNLOCKED_UNOWNS_7 const ENGINE_UNLOCKED_UNOWNS_UNUSED_7
const ENGINE_UNLOCKED_UNOWNS_8 const ENGINE_UNLOCKED_UNOWNS_UNUSED_8
; wVisitedSpawns ; wVisitedSpawns
const ENGINE_FLYPOINT_KRISS_HOUSE const ENGINE_FLYPOINT_KRISS_HOUSE
const ENGINE_FLYPOINT_VIRIDIAN_POKECENTER const ENGINE_FLYPOINT_VIRIDIAN_POKECENTER

2
constants/map_data_constants.asm
View File

@ -97,7 +97,7 @@ const_value = -1
const SPAWN_OLIVINE const SPAWN_OLIVINE
const SPAWN_ECRUTEAK const SPAWN_ECRUTEAK
const SPAWN_MAHOGANY const SPAWN_MAHOGANY
const SPAWN_LAKE const SPAWN_LAKE_OF_RAGE
const SPAWN_BLACKTHORN const SPAWN_BLACKTHORN
const SPAWN_MT_SILVER const SPAWN_MT_SILVER
const SPAWN_FAST_SHIP const SPAWN_FAST_SHIP

2
data/decorations/mystery_gift_decos.asm
View File

@ -36,5 +36,5 @@ MysteryGiftDecos: ; 2c74a
db DECOFLAG_PIKACHU_BED db DECOFLAG_PIKACHU_BED
db DECOFLAG_GRIMER_DOLL db DECOFLAG_GRIMER_DOLL
db DECOFLAG_UNOWN_DOLL db DECOFLAG_UNOWN_DOLL
MysteryGiftDecosEnd .End
; 2c76f ; 2c76f

166
data/engine_flags.asm
View File

@ -1,10 +1,11 @@
engine_flag: MACRO engine_flag: MACRO
dwb \1, 1 << \2 ; location, bit
; (all locations are in WRAM bank 1)
dwb \1 + (\2 / 8), 1 << (\2 % 8)
ENDM ENDM
EngineFlags: ; 80462 EngineFlags: ; 80462
; location, bit ; entries correspond to ENGINE_* constants
; (all locations are in WRAM bank 1)
; pokegear ; pokegear
engine_flag wPokegearFlags, POKEGEAR_RADIO_CARD_F ; $0 engine_flag wPokegearFlags, POKEGEAR_RADIO_CARD_F ; $0
@ -63,45 +64,43 @@ EngineFlags: ; 80462
engine_flag wKantoBadges, EARTHBADGE engine_flag wKantoBadges, EARTHBADGE
; unown sets ; unown sets
engine_flag wUnlockedUnowns, 0 ; 1 engine_flag wUnlockedUnowns, 0 ; A-K
engine_flag wUnlockedUnowns, 1 ; 2 engine_flag wUnlockedUnowns, 1 ; L-R
engine_flag wUnlockedUnowns, 2 ; 3 engine_flag wUnlockedUnowns, 2 ; S-W
engine_flag wUnlockedUnowns, 3 ; 4 engine_flag wUnlockedUnowns, 3 ; X-Z
engine_flag wUnlockedUnowns, 4 ; 5 engine_flag wUnlockedUnowns, 4 ; unused 5
engine_flag wUnlockedUnowns, 5 ; 6 ; $30 engine_flag wUnlockedUnowns, 5 ; unused 6 ; $30
engine_flag wUnlockedUnowns, 6 ; 7 engine_flag wUnlockedUnowns, 6 ; unused 7
engine_flag wUnlockedUnowns, 7 ; 8 engine_flag wUnlockedUnowns, 7 ; unused 8
; fly ; fly
engine_flag wVisitedSpawns, 0 ; your house engine_flag wVisitedSpawns, SPAWN_HOME
engine_flag wVisitedSpawns, 1 ; viridian pokecenter engine_flag wVisitedSpawns, SPAWN_DEBUG
engine_flag wVisitedSpawns, 2 ; pallet engine_flag wVisitedSpawns, SPAWN_PALLET
engine_flag wVisitedSpawns, 3 ; viridian engine_flag wVisitedSpawns, SPAWN_VIRIDIAN
engine_flag wVisitedSpawns, 4 ; pewter engine_flag wVisitedSpawns, SPAWN_PEWTER
engine_flag wVisitedSpawns, 5 ; cerulean ; $38 engine_flag wVisitedSpawns, SPAWN_CERULEAN ; $38
engine_flag wVisitedSpawns, 6 ; rock tunnel engine_flag wVisitedSpawns, SPAWN_ROCK_TUNNEL
engine_flag wVisitedSpawns, 7 ; vermilion engine_flag wVisitedSpawns, SPAWN_VERMILION
engine_flag wVisitedSpawns + 1, 0 ; lavender engine_flag wVisitedSpawns, SPAWN_LAVENDER
engine_flag wVisitedSpawns + 1, 1 ; saffron engine_flag wVisitedSpawns, SPAWN_SAFFRON
engine_flag wVisitedSpawns + 1, 2 ; celadon engine_flag wVisitedSpawns, SPAWN_CELADON
engine_flag wVisitedSpawns + 1, 3 ; fuchsia engine_flag wVisitedSpawns, SPAWN_FUCHSIA
engine_flag wVisitedSpawns + 1, 4 ; cinnabar engine_flag wVisitedSpawns, SPAWN_CINNABAR
engine_flag wVisitedSpawns + 1, 5 ; indigo plateau ; $40 engine_flag wVisitedSpawns, SPAWN_INDIGO ; $40
engine_flag wVisitedSpawns + 1, 6 ; new bark engine_flag wVisitedSpawns, SPAWN_NEW_BARK
engine_flag wVisitedSpawns + 1, 7 ; cherrygrove engine_flag wVisitedSpawns, SPAWN_CHERRYGROVE
engine_flag wVisitedSpawns + 2, 0 ; violet engine_flag wVisitedSpawns, SPAWN_VIOLET
; union cave engine_flag wVisitedSpawns, SPAWN_AZALEA
engine_flag wVisitedSpawns + 2, 2 ; azalea engine_flag wVisitedSpawns, SPAWN_CIANWOOD
engine_flag wVisitedSpawns + 2, 3 ; cianwood engine_flag wVisitedSpawns, SPAWN_GOLDENROD
engine_flag wVisitedSpawns + 2, 4 ; goldenrod engine_flag wVisitedSpawns, SPAWN_OLIVINE
engine_flag wVisitedSpawns + 2, 5 ; olivine engine_flag wVisitedSpawns, SPAWN_ECRUTEAK ; $48
engine_flag wVisitedSpawns + 2, 6 ; ecruteak ; $48 engine_flag wVisitedSpawns, SPAWN_MAHOGANY
engine_flag wVisitedSpawns + 2, 7 ; mahogany engine_flag wVisitedSpawns, SPAWN_LAKE_OF_RAGE
engine_flag wVisitedSpawns + 3, 0 ; lake of rage engine_flag wVisitedSpawns, SPAWN_BLACKTHORN
engine_flag wVisitedSpawns + 3, 1 ; blackthorn engine_flag wVisitedSpawns, SPAWN_MT_SILVER
engine_flag wVisitedSpawns + 3, 2 ; silver cave engine_flag wVisitedSpawns, NUM_SPAWNS ; unused
; fast ship
engine_flag wVisitedSpawns + 3, 4 ; unused
engine_flag wLuckyNumberShowFlag, 0 ; lucky number show engine_flag wLuckyNumberShowFlag, 0 ; lucky number show
engine_flag wStatusFlags2, 3 ; ???? engine_flag wStatusFlags2, 3 ; ????
@ -142,22 +141,22 @@ EngineFlags: ; 80462
engine_flag wDailyRematchFlags, 5 ; reena engine_flag wDailyRematchFlags, 5 ; reena
engine_flag wDailyRematchFlags, 6 ; joey engine_flag wDailyRematchFlags, 6 ; joey
engine_flag wDailyRematchFlags, 7 ; wade engine_flag wDailyRematchFlags, 7 ; wade
engine_flag wDailyRematchFlags + 1, 0 ; ralph engine_flag wDailyRematchFlags, 8 ; ralph
engine_flag wDailyRematchFlags + 1, 1 ; liz engine_flag wDailyRematchFlags, 9 ; liz
engine_flag wDailyRematchFlags + 1, 2 ; anthony engine_flag wDailyRematchFlags, 10 ; anthony
engine_flag wDailyRematchFlags + 1, 3 ; todd ; $70 engine_flag wDailyRematchFlags, 11 ; todd ; $70
engine_flag wDailyRematchFlags + 1, 4 ; gina engine_flag wDailyRematchFlags, 12 ; gina
engine_flag wDailyRematchFlags + 1, 5 ; arnie engine_flag wDailyRematchFlags, 13 ; arnie
engine_flag wDailyRematchFlags + 1, 6 ; alan engine_flag wDailyRematchFlags, 14 ; alan
engine_flag wDailyRematchFlags + 1, 7 ; dana engine_flag wDailyRematchFlags, 15 ; dana
engine_flag wDailyRematchFlags + 2, 0 ; chad engine_flag wDailyRematchFlags, 16 ; chad
engine_flag wDailyRematchFlags + 2, 1 ; tully engine_flag wDailyRematchFlags, 17 ; tully
engine_flag wDailyRematchFlags + 2, 2 ; brent engine_flag wDailyRematchFlags, 18 ; brent
engine_flag wDailyRematchFlags + 2, 3 ; tiffany ; $78 engine_flag wDailyRematchFlags, 19 ; tiffany ; $78
engine_flag wDailyRematchFlags + 2, 4 ; vance engine_flag wDailyRematchFlags, 20 ; vance
engine_flag wDailyRematchFlags + 2, 5 ; wilton engine_flag wDailyRematchFlags, 21 ; wilton
engine_flag wDailyRematchFlags + 2, 6 ; parry engine_flag wDailyRematchFlags, 22 ; parry
engine_flag wDailyRematchFlags + 2, 7 ; erin engine_flag wDailyRematchFlags, 23 ; erin
engine_flag wDailyPhoneItemFlags, 0 ; beverly has nugget engine_flag wDailyPhoneItemFlags, 0 ; beverly has nugget
engine_flag wDailyPhoneItemFlags, 1 ; jose has star piece engine_flag wDailyPhoneItemFlags, 1 ; jose has star piece
@ -167,36 +166,33 @@ EngineFlags: ; 80462
engine_flag wDailyPhoneItemFlags, 5 ; liz has thunderstone engine_flag wDailyPhoneItemFlags, 5 ; liz has thunderstone
engine_flag wDailyPhoneItemFlags, 6 ; derek has nugget engine_flag wDailyPhoneItemFlags, 6 ; derek has nugget
engine_flag wDailyPhoneItemFlags, 7 ; tully has water stone engine_flag wDailyPhoneItemFlags, 7 ; tully has water stone
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 wDailyPhoneItemFlags + 1, 0 ; tiffany has pink bow engine_flag wDailyPhoneTimeOfDayFlags, 0 ; jack
engine_flag wDailyPhoneItemFlags + 1, 1 ; wilton has item (see EVENT_WILTON_HAS_*** in constants/event_flags.asm) engine_flag wDailyPhoneTimeOfDayFlags, 1 ; huey ; $88
engine_flag wDailyPhoneTimeOfDayFlags, 2 ; gaven
engine_flag wDailyPhoneTimeOfDayFlags, 0 engine_flag wDailyPhoneTimeOfDayFlags, 3 ; beth
engine_flag wDailyPhoneTimeOfDayFlags, 1 ; $88 engine_flag wDailyPhoneTimeOfDayFlags, 4 ; jose
engine_flag wDailyPhoneTimeOfDayFlags, 2 engine_flag wDailyPhoneTimeOfDayFlags, 5 ; reena
engine_flag wDailyPhoneTimeOfDayFlags, 3 engine_flag wDailyPhoneTimeOfDayFlags, 6 ; joey
engine_flag wDailyPhoneTimeOfDayFlags, 4 engine_flag wDailyPhoneTimeOfDayFlags, 7 ; wade
engine_flag wDailyPhoneTimeOfDayFlags, 5 engine_flag wDailyPhoneTimeOfDayFlags, 8 ; ralph
engine_flag wDailyPhoneTimeOfDayFlags, 6 engine_flag wDailyPhoneTimeOfDayFlags, 9 ; liz ; $90
engine_flag wDailyPhoneTimeOfDayFlags, 7 engine_flag wDailyPhoneTimeOfDayFlags, 10 ; anthony
engine_flag wDailyPhoneTimeOfDayFlags, 11 ; todd
engine_flag wDailyPhoneTimeOfDayFlags + 1, 0 engine_flag wDailyPhoneTimeOfDayFlags, 12 ; gina
engine_flag wDailyPhoneTimeOfDayFlags + 1, 1 ; $90 engine_flag wDailyPhoneTimeOfDayFlags, 13 ; arnie
engine_flag wDailyPhoneTimeOfDayFlags + 1, 2 engine_flag wDailyPhoneTimeOfDayFlags, 14 ; alan
engine_flag wDailyPhoneTimeOfDayFlags + 1, 3 engine_flag wDailyPhoneTimeOfDayFlags, 15 ; dana
engine_flag wDailyPhoneTimeOfDayFlags + 1, 4 engine_flag wDailyPhoneTimeOfDayFlags, 16 ; chad
engine_flag wDailyPhoneTimeOfDayFlags + 1, 5 engine_flag wDailyPhoneTimeOfDayFlags, 17 ; tully ; $98
engine_flag wDailyPhoneTimeOfDayFlags + 1, 6 engine_flag wDailyPhoneTimeOfDayFlags, 18 ; brent
engine_flag wDailyPhoneTimeOfDayFlags + 1, 7 engine_flag wDailyPhoneTimeOfDayFlags, 19 ; tiffany
engine_flag wDailyPhoneTimeOfDayFlags, 20 ; vance
engine_flag wDailyPhoneTimeOfDayFlags + 2, 0 engine_flag wDailyPhoneTimeOfDayFlags, 21 ; wilton
engine_flag wDailyPhoneTimeOfDayFlags + 2, 1 ; $98 engine_flag wDailyPhoneTimeOfDayFlags, 22 ; parry
engine_flag wDailyPhoneTimeOfDayFlags + 2, 2 engine_flag wDailyPhoneTimeOfDayFlags, 23 ; erin
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 wPlayerSpriteSetupFlags, 2 ; female player has been transformed into male engine_flag wPlayerSpriteSetupFlags, 2 ; female player has been transformed into male

2
data/items/buena_prizes.asm
View File

@ -9,5 +9,5 @@ BuenaPrizeItems: ; 8b15e
db CARBOS, 5 db CARBOS, 5
db CALCIUM, 5 db CALCIUM, 5
db HP_UP, 5 db HP_UP, 5
BuenaPrizeItemsEnd: .End
; 8b170 ; 8b170

2
data/items/marts.asm
View File

@ -34,7 +34,7 @@ Marts: ; 160a9
dw MartMtMoon dw MartMtMoon
dw MartIndigoPlateau dw MartIndigoPlateau
dw MartUnderground dw MartUnderground
MartsEnd .End
; 160ed ; 160ed

4
data/items/mom_phone.asm
View File

@ -11,7 +11,7 @@ MomItems_1: ; fd136
momitem 0, 180, MOM_ITEM, POKE_BALL momitem 0, 180, MOM_ITEM, POKE_BALL
momitem 0, 450, MOM_ITEM, ESCAPE_ROPE momitem 0, 450, MOM_ITEM, ESCAPE_ROPE
momitem 0, 500, MOM_ITEM, GREAT_BALL momitem 0, 500, MOM_ITEM, GREAT_BALL
MomItems_1End: ; fd15e .End ; fd15e
MomItems_2: ; fd15e MomItems_2: ; fd15e
momitem 900, 600, MOM_ITEM, SUPER_POTION momitem 900, 600, MOM_ITEM, SUPER_POTION
@ -24,4 +24,4 @@ MomItems_2: ; fd15e
momitem 40000, 900, MOM_ITEM, HYPER_POTION momitem 40000, 900, MOM_ITEM, HYPER_POTION
momitem 50000, 8000, MOM_DOLL, DECO_PIKACHU_DOLL momitem 50000, 8000, MOM_DOLL, DECO_PIKACHU_DOLL
momitem 100000, 22800, MOM_DOLL, DECO_BIG_SNORLAX_DOLL momitem 100000, 22800, MOM_DOLL, DECO_BIG_SNORLAX_DOLL
MomItems_2End: ; fd1ae .End ; fd1ae

2
data/items/mystery_gift_items.asm
View File

@ -36,5 +36,5 @@ MysteryGiftItems: ; 2c725
db RARE_CANDY db RARE_CANDY
db BLUESKY_MAIL db BLUESKY_MAIL
db MIRAGE_MAIL db MIRAGE_MAIL
MysteryGiftItemsEnd: .End
; 2c74a ; 2c74a

2
data/maps/flypoints.asm
View File

@ -16,7 +16,7 @@ Flypoints: ; 91c5e
flypoint OLIVINE, OLIVINE_CITY flypoint OLIVINE, OLIVINE_CITY
flypoint CIANWOOD, CIANWOOD_CITY flypoint CIANWOOD, CIANWOOD_CITY
flypoint MAHOGANY, MAHOGANY_TOWN flypoint MAHOGANY, MAHOGANY_TOWN
flypoint LAKE, LAKE_OF_RAGE flypoint LAKE_OF_RAGE, LAKE_OF_RAGE
flypoint BLACKTHORN, BLACKTHORN_CITY flypoint BLACKTHORN, BLACKTHORN_CITY
flypoint MT_SILVER, SILVER_CAVE flypoint MT_SILVER, SILVER_CAVE

2
data/radio/oaks_pkmn_talk_routes.asm
View File

@ -16,4 +16,4 @@ OaksPkmnTalkRoutes:
map ROUTE_45 map ROUTE_45
map ROUTE_36 map ROUTE_36
map ROUTE_31 map ROUTE_31
OaksPkmnTalkRoutesEnd .End

2
data/radio/pnp_hidden_places.asm
View File

@ -10,4 +10,4 @@ PnP_HiddenPlaces:
map ROUTE_16 map ROUTE_16
map ROUTE_14 map ROUTE_14
map CINNABAR_POKECENTER_2F_BETA map CINNABAR_POKECENTER_2F_BETA
PnP_HiddenPlacesEnd .End

4
data/sprites/facings.asm
View File

@ -32,10 +32,10 @@ Facings: ; 4049
dw FacingBoulderDust2 dw FacingBoulderDust2
dw FacingGrass1 dw FacingGrass1
dw FacingGrass2 dw FacingGrass2
FacingsEnd: .End
dw 0 dw 0
NUM_FACINGS EQU (FacingsEnd - Facings) / 2 NUM_FACINGS EQU (Facings.End - Facings) / 2
; Tables used as a reference to transform OAM data. ; Tables used as a reference to transform OAM data.

4
data/trainers/gendered_trainers.asm
View File

@ -26,7 +26,7 @@ MaleTrainers: ; 4e95d
db SAGE db SAGE
db BIKER db BIKER
db SCIENTIST db SCIENTIST
MaleTrainersEnd .End
FemaleTrainers: ; 4e976 FemaleTrainers: ; 4e976
db MEDIUM db MEDIUM
@ -39,4 +39,4 @@ FemaleTrainers: ; 4e976
db KIMONO_GIRL db KIMONO_GIRL
db POKEFANF db POKEFANF
db COOLTRAINERF db COOLTRAINERF
FemaleTrainersEnd .End

20
data/wild/unlocked_unowns.asm Normal file
View File

@ -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

24
engine/battle/core.asm
View File

@ -6642,7 +6642,7 @@ CheckUnownLetter: ; 3eb75
jr nc, .next jr nc, .next
; Is our letter in the set? ; Is our letter in the set?
ld hl, .LetterSets ld hl, UnlockedUnownLetterSets
add hl, de add hl, de
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
@ -6663,7 +6663,7 @@ CheckUnownLetter: ; 3eb75
inc e inc e
inc e inc e
ld a, e ld a, e
cp .Set1 - .LetterSets cp UnlockedUnownLetterSets.End - UnlockedUnownLetterSets
jr c, .loop jr c, .loop
; Hasn't been unlocked, or the letter is invalid ; Hasn't been unlocked, or the letter is invalid
@ -6675,26 +6675,8 @@ CheckUnownLetter: ; 3eb75
and a and a
ret ret
.LetterSets: INCLUDE "data/wild/unlocked_unowns.asm"
dw .Set1
dw .Set2
dw .Set3
dw .Set4
.Set1:
; A B C D E F G H I J K
db 01, 02, 03, 04, 05, 06, 07, 08, 09, 10, 11, $ff
.Set2:
; L M N O P Q R
db 12, 13, 14, 15, 16, 17, 18, $ff
.Set3:
; S T U V W
db 19, 20, 21, 22, 23, $ff
.Set4:
; X Y Z
db 24, 25, 26, $ff
; 3ebc7
Unreferenced_SwapBattlerLevels: ; 3ebc7 Unreferenced_SwapBattlerLevels: ; 3ebc7
push bc push bc

4
engine/events/battle_tower/get_trainer_class.asm
View File

@ -15,7 +15,7 @@ GetMobileOTTrainerClass: ; mobile function
.male_trainer_loop .male_trainer_loop
srl c srl c
ld a, c ld a, c
cp MaleTrainersEnd - MaleTrainers - 1 cp MaleTrainers.End - MaleTrainers - 1
jr nc, .male_trainer_loop jr nc, .male_trainer_loop
inc c inc c
@ -33,7 +33,7 @@ GetMobileOTTrainerClass: ; mobile function
.female_trainer_loop .female_trainer_loop
srl c srl c
ld a, c ld a, c
cp FemaleTrainersEnd - FemaleTrainers - 1 cp FemaleTrainers.End - FemaleTrainers - 1
jr nc, .female_trainer_loop jr nc, .female_trainer_loop
inc c inc c

2
engine/events/buena.asm
View File

@ -288,7 +288,7 @@ Buena_PrizeMenu: ; 8b0e2
dba .prizepoints dba .prizepoints
; 8b129 ; 8b129
NUM_BUENA_PRIZES EQU 9 ; ((BuenaPrizeItemsEnd - BuenaPrizeItems) / 2) NUM_BUENA_PRIZES EQU 9 ; ((BuenaPrizeItems.End - BuenaPrizeItems) / 2)
.indices ; 8b129 .indices ; 8b129
db NUM_BUENA_PRIZES db NUM_BUENA_PRIZES

4
engine/events/mom_phone.asm
View File

@ -1,5 +1,5 @@
NUM_MOM_ITEMS_1 EQUS "((MomItems_1End - MomItems_1) / 8)" NUM_MOM_ITEMS_1 EQUS "((MomItems_1.End - MomItems_1) / 8)"
NUM_MOM_ITEMS_2 EQUS "((MomItems_2End - MomItems_2) / 8)" NUM_MOM_ITEMS_2 EQUS "((MomItems_2.End - MomItems_2) / 8)"
const_value = 1 const_value = 1
const MOM_ITEM const MOM_ITEM

4
engine/intro_menu.asm
View File

@ -902,7 +902,7 @@ ShrinkPlayer: ; 610f
Intro_RotatePalettesLeftFrontpic: ; 616a Intro_RotatePalettesLeftFrontpic: ; 616a
ld hl, IntroFadePalettes ld hl, IntroFadePalettes
ld b, IntroFadePalettesEnd - IntroFadePalettes ld b, IntroFadePalettes.End - IntroFadePalettes
.loop .loop
ld a, [hli] ld a, [hli]
call DmgToCgbBGPals call DmgToCgbBGPals
@ -920,7 +920,7 @@ IntroFadePalettes: ; 0x617c
db %11111000 db %11111000
db %11110100 db %11110100
db %11100100 db %11100100
IntroFadePalettesEnd .End
; 6182 ; 6182
Intro_WipeInFrontpic: ; 6182 Intro_WipeInFrontpic: ; 6182

2
engine/mart.asm
View File

@ -121,7 +121,7 @@ LoadMartPointer: ; 15b10
GetMart: ; 15b31 GetMart: ; 15b31
ld a, e ld a, e
cp (MartsEnd - Marts) / 2 cp (Marts.End - Marts) / 2
jr c, .IsAMart jr c, .IsAMart
ld b, BANK(DefaultMart) ld b, BANK(DefaultMart)
ld de, DefaultMart ld de, DefaultMart

4
engine/mystery_gift.asm
View File

@ -1279,7 +1279,7 @@ InitMysteryGiftLayout: ; 105153 (41:5153)
ld hl, MysteryGiftGFX ld hl, MysteryGiftGFX
ld de, vTiles2 tile $00 ld de, vTiles2 tile $00
ld a, BANK(MysteryGiftGFX) ld a, BANK(MysteryGiftGFX)
ld bc, MysteryGiftGFXEnd - MysteryGiftGFX ld bc, MysteryGiftGFX.End - MysteryGiftGFX
call FarCopyBytes call FarCopyBytes
hlcoord 0, 0 hlcoord 0, 0
ld a, $42 ld a, $42
@ -1412,7 +1412,7 @@ InitMysteryGiftLayout: ; 105153 (41:5153)
MysteryGiftGFX: ; 105258 MysteryGiftGFX: ; 105258
INCBIN "gfx/mystery_gift/mystery_gift.2bpp" INCBIN "gfx/mystery_gift/mystery_gift.2bpp"
MysteryGiftGFXEnd: .End
Function105688: ; 105688 (41:5688) Function105688: ; 105688 (41:5688)
call ClearTileMap call ClearTileMap

4
engine/mystery_gift_2.asm
View File

@ -123,7 +123,7 @@ PrepMysteryGiftDataToSend: ; 2c642 (b:4642)
MysteryGiftGetItemHeldEffect: ; 2c708 (b:4708) MysteryGiftGetItemHeldEffect: ; 2c708 (b:4708)
ld a, c ld a, c
cp MysteryGiftItemsEnd - MysteryGiftItems cp MysteryGiftItems.End - MysteryGiftItems
jr nc, MysteryGiftFallbackItem jr nc, MysteryGiftFallbackItem
ld hl, MysteryGiftItems ld hl, MysteryGiftItems
ld b, 0 ld b, 0
@ -133,7 +133,7 @@ MysteryGiftGetItemHeldEffect: ; 2c708 (b:4708)
MysteryGiftGetDecoration: ; 2c715 (b:4715) MysteryGiftGetDecoration: ; 2c715 (b:4715)
ld a, c ld a, c
cp MysteryGiftDecosEnd - MysteryGiftDecos cp MysteryGiftDecos.End - MysteryGiftDecos
jr nc, MysteryGiftFallbackItem jr nc, MysteryGiftFallbackItem
ld hl, MysteryGiftDecos ld hl, MysteryGiftDecos
ld b, 0 ld b, 0

4
engine/radio.asm
View File

@ -205,7 +205,7 @@ OaksPkmnTalk4:
.sample .sample
call Random call Random
and %11111 and %11111
cp (OaksPkmnTalkRoutesEnd - OaksPkmnTalkRoutes) / 2 cp (OaksPkmnTalkRoutes.End - OaksPkmnTalkRoutes) / 2
jr nc, .sample jr nc, .sample
; We now have a number between 0 and 14. ; We now have a number between 0 and 14.
ld hl, OaksPkmnTalkRoutes ld hl, OaksPkmnTalkRoutes
@ -1330,7 +1330,7 @@ PnP_odd:
PeoplePlaces6: ; Places PeoplePlaces6: ; Places
call Random call Random
cp (PnP_HiddenPlacesEnd - PnP_HiddenPlaces) / 2 cp (PnP_HiddenPlaces.End - PnP_HiddenPlaces) / 2
jr nc, PeoplePlaces6 jr nc, PeoplePlaces6
ld hl, PnP_HiddenPlaces ld hl, PnP_HiddenPlaces
ld c, a ld c, a

4
engine/scripting.asm
View File

@ -1294,7 +1294,7 @@ Script_earthquake:
ld hl, EarthquakeMovement ld hl, EarthquakeMovement
ld de, wEarthquakeMovementDataBuffer ld de, wEarthquakeMovementDataBuffer
ld bc, EarthquakeMovementEnd - EarthquakeMovement ld bc, EarthquakeMovement.End - EarthquakeMovement
call CopyBytes call CopyBytes
call GetScriptByte call GetScriptByte
ld [wEarthquakeMovementDataBuffer + 1], a ld [wEarthquakeMovementDataBuffer + 1], a
@ -1312,7 +1312,7 @@ EarthquakeMovement:
step_shake 16 ; the 16 gets overwritten with the script byte step_shake 16 ; the 16 gets overwritten with the script byte
step_sleep 16 ; the 16 gets overwritten with the lower 6 bits of the script byte step_sleep 16 ; the 16 gets overwritten with the lower 6 bits of the script byte
step_end step_end
EarthquakeMovementEnd .End
Script_loadpikachudata: Script_loadpikachudata:

28
lib/mobile/main.asm
View File

@ -2169,7 +2169,7 @@ Function110ddd: ; 110ddd
push de push de
push bc push bc
push hl push hl
ld b, URIPrefixEnd - URIPrefix ld b, URIPrefix.End - URIPrefix
ld de, URIPrefix ld de, URIPrefix
.asm_110e53 .asm_110e53
ld a, [de] ld a, [de]
@ -2180,7 +2180,7 @@ Function110ddd: ; 110ddd
dec b dec b
jr nz, .asm_110e53 jr nz, .asm_110e53
push hl push hl
ld b, HTTPUploadURLEnd - HTTPUploadURL ld b, HTTPUploadURL.End - HTTPUploadURL
ld c, $0 ld c, $0
ld de, HTTPUploadURL ld de, HTTPUploadURL
.asm_110e64 .asm_110e64
@ -2197,7 +2197,7 @@ Function110ddd: ; 110ddd
.asm_110e70 .asm_110e70
pop hl pop hl
push hl push hl
ld b, HTTPRankingURLEnd - HTTPRankingURL ld b, HTTPRankingURL.End - HTTPRankingURL
ld c, $0 ld c, $0
ld de, HTTPRankingURL ld de, HTTPRankingURL
.asm_110e79 .asm_110e79
@ -2214,7 +2214,7 @@ Function110ddd: ; 110ddd
.asm_110e86 .asm_110e86
pop hl pop hl
push hl push hl
ld b, HTTPUtilityURLEnd - HTTPUtilityURL ld b, HTTPUtilityURL.End - HTTPUtilityURL
ld c, $0 ld c, $0
ld de, HTTPUtilityURL ld de, HTTPUtilityURL
.asm_110e8f .asm_110e8f
@ -2233,7 +2233,7 @@ Function110ddd: ; 110ddd
.asm_110ea2 .asm_110ea2
pop hl pop hl
ld b, HTTPDownloadURLEnd - HTTPDownloadURL ld b, HTTPDownloadURL.End - HTTPDownloadURL
ld c, $0 ld c, $0
ld de, HTTPDownloadURL ld de, HTTPDownloadURL
.asm_110eaa .asm_110eaa
@ -2391,23 +2391,23 @@ Function110f07: ; 110f07
URIPrefix: ; 0x110fad URIPrefix: ; 0x110fad
db "http://" db "http://"
URIPrefixEnd .End
HTTPDownloadURL: ; 0x110fb4 HTTPDownloadURL: ; 0x110fb4
db "gameboy.datacenter.ne.jp/cgb/download" db "gameboy.datacenter.ne.jp/cgb/download"
HTTPDownloadURLEnd .End
HTTPUploadURL: ; 0x110fd9 HTTPUploadURL: ; 0x110fd9
db "gameboy.datacenter.ne.jp/cgb/upload" db "gameboy.datacenter.ne.jp/cgb/upload"
HTTPUploadURLEnd .End
HTTPUtilityURL: ; 0x110ffc HTTPUtilityURL: ; 0x110ffc
db "gameboy.datacenter.ne.jp/cgb/utility" db "gameboy.datacenter.ne.jp/cgb/utility"
HTTPUtilityURLEnd .End
HTTPRankingURL: ; 0x111020 HTTPRankingURL: ; 0x111020
db "gameboy.datacenter.ne.jp/cgb/ranking" db "gameboy.datacenter.ne.jp/cgb/ranking"
HTTPRankingURLEnd .End
Function111044: ; 111044 Function111044: ; 111044
ld hl, $c827 ld hl, $c827
@ -2749,7 +2749,7 @@ endr
jp z, Function1113f7 jp z, Function1113f7
.asm_111251 .asm_111251
ld b, URIPrefixEnd - URIPrefix ld b, URIPrefix.End - URIPrefix
ld de, URIPrefix ld de, URIPrefix
.asm_111256 .asm_111256
ld a, [de] ld a, [de]
@ -2760,7 +2760,7 @@ endr
dec b dec b
jr nz, .asm_111256 jr nz, .asm_111256
push hl push hl
ld b, HTTPDownloadURLEnd - HTTPDownloadURL ld b, HTTPDownloadURL.End - HTTPDownloadURL
ld c, $0 ld c, $0
ld de, HTTPDownloadURL ld de, HTTPDownloadURL
.asm_111268 .asm_111268
@ -2777,7 +2777,7 @@ endr
.asm_111275 .asm_111275
pop hl pop hl
push hl push hl
ld b, HTTPRankingURLEnd - HTTPRankingURL ld b, HTTPRankingURL.End - HTTPRankingURL
ld c, $0 ld c, $0
ld de, HTTPRankingURL ld de, HTTPRankingURL
.asm_11127e .asm_11127e
@ -2795,7 +2795,7 @@ endr
.asm_11128f .asm_11128f
pop hl pop hl
ld b, HTTPUploadURLEnd - HTTPUploadURL ld b, HTTPUploadURL.End - HTTPUploadURL
ld c, $0 ld c, $0
ld de, HTTPUploadURL ld de, HTTPUploadURL
.asm_111297 .asm_111297

2
maps/RuinsOfAlphAerodactylChamber.asm
View File

@ -58,7 +58,7 @@ MapRuinsOfAlphAerodactylChamberSignpost2Script:
UnknownScript_0x58df7: UnknownScript_0x58df7:
setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
setevent EVENT_SOLVED_AERODACTYL_PUZZLE setevent EVENT_SOLVED_AERODACTYL_PUZZLE
setflag ENGINE_UNLOCKED_UNOWNS_3 setflag ENGINE_UNLOCKED_UNOWNS_S_TO_W
setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1 setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1
earthquake 30 earthquake 30
showemote EMOTE_SHOCK, PLAYER, 15 showemote EMOTE_SHOCK, PLAYER, 15

2
maps/RuinsOfAlphHoOhChamber.asm
View File

@ -59,7 +59,7 @@ MapRuinsOfAlphHoOhChamberSignpost2Script:
UnknownScript_0x585ba: UnknownScript_0x585ba:
setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
setevent EVENT_SOLVED_HO_OH_PUZZLE setevent EVENT_SOLVED_HO_OH_PUZZLE
setflag ENGINE_UNLOCKED_UNOWNS_4 setflag ENGINE_UNLOCKED_UNOWNS_X_TO_Z
setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1 setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1
earthquake 30 earthquake 30
showemote EMOTE_SHOCK, PLAYER, 15 showemote EMOTE_SHOCK, PLAYER, 15

2
maps/RuinsOfAlphKabutoChamber.asm
View File

@ -65,7 +65,7 @@ MapRuinsOfAlphKabutoChamberSignpost2Script:
UnknownScript_0x58778: UnknownScript_0x58778:
setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
setevent EVENT_SOLVED_KABUTO_PUZZLE setevent EVENT_SOLVED_KABUTO_PUZZLE
setflag ENGINE_UNLOCKED_UNOWNS_1 setflag ENGINE_UNLOCKED_UNOWNS_A_TO_K
setevent EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST setevent EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST
setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1 setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1
earthquake 30 earthquake 30

2
maps/RuinsOfAlphOmanyteChamber.asm
View File

@ -59,7 +59,7 @@ MapRuinsOfAlphOmanyteChamberSignpost2Script:
UnknownScript_0x58c36: UnknownScript_0x58c36:
setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
setevent EVENT_SOLVED_OMANYTE_PUZZLE setevent EVENT_SOLVED_OMANYTE_PUZZLE
setflag ENGINE_UNLOCKED_UNOWNS_2 setflag ENGINE_UNLOCKED_UNOWNS_L_TO_R
setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1 setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1
earthquake 30 earthquake 30
showemote EMOTE_SHOCK, PLAYER, 15 showemote EMOTE_SHOCK, PLAYER, 15

4
mobile/fixed_words.asm
View File

@ -3037,7 +3037,7 @@ EZChat_GetSeenPokemonByKana: ; 11d3ba
ld [wcd34], a ld [wcd34], a
ld hl, EZChat_SortedWords ld hl, EZChat_SortedWords
ld a, (EZChat_SortedWordsEnd - EZChat_SortedWords) / 4 ld a, (EZChat_SortedWords.End - EZChat_SortedWords) / 4
.MasterLoop: ; 11d3ef .MasterLoop: ; 11d3ef
push af push af
@ -4196,4 +4196,4 @@ x = $d012
macro_11f23c $15 ; wa macro_11f23c $15 ; wa
x = $d000 x = $d000
macro_11f23c $09 ; end macro_11f23c $09 ; end
EZChat_SortedWordsEnd: .End

2
mobile/mobile_46.asm
View File

@ -4105,12 +4105,10 @@ BattleTowerRoomMenu_IncrementJumptable: ; 119e2e (46:5e2e)
XGameCodePrefix: ; 119e33 XGameCodePrefix: ; 119e33
INCBIN "data/mobile/x-game-code-prefix.txt" INCBIN "data/mobile/x-game-code-prefix.txt"
XGameCodePrefixEnd:
;119e40 ;119e40
XGameResultPrefix: ; 119e40 XGameResultPrefix: ; 119e40
INCBIN "data/mobile/x-game-result-prefix.txt" INCBIN "data/mobile/x-game-result-prefix.txt"
XGameResultPrefixEnd:
; 119e4f ; 119e4f
Function119e4f: ; 119e4f Function119e4f: ; 119e4f