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

Merge branch 'master' of https://github.com/pret/pokecrystal

Browse Source 
# Conflicts:
#	macros/scripts/maps.asm
This commit is contained in:
Remy Oukaour 2017-12-28 20:56:21 -05:00
commit 4c35f3ac85
156 changed files with 2060 additions and 1926 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants/deco_constants.asm
View File

@ -57,7 +57,7 @@ const_value = 1
deco: MACRO
const DECO_\1
enum DECOFLAG_\1
endm
ENDM
; decorations:
; - DecorationAttributes (see data/decorations/attributes.asm)

28
constants/engine_flags.asm
View File

@ -16,14 +16,14 @@
const ENGINE_DST
; wUnusedTwoDayTimerOn
const ENGINE_0A
; StatusFlags
; wStatusFlags
const ENGINE_POKEDEX
const ENGINE_UNOWN_DEX
const ENGINE_POKERUS
const ENGINE_ROCKET_SIGNAL_ON_CH20
const ENGINE_CREDITS_SKIP
const ENGINE_BUG_CONTEST_ON ; 10
; StatusFlags2
; wStatusFlags2
const ENGINE_BUG_CONTEST_TIMER
const ENGINE_SAFARI_ZONE
const ENGINE_ROCKETS_IN_RADIO_TOWER
@ -31,11 +31,11 @@
const ENGINE_GIVE_POKERUS
const ENGINE_FLORIA
const ENGINE_ROCKETS_IN_MAHOGANY
; BikeFlags
; wBikeFlags
const ENGINE_STRENGTH_ACTIVE
const ENGINE_ALWAYS_ON_BIKE
const ENGINE_DOWNHILL
; JohtoBadges
; wJohtoBadges
const ENGINE_ZEPHYRBADGE
const ENGINE_HIVEBADGE
const ENGINE_PLAINBADGE
@ -44,7 +44,7 @@
const ENGINE_STORMBADGE ; 20
const ENGINE_GLACIERBADGE
const ENGINE_RISINGBADGE
; KantoBadges
; wKantoBadges
const ENGINE_BOULDERBADGE
const ENGINE_CASCADEBADGE
const ENGINE_THUNDERBADGE
@ -53,7 +53,7 @@
const ENGINE_MARSHBADGE
const ENGINE_VOLCANOBADGE
const ENGINE_EARTHBADGE
; UnlockedUnowns
; wUnlockedUnowns
const ENGINE_UNLOCKED_UNOWNS_1
const ENGINE_UNLOCKED_UNOWNS_2
const ENGINE_UNLOCKED_UNOWNS_3
@ -62,7 +62,7 @@
const ENGINE_UNLOCKED_UNOWNS_6 ; 30
const ENGINE_UNLOCKED_UNOWNS_7
const ENGINE_UNLOCKED_UNOWNS_8
; VisitedSpawns
; wVisitedSpawns
const ENGINE_FLYPOINT_KRISS_HOUSE
const ENGINE_FLYPOINT_VIRIDIAN_POKECENTER
const ENGINE_FLYPOINT_PALLET
@ -92,9 +92,9 @@
const ENGINE_FLYPOINT_UNUSED
; wLuckyNumberShowFlag
const ENGINE_LUCKY_NUMBER_SHOW
; StatusFlags2
; wStatusFlags2
const ENGINE_4F
; DailyFlags
; wDailyFlags
const ENGINE_KURT_MAKING_BALLS ; 50
const ENGINE_DAILY_BUG_CONTEST
const ENGINE_SPECIAL_WILDDATA
@ -103,7 +103,7 @@
const ENGINE_SHUCKLE_GIVEN
const ENGINE_GOLDENROD_UNDERGROUND_MERCHANT_CLOSED
const ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY
; WeeklyFlags
; wWeeklyFlags
const ENGINE_MT_MOON_SQUARE_CLEFAIRY
const ENGINE_UNION_CAVE_LAPRAS
const ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
@ -112,12 +112,12 @@
const ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT
const ENGINE_DAILY_MOVE_TUTOR
const ENGINE_BUENAS_PASSWORD
; SwarmFlags
; wSwarmFlags
const ENGINE_BUENAS_PASSWORD_2 ; 60
const ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON
; GameTimerPause
; wGameTimerPause
const ENGINE_62
; PlayerGender
; wPlayerGender
const ENGINE_PLAYER_IS_FEMALE
; wCelebiEvent
const ENGINE_HAVE_EXAMINED_GS_BALL
@ -184,7 +184,7 @@
const ENGINE_ERIN_SATURDAY_NIGHT
; wPlayerSpriteSetupFlags
const ENGINE_KRIS_IN_CABLE_CLUB
; SwarmFlags
; wSwarmFlags
const ENGINE_DUNSPARCE_SWARM ; a0
const ENGINE_YANMA_SWARM
NUM_ENGINE_FLAGS EQU const_value

8
constants/map_constants.asm
View File

@ -1,9 +1,9 @@
newgroup: macro
newgroup: MACRO
const_value = const_value + 1
enum_start 1
endm
ENDM
mapgroup: macro
mapgroup: MACRO
;\1: map id
;\2: height: in blocks
;\3: width: in blocks
@ -11,7 +11,7 @@ GROUP_\1 EQU const_value
enum MAP_\1
\1_HEIGHT EQU \2
\1_WIDTH EQU \3
endm
ENDM
; map group ids
; `newgroup` indexes are for:

4
constants/wram_constants.asm
View File

@ -131,7 +131,7 @@ DAY_CARE_DEPOSIT EQU 3
const DEXMODE_ABC
const DEXMODE_UNOWN
; JohtoBadges:
; wJohtoBadges:
const_def
const ZEPHYRBADGE
const HIVEBADGE
@ -143,7 +143,7 @@ DAY_CARE_DEPOSIT EQU 3
const RISINGBADGE
NUM_JOHTO_BADGES EQU const_value
; KantoBadges:
; wKantoBadges:
const_def
const BOULDERBADGE
const CASCADEBADGE

2
data/battle_anims/objects.asm
View File

@ -14,7 +14,7 @@ battleanimobj: MACRO
db \4 ; callback
db \5 ; palette
db \6 ; tile offset
endm
ENDM
BattleAnimObjects: ; ccb56
; entries correspond to ANIM_OBJ_* constants

2
data/emotes.asm
View File

@ -2,7 +2,7 @@ emote: MACRO
; graphics pointer, length, starting tile
dw \1
db \2 tiles, BANK(\1)
dw VTiles1 tile \3
dw vTiles1 tile \3
ENDM
Emotes: ; 144d

184
data/engine_flags.asm
View File

@ -26,110 +26,110 @@ EngineFlags: ; 80462
engine_flag wUnusedTwoDayTimerOn, 0 ; unused, possibly related to a 2-day timer
engine_flag StatusFlags, 0 ; pokedex
engine_flag StatusFlags, 1 ; unown dex
engine_flag StatusFlags, 3 ; pokerus
engine_flag StatusFlags, 4 ; rocket signal on ch20
engine_flag StatusFlags, 6 ; credits skip
engine_flag StatusFlags, 7 ; bug contest on ; $10
engine_flag StatusFlags2, 2 ; bug contest timer
engine_flag StatusFlags2, 1 ; safari zone?
engine_flag StatusFlags2, 0 ; rockets in radio tower
engine_flag StatusFlags2, 4 ; bike shop call enabled (1024 bike steps reqd)
engine_flag StatusFlags2, 5 ; give pokerus
engine_flag StatusFlags2, 6 ; berry -> berry juice when trading?
engine_flag StatusFlags2, 7 ; rockets in mahogany
engine_flag wStatusFlags, 0 ; pokedex
engine_flag wStatusFlags, 1 ; unown dex
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 wStatusFlags2, 2 ; bug contest timer
engine_flag wStatusFlags2, 1 ; safari zone?
engine_flag wStatusFlags2, 0 ; rockets in radio tower
engine_flag wStatusFlags2, 4 ; bike shop call enabled (1024 bike steps reqd)
engine_flag wStatusFlags2, 5 ; give pokerus
engine_flag wStatusFlags2, 6 ; berry -> berry juice when trading?
engine_flag wStatusFlags2, 7 ; rockets in mahogany
engine_flag BikeFlags, 0 ; strength active ; $18
engine_flag BikeFlags, 1 ; always on bike (cant surf)
engine_flag BikeFlags, 2 ; downhill (cycling road)
engine_flag wBikeFlags, 0 ; strength active ; $18
engine_flag wBikeFlags, 1 ; always on bike (cant surf)
engine_flag wBikeFlags, 2 ; downhill (cycling road)
engine_flag JohtoBadges, 0 ; zephyrbadge
engine_flag JohtoBadges, 1 ; hivebadge
engine_flag JohtoBadges, 2 ; plainbadge
engine_flag JohtoBadges, 3 ; fogbadge
engine_flag JohtoBadges, 4 ; mineralbadge
engine_flag JohtoBadges, 5 ; stormbadge ; $20
engine_flag JohtoBadges, 6 ; glacierbadge
engine_flag JohtoBadges, 7 ; risingbadge
engine_flag wJohtoBadges, 0 ; zephyrbadge
engine_flag wJohtoBadges, 1 ; hivebadge
engine_flag wJohtoBadges, 2 ; plainbadge
engine_flag wJohtoBadges, 3 ; fogbadge
engine_flag wJohtoBadges, 4 ; mineralbadge
engine_flag wJohtoBadges, 5 ; stormbadge ; $20
engine_flag wJohtoBadges, 6 ; glacierbadge
engine_flag wJohtoBadges, 7 ; risingbadge
engine_flag KantoBadges, 0 ; boulderbadge
engine_flag KantoBadges, 1 ; cascadebadge
engine_flag KantoBadges, 2 ; thunderbadge
engine_flag KantoBadges, 3 ; rainbowbadge
engine_flag KantoBadges, 4 ; soulbadge
engine_flag KantoBadges, 5 ; marshbadge ; $28
engine_flag KantoBadges, 6 ; volcanobadge
engine_flag KantoBadges, 7 ; earthbadge
engine_flag wKantoBadges, 0 ; boulderbadge
engine_flag wKantoBadges, 1 ; cascadebadge
engine_flag wKantoBadges, 2 ; thunderbadge
engine_flag wKantoBadges, 3 ; rainbowbadge
engine_flag wKantoBadges, 4 ; soulbadge
engine_flag wKantoBadges, 5 ; marshbadge ; $28
engine_flag wKantoBadges, 6 ; volcanobadge
engine_flag wKantoBadges, 7 ; earthbadge
; unown sets
engine_flag UnlockedUnowns, 0 ; 1
engine_flag UnlockedUnowns, 1 ; 2
engine_flag UnlockedUnowns, 2 ; 3
engine_flag UnlockedUnowns, 3 ; 4
engine_flag UnlockedUnowns, 4 ; 5
engine_flag UnlockedUnowns, 5 ; 6 ; $30
engine_flag UnlockedUnowns, 6 ; 7
engine_flag UnlockedUnowns, 7 ; 8
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
; fly
engine_flag VisitedSpawns, 0 ; your house
engine_flag VisitedSpawns, 1 ; viridian pokecenter
engine_flag VisitedSpawns, 2 ; pallet
engine_flag VisitedSpawns, 3 ; viridian
engine_flag VisitedSpawns, 4 ; pewter
engine_flag VisitedSpawns, 5 ; cerulean ; $38
engine_flag VisitedSpawns, 6 ; rock tunnel
engine_flag VisitedSpawns, 7 ; vermilion
engine_flag VisitedSpawns + 1, 0 ; lavender
engine_flag VisitedSpawns + 1, 1 ; saffron
engine_flag VisitedSpawns + 1, 2 ; celadon
engine_flag VisitedSpawns + 1, 3 ; fuchsia
engine_flag VisitedSpawns + 1, 4 ; cinnabar
engine_flag VisitedSpawns + 1, 5 ; indigo plateau ; $40
engine_flag VisitedSpawns + 1, 6 ; new bark
engine_flag VisitedSpawns + 1, 7 ; cherrygrove
engine_flag VisitedSpawns + 2, 0 ; violet
; union cave
engine_flag VisitedSpawns + 2, 2 ; azalea
engine_flag VisitedSpawns + 2, 3 ; cianwood
engine_flag VisitedSpawns + 2, 4 ; goldenrod
engine_flag VisitedSpawns + 2, 5 ; olivine
engine_flag VisitedSpawns + 2, 6 ; ecruteak ; $48
engine_flag VisitedSpawns + 2, 7 ; mahogany
engine_flag VisitedSpawns + 3, 0 ; lake of rage
engine_flag VisitedSpawns + 3, 1 ; blackthorn
engine_flag VisitedSpawns + 3, 2 ; silver cave
; fast ship
engine_flag VisitedSpawns + 3, 4 ; unused
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 wLuckyNumberShowFlag, 0 ; lucky number show
engine_flag StatusFlags2, 3 ; ????
engine_flag wStatusFlags2, 3 ; ????
engine_flag DailyFlags, 0 ; kurt making balls ; $50
engine_flag DailyFlags, 1 ; ????
engine_flag DailyFlags, 2 ; special wilddata?
engine_flag DailyFlags, 3 ; time capsule (24h wait)
engine_flag DailyFlags, 4 ; all fruit trees
engine_flag DailyFlags, 5 ; shuckle given
engine_flag DailyFlags, 6 ; goldenrod underground merchant closed
engine_flag DailyFlags, 7 ; fought in trainer hall today
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)
engine_flag wDailyFlags, 4 ; all fruit trees
engine_flag wDailyFlags, 5 ; shuckle given
engine_flag wDailyFlags, 6 ; goldenrod underground merchant closed
engine_flag wDailyFlags, 7 ; fought in trainer hall today
engine_flag WeeklyFlags, 0 ; mt moon square clefairy ; $58
engine_flag WeeklyFlags, 1 ; union cave lapras
engine_flag WeeklyFlags, 2 ; goldenrod underground haircut used
engine_flag WeeklyFlags, 3 ; goldenrod mall happiness event floor05 object07
engine_flag WeeklyFlags, 4 ; tea in blues house
engine_flag WeeklyFlags, 5 ; indigo plateau rival fight
engine_flag WeeklyFlags, 6 ; move tutor
engine_flag WeeklyFlags, 7 ; buenas password
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
engine_flag wWeeklyFlags, 4 ; tea in blues house
engine_flag wWeeklyFlags, 5 ; indigo plateau rival fight
engine_flag wWeeklyFlags, 6 ; move tutor
engine_flag wWeeklyFlags, 7 ; buenas password
engine_flag SwarmFlags, 0 ; buenas password 2
engine_flag SwarmFlags, 1 ; goldenrod dept store sale is on
engine_flag wSwarmFlags, 0 ; buenas password 2
engine_flag wSwarmFlags, 1 ; goldenrod dept store sale is on
engine_flag GameTimerPause, 7 ; $62
engine_flag wGameTimerPause, 7 ; $62
engine_flag PlayerGender, 0 ; player is female
engine_flag wPlayerGender, 0 ; player is female
engine_flag wCelebiEvent, 2 ; have gs ball after kurt examined it
@ -200,7 +200,7 @@ EngineFlags: ; 80462
engine_flag wPlayerSpriteSetupFlags, 2 ; female player has been transformed into male
engine_flag SwarmFlags, 2 ; dunsparce swarm ; $a0
engine_flag SwarmFlags, 3 ; yanma swarm
engine_flag wSwarmFlags, 2 ; dunsparce swarm ; $a0
engine_flag wSwarmFlags, 3 ; yanma swarm
; 80648

2
data/items/mom_phone.asm
View File

@ -1,4 +1,4 @@
momitem: macro
momitem: MACRO
; money to trigger, cost, kind, item
dt \1
dt \2

4
data/map_objects.asm
View File

@ -1,7 +1,7 @@
sprite_movement_data: macro
sprite_movement_data: MACRO
db \1, \2, \3, \4, \5
dn \6, 0
endm
ENDM
SpriteMovementData:: ; 4273
; entries correspond to SPRITEMOVEDATA_* constants

4
data/odd_eggs.asm
View File

@ -1,7 +1,7 @@
prob: macro
prob: MACRO
prob_total = prob_total + (\1)
dw prob_total * $ffff / 100
endm
ENDM
OddEggProbabilities:
prob_total = 0

4
data/palettes/town_map.asm
View File

@ -6,13 +6,13 @@
const PAL_TOWNMAP_POI ; 4
const PAL_TOWNMAP_POI_MTN ; 5
townmappals: macro
townmappals: MACRO
rept _NARG / 2
dn PAL_TOWNMAP_\2, PAL_TOWNMAP_\1
shift
shift
endr
endm
ENDM
; gfx/pokegear/town_map.png
townmappals EARTH, EARTH, EARTH, MOUNTAIN, MOUNTAIN, MOUNTAIN

4
data/phone_contacts.asm
View File

@ -1,4 +1,4 @@
phone: macro
phone: MACRO
; trainer class, trainer id, map, ?, script 1, ?, script 2
db \1, \2
map \3
@ -6,7 +6,7 @@ phone: macro
dba \5
db \6
dba \7
endm
ENDM
PhoneContacts: ; 9045f
; entries correspond to PHONE_* constants

4
data/phone_special.asm
View File

@ -1,9 +1,9 @@
specialcall: macro
specialcall: MACRO
; condition, contact, script
dw \1
db \2
dba \3
endm
ENDM
SpecialPhoneCallList: ; 90627
; entries correspond to SPECIALCALL_* constants

4
data/unown_words.asm
View File

@ -1,11 +1,11 @@
unownword: macro
unownword: MACRO
x = 1
rept STRLEN(\1)
db STRSUB(\1, x, 1) - $40
x = x + 1
endr
db -1
endm
ENDM
UnownWords: ; fba5a
; entries correspond to Unown forms

4
data/wild/roammon_maps.asm
View File

@ -1,7 +1,7 @@
; Maps that roaming monsters can be on, and possible maps they can jump to.
; Notably missing are Route 40 and Route 41, which are water routes.
roam_map: macro
roam_map: MACRO
; map, # of other maps, other maps
map \1
db \2
@ -10,7 +10,7 @@ rept \2
shift
endr
db 0
endm
ENDM
RoamMaps: ; 2a40f
roam_map ROUTE_29, 2, ROUTE_30, ROUTE_46

4
data/wild/treemon_maps.asm
View File

@ -1,7 +1,7 @@
treemon_map: macro
treemon_map: MACRO
map \1
db \2 ; treemon set
endm
ENDM
TreeMonMaps: ; b825e
treemon_map ROUTE_26, 4

8
engine/battle/battle_transition.asm
View File

@ -92,7 +92,7 @@ LoadTrainerBattlePokeballTiles:
; Load the tiles used in the Pokeball Graphic that fills the screen
; at the start of every Trainer battle.
ld de, TrainerBattlePokeballTiles
ld hl, VTiles1 tile $7e
ld hl, vTiles1 tile $7e
ld b, BANK(TrainerBattlePokeballTiles)
ld c, 2
call Request2bpp
@ -103,7 +103,7 @@ LoadTrainerBattlePokeballTiles:
ld [rVBK], a
ld de, TrainerBattlePokeballTiles
ld hl, VTiles4 tile $7e
ld hl, vTiles4 tile $7e
ld b, BANK(TrainerBattlePokeballTiles)
ld c, 2
call Request2bpp
@ -828,11 +828,11 @@ StartTrainerBattle_ZoomToBlack: ; 8c768 (23:4768)
; 8c792 (23:4792)
.boxes ; 8c792
zoombox: macro
zoombox: MACRO
; width, height, start y, start x
db \1, \2
dwcoord \3, \4
endm
ENDM
zoombox 4, 2, 8, 8
zoombox 6, 4, 7, 7
zoombox 8, 6, 6, 6

81
engine/battle/core.asm
View File

@ -5309,13 +5309,13 @@ BattleMenuPKMN_Loop:
Battle_StatsScreen: ; 3e308
call DisableLCD
ld hl, VTiles2 tile $31
ld de, VTiles0
ld hl, vTiles2 tile $31
ld de, vTiles0
ld bc, $11 tiles
call CopyBytes
ld hl, VTiles2
ld de, VTiles0 tile $11
ld hl, vTiles2
ld de, vTiles0 tile $11
ld bc, $31 tiles
call CopyBytes
@ -5330,13 +5330,13 @@ Battle_StatsScreen: ; 3e308
call DisableLCD
ld hl, VTiles0
ld de, VTiles2 tile $31
ld hl, vTiles0
ld de, vTiles2 tile $31
ld bc, $11 tiles
call CopyBytes
ld hl, VTiles0 tile $11
ld de, VTiles2
ld hl, vTiles0 tile $11
ld de, vTiles2
ld bc, $31 tiles
call CopyBytes
@ -6371,8 +6371,14 @@ LoadEnemyMon: ; 3e8eb
jr c, .GenerateDVs ; try again
.Magikarp:
; Skimming this part recommended
; These filters are untranslated.
; They expect at wMagikarpLength a 2-byte value in mm,
; but the value is in feet and inches (one byte each).
; The first filter is supposed to make very large Magikarp even rarer,
; by targeting those 1600 mm or larger.
; After the conversion to feet, it is unable to target any,
; as the largest possible Magikarp is 5'3'', which reads as 1283.
ld a, [TempEnemyMonSpecies]
cp MAGIKARP
jr nz, .Happiness
@ -6382,27 +6388,27 @@ LoadEnemyMon: ; 3e8eb
ld bc, PlayerID
callfar CalcMagikarpLength
; We're clear if the length is < 1536
; No reason to keep going if length > 1536 (i.e. if length / 256 != 6)
ld a, [wMagikarpLength]
cp HIGH(1536)
cp HIGH(1536) ; this compares to 6'0'', should be cp 5
jr nz, .CheckMagikarpArea
; 5% chance of skipping both size checks
call Random
cp 5 percent
jr c, .CheckMagikarpArea
; Try again if > 1614
; Try again if length > 1615
ld a, [wMagikarpLength + 1]
cp LOW(1614) + 2
cp LOW(1616) ; this compares to 6'80'', should be cp 3
jr nc, .GenerateDVs
; 20% chance of skipping this check
call Random
cp 20 percent - 1
jr c, .CheckMagikarpArea
; Try again if > 1598
; Try again if length > 1599
ld a, [wMagikarpLength + 1]
cp LOW(1598) + 2
cp LOW(1600) ; this compares to 6'64'', should be cp 2
jr nc, .GenerateDVs
.CheckMagikarpArea:
@ -6415,6 +6421,9 @@ LoadEnemyMon: ; 3e8eb
; Intended behavior enforces a minimum size at Lake of Rage
; The real behavior prevents size flooring in the Lake of Rage area
; Moreover, due to the check not being translated to feet, all Magikarp
; smaller than 4'0'' may be caught by the filter, a lot more than intended
ld a, [MapGroup]
cp GROUP_LAKE_OF_RAGE
jr z, .Happiness
@ -6427,7 +6436,7 @@ LoadEnemyMon: ; 3e8eb
jr c, .Happiness
; Floor at length 1024
ld a, [wMagikarpLength]
cp HIGH(1024)
cp HIGH(1024) ; compares to 4'0'', cp 3 would be closer to intended value
jr c, .GenerateDVs ; try again
; Finally done with DVs
@ -6695,7 +6704,7 @@ CheckSleepingTreeMon: ; 3eb38
CheckUnownLetter: ; 3eb75
; Return carry if the Unown letter hasn't been unlocked yet
ld a, [UnlockedUnowns]
ld a, [wUnlockedUnowns]
ld c, a
ld de, 0
@ -6779,7 +6788,7 @@ BattleWinSlideInEnemyTrainerFrontpic: ; 3ebd8
call FinishBattleAnim
ld a, [OtherTrainerClass]
ld [TrainerClass], a
ld de, VTiles2
ld de, vTiles2
callfar GetTrainerPic
hlcoord 19, 0
ld c, 0
@ -7074,7 +7083,7 @@ BadgeStatBoosts: ; 3ed45
and a
ret nz
ld a, [JohtoBadges]
ld a, [wJohtoBadges]
; Swap badges 3 (PlainBadge) and 5 (MineralBadge).
ld d, a
@ -7155,15 +7164,15 @@ _LoadHPBar: ; 3eda6
LoadHPExpBarGFX: ; unreferenced
ld de, EnemyHPBarBorderGFX
ld hl, VTiles2 tile $6c
ld hl, vTiles2 tile $6c
lb bc, BANK(EnemyHPBarBorderGFX), 4
call Get1bpp
ld de, HPExpBarBorderGFX
ld hl, VTiles2 tile $73
ld hl, vTiles2 tile $73
lb bc, BANK(HPExpBarBorderGFX), 6
call Get1bpp
ld de, ExpBarGFX
ld hl, VTiles2 tile $55
ld hl, vTiles2 tile $55
lb bc, BANK(ExpBarGFX), 8
jp Get2bpp
; 3edd1
@ -8286,7 +8295,7 @@ DropPlayerSub: ; 3f447
ld [CurPartySpecies], a
ld hl, BattleMonDVs
predef GetUnownLetter
ld de, VTiles2 tile $31
ld de, vTiles2 tile $31
predef GetMonBackpic
pop af
ld [CurPartySpecies], a
@ -8325,7 +8334,7 @@ DropEnemySub: ; 3f486
call GetBaseData
ld hl, EnemyMonDVs
predef GetUnownLetter
ld de, VTiles2
ld de, vTiles2
predef GetAnimatedFrontpicPredef
pop af
ld [CurPartySpecies], a
@ -8382,7 +8391,7 @@ BattleIntro: ; 3f4dd
call DisableSpriteUpdates
farcall ClearBattleRAM
call InitEnemy
call BackUpVBGMap2
call BackUpBGMap2
ld b, SCGB_BATTLE_GRAYSCALE
call GetSGBLayout
ld hl, rLCDC
@ -8428,13 +8437,13 @@ InitEnemy: ; 3f55e
jp InitEnemyWildmon ; wild
; 3f568
BackUpVBGMap2: ; 3f568
BackUpBGMap2: ; 3f568
ld a, [rSVBK]
push af
ld a, $6 ; BANK(wDecompressScratch)
ld [rSVBK], a
ld hl, wDecompressScratch
ld bc, $40 tiles ; VBGMap3 - VBGMap2
ld bc, $40 tiles ; vBGMap3 - vBGMap2
ld a, $2
call ByteFill
ld a, [rVBK]
@ -8442,8 +8451,8 @@ BackUpVBGMap2: ; 3f568
ld a, $1
ld [rVBK], a
ld de, wDecompressScratch
hlbgcoord 0, 0 ; VBGMap2
lb bc, BANK(BackUpVBGMap2), $40
hlbgcoord 0, 0 ; vBGMap2
lb bc, BANK(BackUpBGMap2), $40
call Request2bpp
pop af
ld [rVBK], a
@ -8467,7 +8476,7 @@ InitEnemyTrainer: ; 3f594
ld [OTPartyMon1Item], a
.ok
ld de, VTiles2
ld de, vTiles2
callfar GetTrainerPic
xor a
ld [hGraphicStartTile], a
@ -8531,7 +8540,7 @@ InitEnemyWildmon: ; 3f607
ld a, [UnownLetter]
ld [wFirstUnownSeen], a
.skip_unown
ld de, VTiles2
ld de, vTiles2
predef GetAnimatedFrontpicPredef
xor a
ld [TrainerClass], a
@ -9336,7 +9345,7 @@ InitBattleDisplay: ; 3fb6c
; 3fbff
GetTrainerBackpic: ; 3fbff
; Load the player character's backpic (6x6) into VRAM starting from VTiles2 tile $31.
; Load the player character's backpic (6x6) into VRAM starting from vTiles2 tile $31.
; Special exception for Dude.
ld b, BANK(DudeBackpic)
@ -9349,7 +9358,7 @@ GetTrainerBackpic: ; 3fbff
ld a, [wPlayerSpriteSetupFlags]
bit 2, a ; transformed to male
jr nz, .Chris
ld a, [PlayerGender]
ld a, [wPlayerGender]
bit 0, a
jr z, .Chris
@ -9363,7 +9372,7 @@ GetTrainerBackpic: ; 3fbff
ld hl, ChrisBackpic
.Decompress:
ld de, VTiles2 tile $31
ld de, vTiles2 tile $31
ld c, $31
predef DecompressPredef
ret
@ -9374,8 +9383,8 @@ CopyBackpic: ; 3fc30
push af
ld a, $6
ld [rSVBK], a
ld hl, VTiles0
ld de, VTiles2 tile $31
ld hl, vTiles0
ld de, vTiles2 tile $31
ld a, [hROMBank]
ld b, a
ld c, $31

2
engine/battle/effect_commands.asm
View File

@ -726,7 +726,7 @@ BattleCommand_CheckObedience: ; 343db
.obeylevel
; The maximum obedience level is constrained by owned badges:
ld hl, JohtoBadges
ld hl, wJohtoBadges
; risingbadge
bit RISINGBADGE, [hl]

4
engine/battle/misc.asm
View File

@ -176,9 +176,9 @@ DoBadgeTypeBoosts: ; fbe24
ld hl, .BadgeTypes
ld a, [KantoBadges]
ld a, [wKantoBadges]
ld b, a
ld a, [JohtoBadges]
ld a, [wJohtoBadges]
ld c, a
.CheckBadge:

4
engine/battle/start_battle.asm
View File

@ -191,7 +191,7 @@ ClearBattleRAM: ; 2ef18
call ClearWindowData
ld hl, hBGMapAddress
xor a ; LOW(VBGMap0)
xor a ; LOW(vBGMap0)
ld [hli], a
ld [hl], HIGH(VBGMap0)
ld [hl], HIGH(vBGMap0)
ret

2
engine/battle/trainer_huds.asm
View File

@ -232,7 +232,7 @@ LoadTrainerHudOAM: ; 2c143
LoadBallIconGFX: ; 2c165
ld de, .gfx
ld hl, VTiles0 tile $31
ld hl, vTiles0 tile $31
lb bc, BANK(LoadBallIconGFX), 4
call Get2bpp_2
ret

48
engine/battle_anims/anim_commands.asm
View File

@ -236,16 +236,16 @@ Functioncc220: ; cc220
; Appears to be unused.
xor a
ld [hBGMapMode], a
ld a, LOW(VBGMap0 tile $28)
ld a, LOW(vBGMap0 tile $28)
ld [hBGMapAddress], a
ld a, HIGH(VBGMap0 tile $28)
ld a, HIGH(vBGMap0 tile $28)
ld [hBGMapAddress + 1], a
call WaitBGMap2
ld a, $60
ld [hWY], a
xor a ; LOW(VBGMap0)
xor a ; LOW(vBGMap0)
ld [hBGMapAddress], a
ld a, HIGH(VBGMap0)
ld a, HIGH(vBGMap0)
ld [hBGMapAddress + 1], a
call BattleAnimDelayFrame
ret
@ -693,7 +693,7 @@ BattleAnimCmd_5GFX: ; cc485 (33:4485)
ld [wBattleAnimTemp0], a
.loop
ld a, [wBattleAnimTemp0]
cp (VTiles1 - VTiles0) / $10 - $31
cp (vTiles1 - vTiles0) / $10 - $31
ret nc
call GetBattleAnimByte
ld [hli], a
@ -706,7 +706,7 @@ BattleAnimCmd_5GFX: ; cc485 (33:4485)
rept 4
add hl, hl
endr
ld de, VTiles0 tile $31
ld de, vTiles0 tile $31
add hl, de
ld a, [BattleAnimByte]
call LoadBattleAnimObj
@ -816,13 +816,13 @@ BattleAnimCmd_EnemyFeetObj: ; cc52c (33:452c)
ld a, $49
ld [hl], a
ld hl, VTiles0 tile $73
ld de, VTiles2 tile $06
ld hl, vTiles0 tile $73
ld de, vTiles2 tile $06
ld a, $70
ld [wBattleAnimTemp0], a
ld a, $7
call .LoadFootprint
ld de, VTiles2 tile $31
ld de, vTiles2 tile $31
ld a, $60
ld [wBattleAnimTemp0], a
ld a, $6
@ -871,13 +871,13 @@ BattleAnimCmd_PlayerHeadObj: ; cc57e (33:457e)
ld a, $43
ld [hl], a
ld hl, VTiles0 tile $66
ld de, VTiles2 tile $05
ld hl, vTiles0 tile $66
ld de, vTiles2 tile $05
ld a, $70
ld [wBattleAnimTemp0], a
ld a, $7
call .LoadHead
ld de, VTiles2 tile $31
ld de, vTiles2 tile $31
ld a, $60
ld [wBattleAnimTemp0], a
ld a, $6
@ -930,7 +930,7 @@ BattleAnimCmd_Transform: ; cc5dc (33:45dc)
ld [CurPartySpecies], a ; CurPartySpecies
ld hl, BattleMonDVs ; BattleMonDVs
predef GetUnownLetter
ld de, VTiles0 tile $00
ld de, vTiles0 tile $00
predef GetMonFrontpic
jr .done
@ -939,7 +939,7 @@ BattleAnimCmd_Transform: ; cc5dc (33:45dc)
ld [CurPartySpecies], a ; CurPartySpecies
ld hl, EnemyMonDVs ; EnemyMonDVs
predef GetUnownLetter
ld de, VTiles0 tile $00
ld de, vTiles0 tile $00
predef GetMonBackpic
.done
@ -951,19 +951,19 @@ BattleAnimCmd_Transform: ; cc5dc (33:45dc)
BattleAnimCmd_UpdateActorPic: ; cc622 (33:4622)
ld de, VTiles0 tile $00
ld de, vTiles0 tile $00
ld a, [hBattleTurn]
and a
jr z, .player
ld hl, VTiles2 tile $00
ld hl, vTiles2 tile $00
ld b, 0
ld c, $31
call Request2bpp
ret
.player
ld hl, VTiles2 tile $31
ld hl, vTiles2 tile $31
ld b, 0
ld c, $24
call Request2bpp
@ -1007,7 +1007,7 @@ GetSubstitutePic: ; cc64c
ld de, sScratch + (3 * 7 + 6) tiles
call .CopyTile
ld hl, VTiles2 tile $00
ld hl, vTiles2 tile $00
ld de, sScratch
lb bc, BANK(GetSubstitutePic), 7 * 7
call Request2bpp
@ -1027,7 +1027,7 @@ GetSubstitutePic: ; cc64c
ld de, sScratch + (3 * 6 + 5) tiles
call .CopyTile
ld hl, VTiles2 tile $31
ld hl, vTiles2 tile $31
ld de, sScratch
lb bc, BANK(GetSubstitutePic), 6 * 6
call Request2bpp
@ -1075,7 +1075,7 @@ GetMinimizePic: ; cc6e7 (33:46e7)
ld de, sScratch + $1a tiles
call CopyMinimizePic
ld hl, VTiles2 tile $00
ld hl, vTiles2 tile $00
ld de, sScratch
lb bc, BANK(GetMinimizePic), $31
ret
@ -1083,7 +1083,7 @@ GetMinimizePic: ; cc6e7 (33:46e7)
.player
ld de, sScratch + $160
call CopyMinimizePic
ld hl, VTiles2 tile $31
ld hl, vTiles2 tile $31
ld de, sScratch
lb bc, BANK(GetMinimizePic), $24
ret
@ -1108,7 +1108,7 @@ BattleAnimCmd_Minimize: ; cc735 (33:4735)
xor a
call GetSRAMBank
call GetMinimizePic
ld hl, VTiles0 tile $00
ld hl, vTiles0 tile $00
call Request2bpp
call CloseSRAM
pop af
@ -1157,14 +1157,14 @@ BattleAnimCmd_BeatUp: ; cc776 (33:4776)
ld hl, BattleMonDVs
predef GetUnownLetter
ld de, VTiles2 tile $00
ld de, vTiles2 tile $00
predef GetMonFrontpic
jr .done
.player
ld hl, EnemyMonDVs
predef GetUnownLetter
ld de, VTiles2 tile $31
ld de, vTiles2 tile $31
predef GetMonBackpic
.done

2
engine/battle_anims/bg_effects.asm
View File

@ -871,7 +871,7 @@ BattleBGEffect_RunPicResizeScript: ; c83ed (32:43ed)
bgsquare: MACRO
dn \1, \2
dw \3
endm
ENDM
bgsquare 6, 6, .SixBySix
bgsquare 4, 4, .FourByFour

10
engine/billspc.asm
View File

@ -1107,7 +1107,7 @@ PCMonInfo: ; e2ac6 (38:6ac6)
ld hl, TempMonDVs
predef GetUnownLetter
call GetBaseData
ld de, VTiles2 tile $00
ld de, vTiles2 tile $00
predef GetMonFrontpic
xor a
ld [wBillsPC_MonHasMail], a
@ -1450,7 +1450,7 @@ ENDC
ld a, [wd004]
inc a
ld [wBillsPC_NumMonsInBox], a
endm
ENDM
CopyBoxmonSpecies: ; e2d30 (38:6d30)
xor a
@ -2261,18 +2261,18 @@ BillsPC_Jumptable: ; e33df (38:73df)
BillsPC_InitGFX: ; e33e8 (38:73e8)
call DisableLCD
ld hl, VTiles2 tile $00
ld hl, vTiles2 tile $00
ld bc, $31 tiles
xor a
call ByteFill
call LoadStandardFont
call LoadFontsBattleExtra
ld hl, PCMailGFX
ld de, VTiles2 tile $5c
ld de, vTiles2 tile $5c
ld bc, 4 tiles
call CopyBytes
ld hl, PCSelectLZ
ld de, VTiles0 tile $00
ld de, vTiles0 tile $00
call Decompress
ld a, 6
call SkipMusic

10
engine/breeding.asm
View File

@ -704,22 +704,22 @@ EggHatch_AnimationSequence: ; 1728f (5:728f)
farcall BlankScreen
call DisableLCD
ld hl, EggHatchGFX
ld de, VTiles0 tile $00
ld de, vTiles0 tile $00
ld bc, $20
ld a, BANK(EggHatchGFX)
call FarCopyBytes
farcall ClearSpriteAnims
ld de, VTiles2 tile $00
ld de, vTiles2 tile $00
ld a, [wJumptableIndex]
call GetHatchlingFrontpic
ld de, VTiles2 tile $31
ld de, vTiles2 tile $31
ld a, EGG
call GetEggFrontpic
ld de, MUSIC_EVOLUTION
call PlayMusic
call EnableLCD
hlcoord 7, 4
ld b, HIGH(VBGMap0)
ld b, HIGH(vBGMap0)
ld c, $31 ; Egg tiles start here
ld a, EGG
call Hatch_UpdateFrontpicBGMapCenter
@ -768,7 +768,7 @@ EggHatch_AnimationSequence: ; 1728f (5:728f)
call ClearSprites
call Hatch_InitShellFragments
hlcoord 6, 3
ld b, HIGH(VBGMap0)
ld b, HIGH(vBGMap0)
ld c, $00 ; Hatchling tiles start here
ld a, [wJumptableIndex]
call Hatch_UpdateFrontpicBGMapCenter

18
engine/card_flip.asm
View File

@ -16,20 +16,20 @@ _CardFlip: ; e00ee (38:40ee)
call LoadFontsExtra
ld hl, CardFlipLZ01
ld de, VTiles2 tile $00
ld de, vTiles2 tile $00
call Decompress
ld hl, CardFlipLZ02
ld de, VTiles2 tile $3e
ld de, vTiles2 tile $3e
call Decompress
ld hl, CardFlipLZ03
ld de, VTiles0 tile $00
ld de, vTiles0 tile $00
call Decompress
ld hl, CardFlipOffButtonGFX
ld de, VTiles1 tile $6f
ld de, vTiles1 tile $6f
ld bc, 1 tiles
call CopyBytes
ld hl, CardFlipOnButtonGFX
ld de, VTiles1 tile $75
ld de, vTiles1 tile $75
ld bc, 1 tiles
call CopyBytes
@ -619,11 +619,11 @@ CardFlip_CopyOAM: ; e0509
; e0521
CardFlip_ShiftDigitsLeftTwoPixels: ; e0521 (38:4521)
ld de, VTiles1 tile ("0" & $7f)
ld hl, VTiles1 tile ("0" & $7f) + 2
ld de, vTiles1 tile ("0" & $7f)
ld hl, vTiles1 tile ("0" & $7f) + 2
ld bc, 10 tiles - 2
call CopyBytes
ld hl, VTiles1 tile $7f + 1 tiles - 2
ld hl, vTiles1 tile $7f + 1 tiles - 2
xor a
ld [hli], a
ld [hl], a
@ -1413,7 +1413,7 @@ else
dbpixel \1, \2
dw \3
endc
endm
ENDM
cardflip_cursor 11, 2, .Impossible
cardflip_cursor 12, 2, .Impossible

2
engine/caught_data.asm
View File

@ -193,7 +193,7 @@ SetBoxmonOrEggmonCaughtData: ; 4db53
.NotPokecenter2F:
call GetWorldMapLocation
ld b, a
ld a, [PlayerGender]
ld a, [wPlayerGender]
rrca
or b
ld [hl], a

10
engine/cgb_layouts.asm
View File

@ -183,7 +183,7 @@ InitPartyMenuBGPal0: ; 8e9f
; 8eb9
_CGB_PokegearPals: ; 8eb9
ld a, [PlayerGender]
ld a, [wPlayerGender]
bit 0, a
jr z, .male
ld hl, FemalePokegearPals
@ -719,7 +719,7 @@ _CGB_TrainerCard: ; 9289
; fill screen with opposite-gender palette for the card border
hlcoord 0, 0, AttrMap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld a, [PlayerGender]
ld a, [wPlayerGender]
and a
ld a, $1 ; kris
jr z, .got_gender
@ -729,7 +729,7 @@ _CGB_TrainerCard: ; 9289
; fill trainer sprite area with same-gender palette
hlcoord 14, 1, AttrMap
lb bc, 7, 5
ld a, [PlayerGender]
ld a, [wPlayerGender]
and a
ld a, $0 ; chris
jr z, .got_gender2
@ -768,7 +768,7 @@ _CGB_TrainerCard: ; 9289
ld a, $7 ; pryce
call FillBoxCGB
; clair uses kris's palette
ld a, [PlayerGender]
ld a, [wPlayerGender]
and a
push af
jr z, .got_gender3
@ -847,7 +847,7 @@ _CGB_PackPals: ; 93d3
cp BATTLETYPE_TUTORIAL
jr z, .tutorial_male
ld a, [PlayerGender]
ld a, [wPlayerGender]
bit 0, a
jr z, .tutorial_male

10
engine/color.asm
View File

@ -718,7 +718,7 @@ GetPlayerOrMonPalettePointer:
ld a, [wPlayerSpriteSetupFlags]
bit 2, a ; transformed to male
jr nz, .male
ld a, [PlayerGender]
ld a, [wPlayerGender]
and a
jr z, .male
ld hl, KrisPalette
@ -902,7 +902,7 @@ InitCGBPals::
; CGB only
ld a, $1
ld [rVBK], a
ld hl, VTiles0
ld hl, vTiles0
ld bc, $200 tiles
xor a
call ByteFill
@ -1069,7 +1069,7 @@ SGBBorder_PushBGPals:
ld a, %11100100
ld [rBGP], a
ld hl, PredefPals
ld de, VTiles1
ld de, vTiles1
ld bc, $100 tiles
call CopyData
call DrawDefaultTiles
@ -1085,7 +1085,7 @@ SGBBorder_MorePalPushing:
call DisableLCD
ld a, $e4
ld [rBGP], a
ld de, VTiles1
ld de, vTiles1
ld bc, 20 tiles
call CopyData
ld b, 18
@ -1119,7 +1119,7 @@ SGBBorder_YetMorePalPushing:
call DisableLCD
ld a, %11100100
ld [rBGP], a
ld de, VTiles1
ld de, vTiles1
ld b, $80
.loop
push bc

12
engine/credits.asm
View File

@ -33,17 +33,17 @@ Credits:: ; 109847
jr nz, .load_loop
ld de, CreditsBorderGFX
ld hl, VTiles2 tile $20
ld hl, vTiles2 tile $20
lb bc, BANK(CreditsBorderGFX), $09
call Request2bpp
ld de, CopyrightGFX
ld hl, VTiles2 tile $60
ld hl, vTiles2 tile $60
lb bc, BANK(CopyrightGFX), $1d
call Request2bpp
ld de, TheEndGFX
ld hl, VTiles2 tile $40
ld hl, vTiles2 tile $40
lb bc, BANK(TheEndGFX), $10
call Request2bpp
@ -55,7 +55,7 @@ Credits:: ; 109847
call Credits_LoadBorderGFX
ld e, l
ld d, h
ld hl, VTiles2
ld hl, vTiles2
lb bc, BANK(CreditsMonsGFX), 16
call Request2bpp
@ -193,9 +193,9 @@ Credits_UpdateGFXRequestPath: ; 109964 (42:5964)
ld [Requested2bppSource], a
ld a, h
ld [Requested2bppSource + 1], a
ld a, LOW(VTiles2)
ld a, LOW(vTiles2)
ld [Requested2bppDest], a
ld a, HIGH(VTiles2)
ld a, HIGH(vTiles2)
ld [Requested2bppDest + 1], a
jr Credits_RequestGFX

52
engine/crystal_intro.asm
View File

@ -3,9 +3,9 @@ Copyright_GFPresents: ; e4579
call PlayMusic
call ClearBGPalettes
call ClearTileMap
ld a, HIGH(VBGMap0)
ld a, HIGH(vBGMap0)
ld [hBGMapAddress + 1], a
xor a ; LOW(VBGMap0)
xor a ; LOW(vBGMap0)
ld [hBGMapAddress], a
ld [hJoyDown], a
ld [hSCX], a
@ -51,7 +51,7 @@ Copyright_GFPresents: ; e4579
.GetGFLogoGFX: ; e45e8
ld de, GameFreakLogo
ld hl, VTiles2
ld hl, vTiles2
lb bc, BANK(GameFreakLogo), $1c
call Get1bpp
@ -65,12 +65,12 @@ Copyright_GFPresents: ; e4579
ld a, BANK(IntroLogoGFX)
call FarDecompress
ld hl, VTiles0
ld hl, vTiles0
ld de, wDecompressScratch
lb bc, 1, 8 tiles
call Request2bpp
ld hl, VTiles1
ld hl, vTiles1
ld de, wDecompressScratch + $80 tiles
lb bc, 1, 8 tiles
call Request2bpp
@ -470,10 +470,10 @@ IntroScene1: ; e495b (39:495b)
ld a, $0
ld [rVBK], a
ld hl, IntroUnownsGFX
ld de, VTiles2 tile $00
ld de, vTiles2 tile $00
call Intro_DecompressRequest2bpp_128Tiles
ld hl, IntroPulseGFX
ld de, VTiles0 tile $00
ld de, vTiles0 tile $00
call Intro_DecompressRequest2bpp_128Tiles
ld hl, IntroTilemap002
debgcoord 0, 0
@ -546,7 +546,7 @@ IntroScene3: ; e49fd (39:49fd)
ld a, $0
ld [rVBK], a
ld hl, IntroBackgroundGFX
ld de, VTiles2 tile $00
ld de, vTiles2 tile $00
call Intro_DecompressRequest2bpp_128Tiles
ld hl, IntroTilemap004
debgcoord 0, 0
@ -609,10 +609,10 @@ IntroScene5: ; e4a7a (39:4a7a)
ld a, $0
ld [rVBK], a
ld hl, IntroUnownsGFX
ld de, VTiles2 tile $00
ld de, vTiles2 tile $00
call Intro_DecompressRequest2bpp_128Tiles
ld hl, IntroPulseGFX
ld de, VTiles0 tile $00
ld de, vTiles0 tile $00
call Intro_DecompressRequest2bpp_128Tiles
ld hl, IntroTilemap006
debgcoord 0, 0
@ -706,17 +706,17 @@ IntroScene7: ; e4b3f (39:4b3f)
call Intro_DecompressRequest2bpp_64Tiles
ld hl, IntroPichuWooperGFX
ld de, VTiles0 tile $00
ld de, vTiles0 tile $00
call Intro_DecompressRequest2bpp_128Tiles
ld a, $0
ld [rVBK], a
ld hl, IntroSuicuneRunGFX
ld de, VTiles0 tile $00
ld de, vTiles0 tile $00
call Intro_DecompressRequest2bpp_255Tiles
ld hl, IntroBackgroundGFX
ld de, VTiles2 tile $00
ld de, vTiles2 tile $00
call Intro_DecompressRequest2bpp_128Tiles
ld hl, IntroTilemap004
@ -877,7 +877,7 @@ IntroScene11: ; e4c86 (39:4c86)
ld a, $0
ld [rVBK], a
ld hl, IntroUnownsGFX
ld de, VTiles2 tile $00
ld de, vTiles2 tile $00
call Intro_DecompressRequest2bpp_128Tiles
ld hl, IntroTilemap008
debgcoord 0, 0
@ -1001,10 +1001,10 @@ IntroScene13: ; e4d6d (39:4d6d)
ld a, $0
ld [rVBK], a
ld hl, IntroSuicuneRunGFX
ld de, VTiles0 tile $00
ld de, vTiles0 tile $00
call Intro_DecompressRequest2bpp_255Tiles
ld hl, IntroBackgroundGFX
ld de, VTiles2 tile $00
ld de, vTiles2 tile $00
call Intro_DecompressRequest2bpp_128Tiles
ld hl, IntroTilemap004
debgcoord 0, 0
@ -1105,13 +1105,13 @@ IntroScene15: ; e4e40 (39:4e40)
ld a, $0
ld [rVBK], a
ld hl, IntroSuicuneJumpGFX
ld de, VTiles2 tile $00
ld de, vTiles2 tile $00
call Intro_DecompressRequest2bpp_128Tiles
ld hl, IntroUnownBackGFX
ld de, VTiles0 tile $00
ld de, vTiles0 tile $00
call Intro_DecompressRequest2bpp_128Tiles
ld de, IntroGrass4GFX
ld hl, VTiles1 tile $00
ld hl, vTiles1 tile $00
lb bc, BANK(IntroGrass4GFX), 1
call Request2bpp
ld hl, IntroTilemap010
@ -1187,7 +1187,7 @@ IntroScene17: ; e4ef5 (39:4ef5)
ld a, $0
ld [rVBK], a
ld hl, IntroSuicuneCloseGFX
ld de, VTiles1 tile $00
ld de, vTiles1 tile $00
call Intro_DecompressRequest2bpp_255Tiles
ld hl, IntroTilemap012
debgcoord 0, 0
@ -1253,13 +1253,13 @@ IntroScene19: ; e4f7e (39:4f7e)
ld a, $0
ld [rVBK], a
ld hl, IntroSuicuneBackGFX
ld de, VTiles2 tile $00
ld de, vTiles2 tile $00
call Intro_DecompressRequest2bpp_128Tiles
ld hl, IntroUnownsGFX
ld de, VTiles1 tile $00
ld de, vTiles1 tile $00
call Intro_DecompressRequest2bpp_128Tiles
ld de, IntroGrass4GFX
ld hl, VTiles1 tile $7f
ld hl, vTiles1 tile $7f
lb bc, BANK(IntroGrass4GFX), 1
call Request2bpp
ld hl, IntroTilemap014
@ -1431,7 +1431,7 @@ IntroScene26: ; e50bb (39:50bb)
ld a, $0
ld [rVBK], a
ld hl, IntroCrystalUnownsGFX
ld de, VTiles2 tile $00
ld de, vTiles2 tile $00
call Intro_DecompressRequest2bpp_128Tiles
ld hl, IntroTilemap017
debgcoord 0, 0
@ -1922,9 +1922,9 @@ Intro_RustleGrass: ; e546d (39:546d)
ld [Requested2bppSource], a
ld a, [hli]
ld [Requested2bppSource + 1], a
ld a, LOW(VTiles2 tile $09)
ld a, LOW(vTiles2 tile $09)
ld [Requested2bppDest], a
ld a, HIGH(VTiles2 tile $09)
ld a, HIGH(vTiles2 tile $09)
ld [Requested2bppDest + 1], a
ld a, 4
ld [Requested2bppSize], a

24
engine/debug.asm
View File

@ -104,14 +104,14 @@ Function81928: ; 81928
Function81948: ; 81948
ld a, $1
ld [rVBK], a
ld hl, VTiles0
ld bc, sScratch - VTiles0
ld hl, vTiles0
ld bc, sScratch - vTiles0
xor a
call ByteFill
ld a, $0
ld [rVBK], a
ld hl, VTiles0
ld bc, sScratch - VTiles0
ld hl, vTiles0
ld bc, sScratch - vTiles0
xor a
call ByteFill
hlcoord 0, 0, AttrMap
@ -128,15 +128,15 @@ Function81948: ; 81948
Function8197c: ; 8197c
ld hl, DebugColorTestGFX + $10
ld de, VTiles2 tile $6a
ld de, vTiles2 tile $6a
ld bc, $160
call CopyBytes
ld hl, DebugColorTestGFX
ld de, VTiles0
ld de, vTiles0
ld bc, $10
call CopyBytes
call LoadStandardFont
ld hl, VTiles1
ld hl, vTiles1
lb bc, 8, 0
.asm_8199d
ld a, [hl]
@ -314,7 +314,7 @@ Function81adb: ; 81adb
ld [wBoxAlignment], a
hlcoord 12, 3
call _PrepMonFrontpic
ld de, VTiles2 tile $31
ld de, vTiles2 tile $31
predef GetMonBackpic
ld a, $31
ld [hGraphicStartTile], a
@ -345,7 +345,7 @@ Function81adb: ; 81adb
ld de, StringBuffer1
hlcoord 4, 1
call PlaceString
ld de, VTiles2
ld de, vTiles2
callfar GetTrainerPic
xor a
ld [TempEnemyMonSpecies], a
@ -1062,14 +1062,14 @@ TilesetColorTest:
xor a
ld [hBGMapMode], a
ld de, DebugColorTestGFX + $10
ld hl, VTiles2 tile $6a
ld hl, vTiles2 tile $6a
lb bc, BANK(DebugColorTestGFX), $16
call Request2bpp
ld de, DebugColorTestGFX
ld hl, VTiles1
ld hl, vTiles1
lb bc, BANK(DebugColorTestGFX), 1
call Request2bpp
ld a, HIGH(VBGMap1)
ld a, HIGH(vBGMap1)
ld [hBGMapAddress + 1], a
hlcoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT

2
engine/diploma.asm
View File

@ -10,7 +10,7 @@ PlaceDiplomaOnScreen: ; 1dd709
call ClearSprites
call DisableLCD
ld hl, DiplomaGFX
ld de, VTiles2
ld de, vTiles2
call Decompress
ld hl, DiplomaPage1Tilemap
decoord 0, 0

4
engine/dma_transfer.asm
View File

@ -594,13 +594,13 @@ HDMATransfer_OnlyTopFourRows: ; 104303
ld [rVBK], a
ld c, $8
ld hl, wScratchTileMap + $80
debgcoord 0, 0, VBGMap1
debgcoord 0, 0, vBGMap1
call HDMATransfer_Wait127Scanlines
ld a, $0
ld [rVBK], a
ld c, $8
ld hl, wScratchTileMap
debgcoord 0, 0, VBGMap1
debgcoord 0, 0, vBGMap1
call HDMATransfer_Wait127Scanlines
ret

4
engine/dummy_game.asm
View File

@ -12,10 +12,10 @@ _DummyGame: ; e1e5b (38:5e5b)
call GetSGBLayout
callfar ClearSpriteAnims
ld hl, LZ_e2221
ld de, VTiles2 tile $00
ld de, vTiles2 tile $00
call Decompress
ld hl, Unknown_e00ed
ld de, VTiles0 tile $00
ld de, vTiles0 tile $00
ld bc, 4 tiles
ld a, BANK(Unknown_e00ed)
call FarCopyBytes

2
engine/events.asm
View File

@ -491,7 +491,7 @@ CheckTimeEvents: ; 9693a
and a
jr nz, .nothing
ld hl, StatusFlags2
ld hl, wStatusFlags2
bit 2, [hl] ; bug contest
jr z, .do_daily

4
engine/events/celebi.asm
View File

@ -72,11 +72,11 @@ Special_CelebiShrineEvent: ; 4989a
LoadCelebiGFX: ; 49912
farcall ClearSpriteAnims
ld de, SpecialCelebiLeafGFX
ld hl, VTiles1
ld hl, vTiles1
lb bc, BANK(SpecialCelebiLeafGFX), 4
call Request2bpp
ld de, SpecialCelebiGFX
ld hl, VTiles0 tile $84
ld hl, vTiles0 tile $84
lb bc, BANK(SpecialCelebiGFX), $10
call Request2bpp
xor a

2
engine/events/crystal_unown.asm
View File

@ -176,7 +176,7 @@ endc
shift
endr
db $ff
endm
ENDM
.UnownText: ; 8aebc
;.UnownText_Escape:

14
engine/events/field_moves.asm
View File

@ -8,7 +8,7 @@ PlayWhirlpoolSound: ; 8c7d4
BlindingFlash: ; 8c7e1
farcall FadeOutPalettes
ld hl, StatusFlags
ld hl, wStatusFlags
set 2, [hl] ; Flash
farcall ReplaceTimeOfDayPals
farcall UpdateTimeOfDayPal
@ -22,11 +22,11 @@ BlindingFlash: ; 8c7e1
ShakeHeadbuttTree: ; 8c80a
farcall ClearSpriteAnims
ld de, CutGrassGFX
ld hl, VTiles1
ld hl, vTiles1
lb bc, BANK(CutGrassGFX), 4
call Request2bpp
ld de, HeadbuttTreeGFX
ld hl, VTiles1 tile $04
ld hl, vTiles1 tile $04
lb bc, BANK(HeadbuttTreeGFX), 8
call Request2bpp
call Cut_Headbutt_GetPixelFacing
@ -67,7 +67,7 @@ ShakeHeadbuttTree: ; 8c80a
xor a
call ByteFill
ld de, Font
ld hl, VTiles1
ld hl, vTiles1
lb bc, BANK(Font), 12
call Get1bpp
call ReplaceKrisSprite
@ -141,11 +141,11 @@ OWCutAnimation: ; 8c940
.LoadCutGFX: ; 8c96d
callfar ClearSpriteAnims ; pointless to farcall
ld de, CutGrassGFX
ld hl, VTiles1
ld hl, vTiles1
lb bc, BANK(CutGrassGFX), 4
call Request2bpp
ld de, CutTreeGFX
ld hl, VTiles1 tile $4
ld hl, vTiles1 tile $4
lb bc, BANK(CutTreeGFX), 4
call Request2bpp
ret
@ -413,7 +413,7 @@ FlyToAnim: ; 8cb33
FlyFunction_InitGFX: ; 8cb9b (23:4b9b)
callfar ClearSpriteAnims
ld de, CutGrassGFX
ld hl, VTiles1 tile $00
ld hl, vTiles1 tile $00
lb bc, BANK(CutGrassGFX), 4
call Request2bpp
ld a, [CurPartyMon]

2
engine/events/fish.asm
View File

@ -97,7 +97,7 @@ GetFishGroupIndex: ; 9245b
; Return the index of fishgroup d in de.
push hl
ld hl, DailyFlags
ld hl, wDailyFlags
bit 2, [hl]
pop hl
jr z, .done

4
engine/events/fruit_trees.asm
View File

@ -43,7 +43,7 @@ GetCurTreeFruit: ; 44041
; 4404c
TryResetFruitTrees: ; 4404c
ld hl, DailyFlags
ld hl, wDailyFlags
bit 4, [hl]
ret nz
jp ResetFruitTrees
@ -70,7 +70,7 @@ ResetFruitTrees: ; 4406a
ld [hli], a
ld [hli], a
ld [hl], a
ld hl, DailyFlags
ld hl, wDailyFlags
set 4, [hl]
ret
; 44078

10
engine/events/halloffame.asm
View File

@ -2,7 +2,7 @@ HALLOFFAME_COLON EQU $63
HallOfFame:: ; 0x8640e
call HallOfFame_FadeOutMusic
ld a, [StatusFlags]
ld a, [wStatusFlags]
push af
ld a, 1
ld [wGameLogicPaused], a
@ -11,7 +11,7 @@ HallOfFame:: ; 0x8640e
ld [wSpawnAfterChampion], a
; Enable the Pokégear map to cycle through all of Kanto
ld hl, StatusFlags
ld hl, wStatusFlags
set 6, [hl] ; hall of fame
farcall HallOfFame_InitSaveIfNeeded
@ -52,7 +52,7 @@ RedCredits:: ; 86455
call DisableSpriteUpdates
ld a, SPAWN_RED
ld [wSpawnAfterChampion], a
ld a, [StatusFlags]
ld a, [wStatusFlags]
ld b, a
farcall Credits
ret
@ -249,7 +249,7 @@ AnimateHOFMonEntrance: ; 865b5
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld a, " "
call ByteFill
ld de, VTiles2 tile $31
ld de, vTiles2 tile $31
predef GetMonBackpic
ld a, $31
ld [hGraphicStartTile], a
@ -533,7 +533,7 @@ DisplayHOFMon: ; 86748
HOF_AnimatePlayerPic: ; 86810
call ClearBGPalettes
ld hl, VTiles2 tile HALLOFFAME_COLON
ld hl, vTiles2 tile HALLOFFAME_COLON
ld de, FontExtra + 13 tiles ; "<COLON>"
lb bc, BANK(FontExtra), 1
call Request2bpp

2
engine/events/heal_machine_anim.asm
View File

@ -72,7 +72,7 @@ HealMachineAnim: ; 12324
.LoadGFX: ; 12383
call .LoadPalettes
ld de, .HealMachineGFX
ld hl, VTiles0 tile $7c
ld hl, vTiles0 tile $7c
lb bc, BANK(.HealMachineGFX), $2
call Request2bpp
ret

19
engine/events/magikarp.asm
View File

@ -79,7 +79,7 @@ Special_CheckMagikarpLength: ; fbb32
; 0xfbbae
Magikarp_LoadFeetInchesChars: ; fbbae
ld hl, VTiles2 tile "′" ; $6e
ld hl, vTiles2 tile "′" ; $6e
ld de, .feetinchchars
lb bc, BANK(.feetinchchars), 2
call Request2bpp
@ -108,7 +108,7 @@ PrintMagikarpLength: ; fbbdb
; fbbfc
CalcMagikarpLength: ; fbbfc
; Return Magikarp's length (in mm) at wMagikarpLength (big endian).
; Return Magikarp's length (in feet and inches) at wMagikarpLength (big endian).
;
; input:
; de: EnemyMonDVs
@ -247,6 +247,10 @@ CalcMagikarpLength: ; fbbfc
ld e, l
.done
; convert from mm to feet and inches
; in = mm / 25.4
; ft = in / 12
; hl = de × 10
ld h, d
ld l, e
@ -275,9 +279,9 @@ CalcMagikarpLength: ; fbbfc
ld e, a
ld hl, wMagikarpLength
ld [hl], d
ld [hl], d ; ft
inc hl
ld [hl], e
ld [hl], e ; in
ret
; fbc9a
@ -305,8 +309,11 @@ CalcMagikarpLength: ; fbbfc
; fbca8
.Lengths: ; fbca8
; ????, divisor
dwb 110, 1
; [wMagikarpLength] = z * 100 + (bc - x) / y
; First argument is the bc threshold as well as x.
; Second argument is y.
; In reality, due to the bug at .BCLessThanDE, the threshold is determined by only register b.
dwb 110, 1 ; not used unless the bug is fixed
dwb 310, 2
dwb 710, 4
dwb 2710, 20

6
engine/events/magnet_train.asm
View File

@ -134,14 +134,14 @@ MagntTrain_LoadGFX_PlayMusic: ; 8ccc9
farcall GetPlayerIcon
pop af
ld [rSVBK], a
ld hl, VTiles0
ld hl, vTiles0
ld c, 4
call Request2bpp
ld hl, 12 tiles
add hl, de
ld d, h
ld e, l
ld hl, VTiles0 tile $04
ld hl, vTiles0 tile $04
ld c, 4
call Request2bpp
call MagnetTrain_InitLYOverrides
@ -328,7 +328,7 @@ MagnetTrain_Jumptable: ; 8cdf7
push af
ld a, $1
ld [rSVBK], a
ld a, [PlayerGender]
ld a, [wPlayerGender]
bit 0, a
jr z, .got_gender
ld b, SPRITE_ANIM_INDEX_MAGNET_TRAIN_BLUE

10
engine/events/overworld.asm
View File

@ -358,7 +358,7 @@ SurfFunction: ; c909
ld de, ENGINE_FOGBADGE
call CheckBadge
jr c, .asm_c956
ld hl, BikeFlags
ld hl, wBikeFlags
bit 1, [hl] ; always on bike
jr nz, .cannotsurf
ld a, [PlayerState]
@ -520,7 +520,7 @@ TrySurfOW:: ; c9e7
call CheckPartyMove
jr c, .quit
ld hl, BikeFlags
ld hl, wBikeFlags
bit 1, [hl] ; always on bike (can't surf)
jr nz, .quit
@ -1008,7 +1008,7 @@ StrengthFunction: ; cce5
ret
SetStrengthFlag: ; cd12
ld hl, BikeFlags
ld hl, wBikeFlags
set 0, [hl]
ld a, [CurPartyMon]
ld e, a
@ -1086,7 +1086,7 @@ TryStrengthOW: ; cd78
call CheckEngineFlag
jr c, .nope
ld hl, BikeFlags
ld hl, wBikeFlags
bit 0, [hl]
jr z, .already_using
@ -1683,7 +1683,7 @@ BikeFunction: ; d0b3
ret
.GetOffBike:
ld hl, BikeFlags
ld hl, wBikeFlags
bit 1, [hl]
jr nz, .CantGetOffBike
ld hl, Script_GetOffBike

2
engine/events/pokepic.asm
View File

@ -11,7 +11,7 @@ Pokepic:: ; 244e3
ld a, [CurPartySpecies]
ld [CurSpecies], a
call GetBaseData
ld de, VTiles1
ld de, vTiles1
predef GetMonFrontpic
ld a, [wMenuBorderTopCoord]
inc a

4
engine/events/pokerus/pokerus.asm
View File

@ -18,7 +18,7 @@ GivePokerusAndConvertBerries: ; 2ed44
; If we haven't been to Goldenrod City at least once,
; prevent the contraction of Pokerus.
ld hl, StatusFlags2
ld hl, wStatusFlags2
bit 6, [hl]
ret z
call Random
@ -123,7 +123,7 @@ GivePokerusAndConvertBerries: ; 2ed44
; any berry held by a Shuckle may be converted to berry juice
ConvertBerriesToBerryJuice: ; 2ede6
ld hl, StatusFlags2
ld hl, wStatusFlags2
bit 6, [hl]
ret z
call Random

10
engine/events/print_unown.asm
View File

@ -15,12 +15,12 @@ UnownPrinter: ; 16be4
call ClearTileMap
ld de, UnownDexATile
ld hl, VTiles1 tile $6f
ld hl, vTiles1 tile $6f
lb bc, BANK(UnownDexBTile), 1
call Request1bpp
ld de, UnownDexBTile
ld hl, VTiles1 tile $75
ld hl, vTiles1 tile $75
lb bc, BANK(UnownDexBTile), 1
call Request1bpp
@ -139,7 +139,7 @@ UnownPrinter: ; 16be4
ld [CurPartySpecies], a
xor a
ld [wBoxAlignment], a
ld de, VTiles2
ld de, vTiles2
predef GetMonFrontpic
call .Load2bppToSRAM
hlcoord 1, 6
@ -147,7 +147,7 @@ UnownPrinter: ; 16be4
ld [hGraphicStartTile], a
lb bc, 7, 7
predef PlaceGraphic
ld de, VTiles2 tile $31
ld de, vTiles2 tile $31
farcall RotateUnownFrontpic
ret
@ -184,7 +184,7 @@ UnownPrinter: ; 16be4
ld bc, $31 tiles
xor a
call ByteFill
ld hl, VTiles2 tile $31
ld hl, vTiles2 tile $31
ld de, sScratch
ld c, $31
ld a, [hROMBank]

2
engine/events/print_unown_2.asm
View File

@ -105,7 +105,7 @@ x = x +- \2
endr
y = y + 1
endr
endm
ENDM
UnownPrinter_OverworldMapRectangle: ; e008b
overworldmaprect 7, 7

2
engine/events/special.asm
View File

@ -53,7 +53,7 @@ SpecialGiveShuckle: ; 7305
call CopyName2
; Engine flag for this event.
ld hl, DailyFlags
ld hl, wDailyFlags
set 5, [hl]
; setflag ENGINE_SHUCKLE_GIVEN
ld a, 1

2
engine/events/sweet_scent.asm
View File

@ -36,7 +36,7 @@ SweetScentNothing: ; 0x506e9
SweetScentEncounter: ; 506ef
farcall CanUseSweetScent
jr nc, .no_battle
ld hl, StatusFlags2
ld hl, wStatusFlags2
bit 2, [hl]
jr nz, .not_in_bug_contest
farcall GetMapEncounterRate

10
engine/events_2.asm
View File

@ -2,7 +2,7 @@
WarpToSpawnPoint:: ; 97c28
ld hl, StatusFlags2
ld hl, wStatusFlags2
res 1, [hl] ; safari zone?
res 2, [hl] ; bug contest
ret
@ -108,7 +108,7 @@ RandomEncounter:: ; 97cc0
jr c, .nope
call CanUseSweetScent
jr nc, .nope
ld hl, StatusFlags2
ld hl, wStatusFlags2
bit 2, [hl] ; bug contest
jr nz, .bug_contest
farcall TryWildEncounter
@ -149,7 +149,7 @@ WildBattleScript: ; 97cf9
; 97cfd
CanUseSweetScent:: ; 97cfd
ld hl, StatusFlags
ld hl, wStatusFlags
bit 5, [hl]
jr nz, .no
ld a, [wEnvironment]
@ -263,7 +263,7 @@ DoBikeStep:: ; 97db3
; If the bike shop owner doesn't have our number, or
; if we've already gotten the call, we don't have to
; be here.
ld hl, StatusFlags2
ld hl, wStatusFlags2
bit 4, [hl] ; bike shop call
jr z, .NoCall
@ -314,7 +314,7 @@ DoBikeStep:: ; 97db3
ld [wSpecialPhoneCallID], a
xor a
ld [wSpecialPhoneCallID + 1], a
ld hl, StatusFlags2
ld hl, wStatusFlags2
res 4, [hl] ; bike shop call
scf
ret

12
engine/events_3.asm
View File

@ -132,7 +132,7 @@ PlaceMapNameSign:: ; b8098 (2e:4098)
LoadMapNameSignGFX: ; b80c6
ld de, MapEntryFrameGFX
ld hl, VTiles2 tile $60
ld hl, vTiles2 tile $60
lb bc, BANK(MapEntryFrameGFX), $e
call Get2bpp
ret
@ -648,19 +648,19 @@ LoadFishingGFX: ; b84b3
ld [rVBK], a
ld de, FishingGFX
ld a, [PlayerGender]
ld a, [wPlayerGender]
bit 0, a
jr z, .got_gender
ld de, KrisFishingGFX
.got_gender
ld hl, VTiles0 tile $02
ld hl, vTiles0 tile $02
call .LoadGFX
ld hl, VTiles0 tile $06
ld hl, vTiles0 tile $06
call .LoadGFX
ld hl, VTiles0 tile $0a
ld hl, vTiles0 tile $0a
call .LoadGFX
ld hl, VTiles1 tile $7c
ld hl, vTiles1 tile $7c
call .LoadGFX
pop af

8
engine/evolution_animation.asm
View File

@ -39,7 +39,7 @@ EvolutionAnimation: ; 4e5e1
farcall ClearSpriteAnims
ld de, .GFX
ld hl, VTiles0
ld hl, vTiles0
lb bc, BANK(.GFX), 8
call Request2bpp
@ -58,8 +58,8 @@ EvolutionAnimation: ; 4e5e1
ld [CurSpecies], a
call .PlaceFrontpic
ld de, VTiles2
ld hl, VTiles2 tile $31
ld de, vTiles2
ld hl, vTiles2 tile $31
ld bc, 7 * 7
call Request2bpp
@ -167,7 +167,7 @@ EvolutionAnimation: ; 4e5e1
call GetBaseData
ld a, $1
ld [wBoxAlignment], a
ld de, VTiles2
ld de, vTiles2
predef GetAnimatedFrontpicPredef
xor a
ld [wBoxAlignment], a

4
engine/gbc_only.asm
View File

@ -20,12 +20,12 @@ GBCOnlyScreen: ; 4ea82
ld [rSVBK], a
ld de, $d000
ld hl, VTiles2
ld hl, vTiles2
lb bc, BANK(GBCOnlyGFX), $54
call Get2bpp
ld de, Font
ld hl, VTiles1
ld hl, vTiles1
lb bc, BANK(Font), $80
call Get1bpp

6
engine/init_gender.asm
View File

@ -3,7 +3,7 @@ InitCrystalData: ; 48000
ld [wd474], a
xor a
ld [wd473], a
ld [PlayerGender], a
ld [wPlayerGender], a
ld [wd475], a
ld [wd476], a
ld [wd477], a
@ -37,7 +37,7 @@ InitGender: ; 48dcb (12:4dcb)
call CloseWindow
ld a, [wMenuCursorY]
dec a
ld [PlayerGender], a
ld [wPlayerGender], a
ld c, 10
call DelayFrames
ret
@ -105,7 +105,7 @@ LoadGenderScreenPal: ; 48e47 (12:4e47)
LoadGenderScreenLightBlueTile: ; 48e64 (12:4e64)
ld de, .LightBlueTile
ld hl, VTiles2 tile $00
ld hl, vTiles2 tile $00
lb bc, BANK(.LightBlueTile), 1
call Get2bpp
ret

4
engine/init_hof_credits.asm
View File

@ -6,7 +6,7 @@ InitDisplayForHallOfFame: ; 4e881
call LoadStandardFont
call LoadFontsBattleExtra
hlbgcoord 0, 0
ld bc, VBGMap1 - VBGMap0
ld bc, vBGMap1 - vBGMap0
ld a, " "
call ByteFill
hlcoord 0, 0, AttrMap
@ -36,7 +36,7 @@ InitDisplayForRedCredits: ; 4e8c2
call LoadStandardFont
call LoadFontsBattleExtra
hlbgcoord 0, 0
ld bc, VBGMap1 - VBGMap0
ld bc, vBGMap1 - vBGMap0
ld a, " "
call ByteFill
hlcoord 0, 0, AttrMap

12
engine/init_map.asm
View File

@ -27,7 +27,7 @@ ReanchorBGMap_NoOAMUpdate:: ; 6454
ld a, $90
ld [hWY], a
call OverworldTextModeSwitch
ld a, HIGH(VBGMap1)
ld a, HIGH(vBGMap1)
call .LoadBGMapAddrIntoHRAM
call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
farcall LoadOW_BGPal7
@ -38,11 +38,11 @@ ReanchorBGMap_NoOAMUpdate:: ; 6454
ld [hBGMapMode], a
ld [hWY], a
farcall HDMATransfer_FillBGMap0WithBlack ; no need to farcall
ld a, HIGH(VBGMap0)
ld a, HIGH(vBGMap0)
call .LoadBGMapAddrIntoHRAM
xor a ; LOW(VBGMap0)
xor a ; LOW(vBGMap0)
ld [wBGMapAnchor], a
ld a, HIGH(VBGMap0)
ld a, HIGH(vBGMap0)
ld [wBGMapAnchor + 1], a
xor a
ld [hSCX], a
@ -90,9 +90,9 @@ HDMATransfer_FillBGMap0WithBlack: ; 64db
ld [rHDMA1], a
ld a, LOW(wDecompressScratch)
ld [rHDMA2], a
ld a, HIGH(VBGMap0 % $8000)
ld a, HIGH(vBGMap0 % $8000)
ld [rHDMA3], a
ld a, LOW(VBGMap0 % $8000)
ld a, LOW(vBGMap0 % $8000)
ld [rHDMA4], a
ld a, $3f
ld [hDMATransfer], a

28
engine/intro_menu.asm
View File

@ -193,8 +193,8 @@ _ResetWRAM: ; 5bae
xor a
ld [MonType], a
ld [JohtoBadges], a
ld [KantoBadges], a
ld [wJohtoBadges], a
ld [wKantoBadges], a
ld [Coins], a
ld [Coins + 1], a
@ -483,7 +483,7 @@ FinishContinueFunction: ; 5e5d
xor a
ld [wDontPlayMapMusicOnReload], a
ld [wLinkMode], a
ld hl, GameTimerPause
ld hl, wGameTimerPause
set 0, [hl]
res 7, [hl]
ld hl, wEnteredMapFromContinue
@ -540,7 +540,7 @@ Continue_LoadMenuHeader: ; 5ebf
xor a
ld [hBGMapMode], a
ld hl, .MenuDataHeader_Dex
ld a, [StatusFlags]
ld a, [wStatusFlags]
bit 0, a ; pokedex
jr nz, .pokedex_header
ld hl, .MenuDataHeader_NoDex
@ -631,7 +631,7 @@ Continue_UnknownGameTime: ; 5f48
Continue_DisplayBadgeCount: ; 5f58
push hl
ld hl, JohtoBadges
ld hl, wJohtoBadges
ld b, 2
call CountSetBits
pop hl
@ -641,7 +641,7 @@ Continue_DisplayBadgeCount: ; 5f58
; 5f6b
Continue_DisplayPokedexNumCaught: ; 5f6b
ld a, [StatusFlags]
ld a, [wStatusFlags]
bit 0, a ; Pokedex
ret z
push hl
@ -813,7 +813,7 @@ NamePlayer: ; 0x6074
ld hl, PlayerName
ld de, .Chris
ld a, [PlayerGender]
ld a, [wPlayerGender]
bit 0, a
jr z, .Male
ld de, .Kris
@ -942,7 +942,7 @@ Intro_WipeInFrontpic: ; 6182
; 619c
Intro_PrepTrainerPic: ; 619c
ld de, VTiles2
ld de, vTiles2
farcall GetTrainerPic
xor a
ld [hGraphicStartTile], a
@ -953,7 +953,7 @@ Intro_PrepTrainerPic: ; 619c
; 61b4
ShrinkFrame: ; 61b4
ld de, VTiles2
ld de, vTiles2
ld c, $31
predef DecompressPredef
xor a
@ -968,7 +968,7 @@ Intro_PlacePlayerSprite: ; 61cd
farcall GetPlayerIcon
ld c, $c
ld hl, VTiles0
ld hl, vTiles0
call Request2bpp
ld hl, Sprites
@ -989,7 +989,7 @@ Intro_PlacePlayerSprite: ; 61cd
ld [hli], a
ld b, 0
ld a, [PlayerGender]
ld a, [wPlayerGender]
bit 0, a
jr z, .male
ld b, 1
@ -1376,7 +1376,7 @@ Copyright: ; 63e2
call ClearTileMap
call LoadFontsExtra
ld de, CopyrightGFX
ld hl, VTiles2 tile $60
ld hl, vTiles2 tile $60
lb bc, BANK(CopyrightGFX), $1d
call Request2bpp
hlcoord 2, 7
@ -1405,9 +1405,9 @@ GameInit:: ; 642e
call ClearWindowData
call ClearBGPalettes
call ClearTileMap
ld a, HIGH(VBGMap0)
ld a, HIGH(vBGMap0)
ld [hBGMapAddress + 1], a
xor a ; LOW(VBGMap0)
xor a ; LOW(vBGMap0)
ld [hBGMapAddress], a
ld [hJoyDown], a
ld [hSCX], a

4
engine/link_trade.asm
View File

@ -4,7 +4,7 @@ INCBIN "gfx/trade/border_tiles.2bpp"
__LoadTradeScreenBorder: ; 16d421
ld de, LinkCommsBorderGFX
ld hl, VTiles2
ld hl, vTiles2
lb bc, BANK(LinkCommsBorderGFX), 70
call Get2bpp
ret
@ -139,7 +139,7 @@ _LoadTradeScreenBorder: ; 16d696
LinkComms_LoadPleaseWaitTextboxBorderGFX: ; 16d69a
ld de, LinkCommsBorderGFX + $30 tiles
ld hl, VTiles2 tile $76
ld hl, vTiles2 tile $76
lb bc, BANK(LinkCommsBorderGFX), 8
call Get2bpp
ret

26
engine/mail_2.asm
View File

@ -28,7 +28,7 @@ ReadAnyMail: ; b9237
ld de, SpanishItalianFont
.got_font
ld hl, VTiles1
ld hl, vTiles1
lb bc, BANK(StandardEnglishFont), $80
call Get1bpp
pop de
@ -128,7 +128,7 @@ MailGFXPointers: ; b92f8
LoadSurfMailGFX: ; b9317
push bc
ld hl, VTiles2 tile $31
ld hl, vTiles2 tile $31
ld de, SurfMailBorderGFX
ld c, 8 * 8
call LoadMailGFX_Color2
@ -142,7 +142,7 @@ LoadSurfMailGFX: ; b9317
LoadLiteBlueMailGFX: ; b9335
push bc
ld hl, VTiles2 tile $31
ld hl, vTiles2 tile $31
ld de, LiteBlueMailBorderGFX
ld c, 8 * 8
call LoadMailGFX_Color2
@ -213,7 +213,7 @@ FinishLoadingSurfLiteBlueMailGFX: ; b9351
LoadEonMailGFX: ; b93d2
push bc
ld hl, VTiles2 tile $31
ld hl, vTiles2 tile $31
ld de, EonMailBorder1GFX
ld c, 1 * 8
call LoadMailGFX_Color2
@ -232,7 +232,7 @@ LoadEonMailGFX: ; b93d2
ld de, MailEeveeGFX
ld c, 6 * 8
call LoadMailGFX_Color3
ld hl, VTiles2 tile $3d
ld hl, vTiles2 tile $3d
ld de, MailLargeCircleGFX
ld c, 4 * 8
call LoadMailGFX_Color1
@ -263,7 +263,7 @@ LoadEonMailGFX: ; b93d2
LoadLovelyMailGFX: ; b944b
push bc
ld hl, VTiles2 tile $31
ld hl, vTiles2 tile $31
ld de, LovelyMailBorderGFX
ld c, 5 * 8
call LoadMailGFX_Color2
@ -326,7 +326,7 @@ LovelyEonMail_PlaceIcons: ; b9491
LoadMorphMailGFX: ; b94d6
push bc
ld hl, VTiles2 tile $31
ld hl, vTiles2 tile $31
ld bc, 5 * 8
call MailGFX_GenerateMonochromeTilesColor2
ld de, MorphMailBorderCornerGFX + 3 * 8
@ -402,7 +402,7 @@ LoadMorphMailGFX: ; b94d6
LoadBlueSkyMailGFX: ; b9582
push bc
ld hl, VTiles2 tile $31
ld hl, vTiles2 tile $31
ld de, EonMailBorder1GFX
ld c, 1 * 8
call LoadMailGFX_Color2
@ -490,7 +490,7 @@ Mail_Place6TileRow: ; b9636
LoadFlowerMailGFX: ; b963e
push bc
ld hl, VTiles2 tile $31
ld hl, vTiles2 tile $31
ld de, FlowerMailBorderGFX
ld c, 8 * 8
call LoadMailGFX_Color1
@ -545,14 +545,14 @@ LoadFlowerMailGFX: ; b963e
LoadPortraitMailGFX: ; b96ca
push bc
ld hl, VTiles2 tile $31
ld hl, vTiles2 tile $31
ld de, PortraitMailBorderGFX
ld c, 5 * 8
call LoadMailGFX_Color2
ld de, PortraitMailUnderlineGFX
ld c, 1 * 8
call LoadMailGFX_Color2
ld hl, VTiles2 tile $3d
ld hl, vTiles2 tile $3d
ld de, PortraitMailLargePokeballGFX
ld c, 4 * 8
call LoadMailGFX_Color1
@ -576,7 +576,7 @@ LoadPortraitMailGFX: ; b96ca
LoadMusicMailGFX: ; b9710
push bc
ld hl, VTiles2 tile $31
ld hl, vTiles2 tile $31
ld de, MusicMailBorderGFX
ld c, 4 * 8
call LoadMailGFX_Color2
@ -619,7 +619,7 @@ LoadMusicMailGFX: ; b9710
LoadMirageMailGFX: ; b9776
push bc
ld hl, VTiles2 tile $31
ld hl, vTiles2 tile $31
ld bc, 5 * 8
call MailGFX_GenerateMonochromeTilesColor2
ld de, BlueSkyMailGrassGFX

6
engine/main_menu.asm
View File

@ -9,7 +9,7 @@ MainMenu: ; 49cdc
ld b, SCGB_DIPLOMA
call GetSGBLayout
call SetPalettes
ld hl, GameTimerPause
ld hl, wGameTimerPause
res 0, [hl]
call MainMenu_GetWhichMenu
ld [wWhichIndexSet], a
@ -168,7 +168,7 @@ MainMenu_GetWhichMenu: ; 49da4
cp -1
call CloseSRAM
jr nz, .mystery_gift
ld a, [StatusFlags]
ld a, [wStatusFlags]
bit 7, a
ld a, $1 ; Continue
jr z, .ok
@ -182,7 +182,7 @@ MainMenu_GetWhichMenu: ; 49da4
ret
.mystery_gift
ld a, [StatusFlags]
ld a, [wStatusFlags]
bit 7, a
jr z, .ok3
jr .ok3

2
engine/map_setup.asm
View File

@ -168,7 +168,7 @@ CheckReplaceKrisSprite: ; 154f7
.CheckBiking: ; 1550c (5:550c)
and a
ld hl, BikeFlags
ld hl, wBikeFlags
bit 1, [hl]
ret z
ld a, PLAYER_BIKE

4
engine/mart.asm
View File

@ -58,7 +58,7 @@ BargainShop: ; 15a84
ld a, [hli]
or [hl]
jr z, .skip_set
ld hl, DailyFlags
ld hl, wDailyFlags
set 6, [hl]
.skip_set
@ -81,7 +81,7 @@ Pharmacist: ; 15aae
RooftopSale: ; 15ac4
ld b, BANK(RooftopSaleData1)
ld de, RooftopSaleData1
ld hl, StatusFlags
ld hl, wStatusFlags
bit 6, [hl] ; hall of fame
jr z, .ok
ld b, BANK(RooftopSaleData2)

2
engine/mon_icons.asm
View File

@ -331,7 +331,7 @@ rept 4
add hl, hl
endr
ld de, VTiles0
ld de, vTiles0
add hl, de
push hl

6
engine/mystery_gift.asm
View File

@ -1277,7 +1277,7 @@ InitMysteryGiftLayout: ; 105153 (41:5153)
call ClearBGPalettes
call DisableLCD
ld hl, MysteryGiftGFX
ld de, VTiles2 tile $00
ld de, vTiles2 tile $00
ld a, BANK(MysteryGiftGFX)
ld bc, MysteryGiftGFXEnd - MysteryGiftGFX
call FarCopyBytes
@ -1576,12 +1576,12 @@ Function1057d7: ; 1057d7 (41:57d7)
call ClearBGPalettes
call DisableLCD
ld hl, MysteryGiftJP_GFX
ld de, VTiles2 tile $00
ld de, vTiles2 tile $00
ld a, BANK(MysteryGiftJP_GFX)
lb bc, 4, 0
call FarCopyBytes
ld hl, MysteryGiftJP_GFX + $400
ld de, VTiles0 tile $00
ld de, vTiles0 tile $00
ld a, BANK(MysteryGiftJP_GFX)
ld bc, $80
call FarCopyBytes

16
engine/namingscreen.asm
View File

@ -175,7 +175,7 @@ NamingScreen: ; 116c1
.Box: ; 117f5 (4:57f5)
ld de, PokeBallSpriteGFX
ld hl, VTiles0 tile $00
ld hl, vTiles0 tile $00
lb bc, BANK(PokeBallSpriteGFX), $4
call Request2bpp
xor a
@ -217,7 +217,7 @@ NamingScreen: ; 116c1
.LoadSprite: ; 11847 (4:5847)
push de
ld hl, VTiles0 tile $00
ld hl, vTiles0 tile $00
ld c, $4
push bc
call Request2bpp
@ -226,7 +226,7 @@ NamingScreen: ; 116c1
add hl, de
ld e, l
ld d, h
ld hl, VTiles0 tile $04
ld hl, vTiles0 tile $04
call Request2bpp
xor a
ld hl, wSpriteAnimDict
@ -905,22 +905,22 @@ LoadNamingScreenGFX: ; 11c51
call LoadFontsExtra
ld de, NamingScreenGFX_MiddleLine
ld hl, VTiles1 tile $6b
ld hl, vTiles1 tile $6b
lb bc, BANK(NamingScreenGFX_MiddleLine), 1
call Get1bpp
ld de, NamingScreenGFX_UnderLine
ld hl, VTiles1 tile $72
ld hl, vTiles1 tile $72
lb bc, BANK(NamingScreenGFX_UnderLine), 1
call Get1bpp
ld de, VTiles2 tile $60
ld de, vTiles2 tile $60
ld hl, NamingScreenGFX_Border
ld bc, 1 tiles
ld a, BANK(NamingScreenGFX_Border)
call FarCopyBytes
ld de, VTiles0 tile $7e
ld de, vTiles0 tile $7e
ld hl, NamingScreenGFX_Cursor
ld bc, 2 tiles
ld a, BANK(NamingScreenGFX_Cursor)
@ -998,7 +998,7 @@ _ComposeMailMessage: ; 11e75 (mail?)
call ClearBGPalettes
call DisableLCD
call LoadNamingScreenGFX
ld de, VTiles0 tile $00
ld de, vTiles0 tile $00
ld hl, .MailIcon
ld bc, 8 tiles
ld a, BANK(.MailIcon)

6
engine/overworld.asm
View File

@ -64,7 +64,7 @@ GetPlayerSprite: ; 14183
ld a, [wPlayerSpriteSetupFlags]
bit 2, a
jr nz, .go
ld a, [PlayerGender]
ld a, [wPlayerGender]
bit 0, a
jr z, .go
ld hl, .Kris
@ -663,10 +663,10 @@ rept 4
add hl, hl
endr
ld a, l
add LOW(VTiles0)
add LOW(vTiles0)
ld l, a
ld a, h
adc HIGH(VTiles0)
adc HIGH(vTiles0)
ld h, a
ret
; 14418

6
engine/pack.asm
View File

@ -1294,7 +1294,7 @@ DrawPackGFX: ; 1089d
ld a, [BattleType]
cp BATTLETYPE_TUTORIAL
jr z, .male_dude
ld a, [PlayerGender]
ld a, [wPlayerGender]
bit 0, a
jr nz, .female
.male_dude
@ -1304,7 +1304,7 @@ DrawPackGFX: ; 1089d
ld a, [hli]
ld e, a
ld d, [hl]
ld hl, VTiles2 tile $50
ld hl, vTiles2 tile $50
lb bc, BANK(PackGFX), 15
call Request2bpp
ret
@ -1411,7 +1411,7 @@ Pack_InitGFX: ; 10955
call ClearSprites
call DisableLCD
ld hl, PackMenuGFX
ld de, VTiles2
ld de, vTiles2
ld bc, $60 tiles
ld a, BANK(PackMenuGFX)
call FarCopyBytes

10
engine/pic_animation.asm
View File

@ -56,7 +56,7 @@ pokeanim: MACRO
rept _NARG
; Workaround for a bug where macro args can't come after the start of a symbol
if !def(\1_POKEANIM)
\1_POKEANIM equs "PokeAnim_\1_"
\1_POKEANIM EQUS "PokeAnim_\1_"
endc
db (\1_POKEANIM - PokeAnim_SetupCommands) / 2
shift
@ -142,9 +142,9 @@ SetUpPokeAnim: ; d00b4
; d00da
PokeAnim_SetupCommands: ; d00da
setup_command: macro
setup_command: MACRO
\1_: dw \1
endm
ENDM
setup_command PokeAnim_Finish
setup_command PokeAnim_BasePic
setup_command PokeAnim_SetWait
@ -586,7 +586,7 @@ x = x + 1
endr
y = y + 7
endr
endm
ENDM
PokeAnim_ConvertAndApplyBitmask: ; d036b
xor a
@ -1120,7 +1120,7 @@ HOF_AnimateFrontpic: ; d066e Predef 49
ld l, e
push bc
push hl
ld de, VTiles2
ld de, vTiles2
predef GetAnimatedFrontpicPredef
pop hl
pop bc

32
engine/player_gfx.asm
View File

@ -1,7 +1,7 @@
Function88248: ; 88248
; XXX
ld c, CAL
ld a, [PlayerGender]
ld a, [wPlayerGender]
bit 0, a
jr z, .okay
ld c, KAREN
@ -58,7 +58,7 @@ MovePlayerPic: ; 88266
ShowPlayerNamingChoices: ; 88297
ld hl, ChrisNameMenuHeader
ld a, [PlayerGender]
ld a, [wPlayerGender]
bit 0, a
jr z, .GotGender
ld hl, KrisNameMenuHeader
@ -76,7 +76,7 @@ INCLUDE "data/default_names.asm"
GetPlayerNameArray: ; 88318 This Function is never called
ld hl, PlayerName
ld de, MalePlayerNameArray
ld a, [PlayerGender]
ld a, [wPlayerGender]
bit 0, a
jr z, .done
ld de, FemalePlayerNameArray
@ -92,7 +92,7 @@ GetPlayerIcon: ; 8832c
ld de, ChrisSpriteGFX
ld b, BANK(ChrisSpriteGFX)
ld a, [PlayerGender]
ld a, [wPlayerGender]
bit 0, a
jr z, .done
@ -105,17 +105,17 @@ GetPlayerIcon: ; 8832c
GetCardPic: ; 8833e
ld hl, ChrisCardPic
ld a, [PlayerGender]
ld a, [wPlayerGender]
bit 0, a
jr z, .GotClass
ld hl, KrisCardPic
.GotClass:
ld de, VTiles2 tile $00
ld de, vTiles2 tile $00
ld bc, $23 tiles
ld a, BANK(ChrisCardPic) ; BANK(KrisCardPic)
call FarCopyBytes
ld hl, CardGFX
ld de, VTiles2 tile $23
ld de, vTiles2 tile $23
ld bc, 6 tiles
ld a, BANK(CardGFX)
call FarCopyBytes
@ -131,7 +131,7 @@ CardGFX: ; 887c5
INCBIN "gfx/trainer_card/trainer_card.2bpp"
GetPlayerBackpic: ; 88825
ld a, [PlayerGender]
ld a, [wPlayerGender]
bit 0, a
jr z, GetChrisBackpic
call GetKrisBackpic
@ -140,7 +140,7 @@ GetPlayerBackpic: ; 88825
GetChrisBackpic: ; 88830
ld hl, ChrisBackpic
ld b, BANK(ChrisBackpic)
ld de, VTiles2 tile $31
ld de, vTiles2 tile $31
ld c, 7 * 7
predef DecompressPredef
ret
@ -150,7 +150,7 @@ HOF_LoadTrainerFrontpic: ; 88840
xor a
ld [hBGMapMode], a
ld e, 0
ld a, [PlayerGender]
ld a, [wPlayerGender]
bit 0, a
jr z, .GotClass
ld e, 1
@ -159,13 +159,13 @@ HOF_LoadTrainerFrontpic: ; 88840
ld a, e
ld [TrainerClass], a
ld de, ChrisPic
ld a, [PlayerGender]
ld a, [wPlayerGender]
bit 0, a
jr z, .GotPic
ld de, KrisPic
.GotPic:
ld hl, VTiles2
ld hl, vTiles2
ld b, BANK(ChrisPic) ; BANK(KrisPic)
ld c, 7 * 7
call Get2bpp
@ -179,7 +179,7 @@ DrawIntroPlayerPic: ; 88874
; Get class
ld e, CHRIS
ld a, [PlayerGender]
ld a, [wPlayerGender]
bit 0, a
jr z, .GotClass
ld e, KRIS
@ -189,12 +189,12 @@ DrawIntroPlayerPic: ; 88874
; Load pic
ld de, ChrisPic
ld a, [PlayerGender]
ld a, [wPlayerGender]
bit 0, a
jr z, .GotPic
ld de, KrisPic
.GotPic:
ld hl, VTiles2
ld hl, vTiles2
ld b, BANK(ChrisPic) ; BANK(KrisPic)
ld c, 7 * 7 ; dimensions
call Get2bpp
@ -216,7 +216,7 @@ INCBIN "gfx/player/kris.2bpp"
GetKrisBackpic: ; 88ec9
; Kris's backpic is uncompressed.
ld de, KrisBackpic
ld hl, VTiles2 tile $31
ld hl, vTiles2 tile $31
lb bc, BANK(KrisBackpic), 7 * 7 ; dimensions
call Get2bpp
ret

6
engine/player_movement.asm
View File

@ -18,7 +18,7 @@ DoPlayerMovement:: ; 80000
; Standing downhill instead moves down.
ld hl, BikeFlags
ld hl, wBikeFlags
bit 2, [hl] ; downhill
ret z
@ -285,7 +285,7 @@ DoPlayerMovement:: ; 80000
call .BikeCheck
jr nz, .walk
ld hl, BikeFlags
ld hl, wBikeFlags
bit 2, [hl] ; downhill
jr z, .fast
@ -672,7 +672,7 @@ DoPlayerMovement:: ; 80000
.CheckStrengthBoulder: ; 8036f
ld hl, BikeFlags
ld hl, wBikeFlags
bit 0, [hl] ; using strength
jr z, .not_boulder

2
engine/player_object.asm
View File

@ -33,7 +33,7 @@ SpawnPlayer: ; 8029
ld a, [wPlayerSpriteSetupFlags]
bit 2, a
jr nz, .ok
ld a, [PlayerGender]
ld a, [wPlayerGender]
bit 0, a
jr z, .ok
ln e, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT

4
engine/player_step.asm
View File

@ -156,7 +156,7 @@ UpdateOverworldMap: ; d536 (3:5536)
ld a, [wBGMapAnchor + 1]
inc a
and $3
or HIGH(VBGMap0)
or HIGH(vBGMap0)
ld [wBGMapAnchor + 1], a
.not_overflowed
ld hl, wMetatileStandingY
@ -187,7 +187,7 @@ UpdateOverworldMap: ; d536 (3:5536)
ld a, [wBGMapAnchor + 1]
dec a
and $3
or HIGH(VBGMap0)
or HIGH(vBGMap0)
ld [wBGMapAnchor + 1], a
.not_underflowed
ld hl, wMetatileStandingY

28
engine/pokedex.asm
View File

@ -103,7 +103,7 @@ InitPokedex: ; 40063
ret
Pokedex_CheckUnlockedUnownMode: ; 400a2
ld a, [StatusFlags]
ld a, [wStatusFlags]
bit 1, a
jr nz, .unlocked
@ -828,7 +828,7 @@ Pokedex_UpdateUnownMode: ; 405df (10:45df)
.decompress
ld hl, PokedexLZ
ld de, VTiles2 tile $31
ld de, vTiles2 tile $31
lb bc, BANK(PokedexLZ), $3a
call DecompressRequest2bpp
@ -2402,7 +2402,7 @@ Pokedex_LoadSelectedMonTiles: ; 4143b
ld a, [wd265]
ld [CurPartySpecies], a
call GetBaseData
ld de, VTiles2
ld de, vTiles2
predef GetMonFrontpic
ret
@ -2410,7 +2410,7 @@ Pokedex_LoadSelectedMonTiles: ; 4143b
ld a, BANK(sScratch)
call GetSRAMBank
farcall LoadQuestionMarkPic
ld hl, VTiles2
ld hl, vTiles2
ld de, sScratch
ld c, 7 * 7
ld a, [hROMBank]
@ -2445,7 +2445,7 @@ Pokedex_LoadAnyFootprint: ; 4147b
push hl
ld e, l
ld d, h
ld hl, VTiles2 tile $62
ld hl, vTiles2 tile $62
lb bc, BANK(Footprints), 2
call Request1bpp
pop hl
@ -2457,7 +2457,7 @@ Pokedex_LoadAnyFootprint: ; 4147b
ld e, l
ld d, h
ld hl, VTiles2 tile $64
ld hl, vTiles2 tile $64
lb bc, BANK(Footprints), 2
call Request1bpp
@ -2466,13 +2466,13 @@ Pokedex_LoadAnyFootprint: ; 4147b
Pokedex_LoadGFX: ; 414b7
call DisableLCD
ld hl, VTiles2
ld hl, vTiles2
ld bc, $31 tiles
xor a
call ByteFill
call Pokedex_LoadInvertedFont
call LoadFontsExtra
ld hl, VTiles2 tile $60
ld hl, vTiles2 tile $60
ld bc, $20 tiles
call Pokedex_InvertTiles
call Pokedex_CheckSGB
@ -2482,12 +2482,12 @@ Pokedex_LoadGFX: ; 414b7
.LoadPokedexLZ:
ld hl, PokedexLZ
ld de, VTiles2 tile $31
ld de, vTiles2 tile $31
call Decompress
.LoadPokedexSlowpokeLZ:
ld hl, PokedexSlowpokeLZ
ld de, VTiles0
ld de, vTiles0
call Decompress
ld a, 6
call SkipMusic
@ -2496,7 +2496,7 @@ Pokedex_LoadGFX: ; 414b7
Pokedex_LoadInvertedFont: ; 414fb
call LoadStandardFont
ld hl, VTiles1
ld hl, vTiles1
ld bc, $80 tiles
Pokedex_InvertTiles: ; 41504
@ -2536,7 +2536,7 @@ Pokedex_LoadUnownFont: ; 41a2c
ld bc, 27 tiles
call Pokedex_InvertTiles
ld de, sScratch + $188
ld hl, VTiles2 tile $40
ld hl, vTiles2 tile $40
lb bc, BANK(Pokedex_LoadUnownFont), 27
call Request2bpp
call CloseSRAM
@ -2555,7 +2555,7 @@ Pokedex_LoadUnownFrontpicTiles: ; 41a58 (10:5a58)
ld a, UNOWN
ld [CurPartySpecies], a
call GetBaseData
ld de, VTiles2 tile $00
ld de, vTiles2 tile $00
predef GetMonFrontpic
pop af
ld [UnownLetter], a
@ -2585,7 +2585,7 @@ _NewPokedexEntry: ; 41a7f
call EnableLCD
call WaitBGMap
call GetBaseData
ld de, VTiles2
ld de, vTiles2
predef GetMonFrontpic
ld a, SCGB_POKEDEX
call Pokedex_GetSGBLayout

4
engine/pokedex_3.asm
View File

@ -1,12 +1,12 @@
LoadSGBPokedexGFX: ; 1ddf1c
ld hl, SGBPokedexGFX_LZ
ld de, VTiles2 tile $31
ld de, vTiles2 tile $31
call Decompress
ret
LoadSGBPokedexGFX2: ; 1ddf26 (77:5f26)
ld hl, SGBPokedexGFX_LZ
ld de, VTiles2 tile $31
ld de, vTiles2 tile $31
lb bc, BANK(SGBPokedexGFX_LZ), $3a
call DecompressRequest2bpp
ret

66
engine/pokegear.asm
View File

@ -35,9 +35,9 @@ PokeGear: ; 90b8d (24:4b8d)
pop af
ld [Options], a
call ClearBGPalettes
xor a ; LOW(VBGMap0)
xor a ; LOW(vBGMap0)
ld [hBGMapAddress], a
ld a, HIGH(VBGMap0)
ld a, HIGH(vBGMap0)
ld [hBGMapAddress + 1], a
ld a, $90
ld [hWY], a
@ -88,15 +88,15 @@ PokeGear: ; 90b8d (24:4b8d)
Pokegear_LoadGFX: ; 90c4e
call ClearVBank1
ld hl, TownMapGFX
ld de, VTiles2
ld de, vTiles2
ld a, BANK(TownMapGFX)
call FarDecompress
ld hl, PokegearGFX
ld de, VTiles2 + $30 tiles
ld de, vTiles2 + $30 tiles
ld a, BANK(PokegearGFX)
call FarDecompress
ld hl, PokegearSpritesGFX
ld de, VTiles0
ld de, vTiles0
ld a, BANK(PokegearSpritesGFX)
call Decompress
ld a, [MapGroup]
@ -113,7 +113,7 @@ Pokegear_LoadGFX: ; 90c4e
ld a, b
; standing sprite
push af
ld de, VTiles0 tile $10
ld de, vTiles0 tile $10
ld bc, 4 tiles
call FarCopyBytes
pop af
@ -121,14 +121,14 @@ Pokegear_LoadGFX: ; 90c4e
; walking sprite
ld de, 12 tiles
add hl, de
ld de, VTiles0 tile $14
ld de, vTiles0 tile $14
ld bc, 4 tiles
call FarCopyBytes
ret
.ssaqua
ld hl, FastShipGFX
ld de, VTiles0 tile $10
ld de, vTiles0 tile $10
ld bc, 8 tiles
call CopyBytes
ret
@ -243,18 +243,18 @@ InitPokegearTilemap: ; 90da8 (24:4da8)
ld a, [wcf65]
and a
jr nz, .kanto_0
xor a ; LOW(VBGMap0)
xor a ; LOW(vBGMap0)
ld [hBGMapAddress], a
ld a, HIGH(VBGMap0)
ld a, HIGH(vBGMap0)
ld [hBGMapAddress + 1], a
call .UpdateBGMap
ld a, $90
jr .finish
.kanto_0
xor a ; LOW(VBGMap1)
xor a ; LOW(vBGMap1)
ld [hBGMapAddress], a
ld a, HIGH(VBGMap1)
ld a, HIGH(vBGMap1)
ld [hBGMapAddress + 1], a
call .UpdateBGMap
xor a
@ -657,7 +657,7 @@ PokegearMap_InitPlayerIcon: ; 9106a
push af
depixel 0, 0
ld b, SPRITE_ANIM_INDEX_RED_WALK
ld a, [PlayerGender]
ld a, [wPlayerGender]
bit 0, a
jr z, .got_gender
ld b, SPRITE_ANIM_INDEX_BLUE_WALK
@ -734,7 +734,7 @@ PokegearMap_UpdateCursorPosition: ; 910d4
; 910e8
TownMap_GetKantoLandmarkLimits: ; 910e8
ld a, [StatusFlags]
ld a, [wStatusFlags]
bit 6, a
jr z, .not_hof
ld d, ROUTE_28
@ -1583,7 +1583,7 @@ RadioChannels:
.EvolutionRadio:
; This station airs in the Lake of Rage area when Rocket are still in Mahogany.
ld a, [StatusFlags]
ld a, [wStatusFlags]
bit 4, a
jr z, .NoSignal
ld a, [wPokegearMapPlayerIconLandmark]
@ -1669,7 +1669,7 @@ LoadStation_BuenasPassword: ; 917a5 (24:57a5)
ld hl, PlayRadioShow
call Radio_BackUpFarCallParams
ld de, NotBuenasPasswordName
ld a, [StatusFlags2]
ld a, [wStatusFlags2]
bit 0, a
ret z
ld de, BuenasPasswordName
@ -2119,7 +2119,7 @@ _FlyMap: ; 91af3
farcall ClearSpriteAnims
call LoadTownMapGFX
ld de, FlyMapLabelBorderGFX
ld hl, VTiles2 tile $30
ld hl, vTiles2 tile $30
lb bc, BANK(FlyMapLabelBorderGFX), 6
call Request1bpp
call FlyMap
@ -2161,9 +2161,9 @@ _FlyMap: ; 91af3
call ClearBGPalettes
ld a, $90
ld [hWY], a
xor a ; LOW(VBGMap0)
xor a ; LOW(vBGMap0)
ld [hBGMapAddress], a
ld a, HIGH(VBGMap0)
ld a, HIGH(vBGMap0)
ld [hBGMapAddress + 1], a
ld a, [wTownMapPlayerIconLandmark]
ld e, a
@ -2329,7 +2329,7 @@ CheckIfVisitedFlypoint: ; 91c3c
HasVisitedSpawn: ; 91c50
; Check if spawn point c has been visited.
ld hl, VisitedSpawns
ld hl, wVisitedSpawns
ld b, CHECK_FLAG
ld d, 0
predef FlagPredef
@ -2455,18 +2455,18 @@ _Area: ; 91d11
ld a, $1
ld [hInMenu], a
ld de, PokedexNestIconGFX
ld hl, VTiles0 tile $7f
ld hl, vTiles0 tile $7f
lb bc, BANK(PokedexNestIconGFX), 1
call Request2bpp
call .GetPlayerOrFastShipIcon
ld hl, VTiles0 tile $78
ld hl, vTiles0 tile $78
ld c, 4
call Request2bpp
call LoadTownMapGFX
call FillKantoMap
call .PlaceString_MonsNest
call TownMapPals
hlbgcoord 0, 0, VBGMap1
hlbgcoord 0, 0, vBGMap1
call TownMapBGUpdate
call FillJohtoMap
call .PlaceString_MonsNest
@ -2530,7 +2530,7 @@ _Area: ; 91d11
ret
.right
ld a, [StatusFlags]
ld a, [wStatusFlags]
bit 6, a ; hall of fame
ret z
ld a, [hWY]
@ -2659,7 +2659,7 @@ _Area: ; 91d11
inc de
push bc
ld c, 0 ; RED
ld a, [PlayerGender]
ld a, [wPlayerGender]
bit 0, a
jr z, .got_gender
inc c ; BLUE
@ -2871,7 +2871,7 @@ TownMapPlayerIcon: ; 91fa6
push af
farcall GetPlayerIcon
; Standing icon
ld hl, VTiles0 tile $10
ld hl, vTiles0 tile $10
ld c, 4 ; # tiles
call Request2bpp
; Walking icon
@ -2879,14 +2879,14 @@ TownMapPlayerIcon: ; 91fa6
add hl, de
ld d, h
ld e, l
ld hl, VTiles0 tile $14
ld hl, vTiles0 tile $14
ld c, 4 ; # tiles
ld a, BANK(ChrisSpriteGFX) ; does nothing
call Request2bpp
; Animation/palette
depixel 0, 0
ld b, SPRITE_ANIM_INDEX_RED_WALK ; Male
ld a, [PlayerGender]
ld a, [wPlayerGender]
bit 0, a
jr z, .got_gender
ld b, SPRITE_ANIM_INDEX_BLUE_WALK ; Female
@ -2913,7 +2913,7 @@ TownMapPlayerIcon: ; 91fa6
LoadTownMapGFX: ; 91ff2
ld hl, TownMapGFX
ld de, VTiles2
ld de, vTiles2
lb bc, BANK(TownMapGFX), $30
call DecompressRequest2bpp
ret
@ -2948,13 +2948,13 @@ INCBIN "gfx/pokegear/flymap_label_border.1bpp"
farcall ClearSpriteAnims
call LoadTownMapGFX
ld de, FlyMapLabelBorderGFX
ld hl, VTiles2 tile $30
ld hl, vTiles2 tile $30
lb bc, BANK(FlyMapLabelBorderGFX), 6
call Request1bpp
call FillKantoMap
call TownMapBubble
call TownMapPals
hlbgcoord 0, 0, VBGMap1
hlbgcoord 0, 0, vBGMap1
call TownMapBGUpdate
call FillJohtoMap
call TownMapBubble
@ -3003,9 +3003,9 @@ INCBIN "gfx/pokegear/flymap_label_border.1bpp"
call ClearBGPalettes
ld a, $90
ld [hWY], a
xor a ; LOW(VBGMap0)
xor a ; LOW(vBGMap0)
ld [hBGMapAddress], a
ld a, HIGH(VBGMap0)
ld a, HIGH(vBGMap0)
ld [hBGMapAddress + 1], a
ld a, [wTownMapPlayerIconLandmark]
ld e, a

6
engine/print_party.asm
View File

@ -141,17 +141,17 @@ PrintPartyMonPage1: ; 1dc381
call LoadFontsBattleExtra
ld de, GBPrinterHPIcon
ld hl, VTiles2 tile $71
ld hl, vTiles2 tile $71
lb bc, BANK(GBPrinterHPIcon), 1
call Request1bpp
ld de, GBPrinterLvIcon
ld hl, VTiles2 tile $6e
ld hl, vTiles2 tile $6e
lb bc, BANK(GBPrinterLvIcon), 1
call Request1bpp
ld de, ShinyIconGFX
ld hl, VTiles2 tile $3f
ld hl, vTiles2 tile $3f
lb bc, BANK(ShinyIconGFX), 1
call Get2bpp

2
engine/printer.asm
View File

@ -49,7 +49,7 @@ PrintDexEntry: ; 8442c
ld a, [wPrinterQueueLength]
push af
ld hl, VTiles1
ld hl, vTiles1
ld de, FontInversed
lb bc, BANK(FontInversed), $80
call Request1bpp

16
engine/radio.asm
View File

@ -4,7 +4,7 @@ PlayRadioShow:
cp POKE_FLUTE_RADIO
jr nc, .ok
; If Team Rocket is not occupying the radio tower, we don't need to be here.
ld a, [StatusFlags2]
ld a, [wStatusFlags2]
bit 0, a ; checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
jr z, .ok
; If we're in Kanto, we don't need to be here.
@ -1176,11 +1176,11 @@ PeoplePlaces4: ; People
jr nc, PeoplePlaces4
push af
ld hl, .E4Names
ld a, [StatusFlags]
ld a, [wStatusFlags]
bit 6, a ; ENGINE_CREDITS_SKIP
jr z, .ok
ld hl, .KantoLeaderNames
ld a, [KantoBadges]
ld a, [wKantoBadges]
cp %11111111
jr nz, .ok
ld hl, .MiscNames
@ -1571,7 +1571,7 @@ BuenasPassword4:
jp c, BuenasPassword8
ld a, [wBuenasPassword]
; If we already generated the password today, we don't need to generate a new one.
ld hl, WeeklyFlags
ld hl, wWeeklyFlags
bit 7, [hl]
jr nz, .AlreadyGotIt
; There are only 11 groups to choose from.
@ -1593,7 +1593,7 @@ BuenasPassword4:
add e
ld [wBuenasPassword], a
; Set the flag so that we don't generate a new password this week.
ld hl, WeeklyFlags
ld hl, wWeeklyFlags
set 7, [hl]
.AlreadyGotIt:
ld c, a
@ -1737,14 +1737,14 @@ BuenasPassword7:
BuenasPasswordAfterMidnight:
push hl
ld hl, WeeklyFlags
ld hl, wWeeklyFlags
res 7, [hl]
pop hl
ld a, BUENAS_PASSWORD_8
jp NextRadioLine
BuenasPassword8:
ld hl, WeeklyFlags
ld hl, wWeeklyFlags
res 7, [hl]
ld hl, BuenaRadioMidnightText10
ld a, BUENAS_PASSWORD_9
@ -1812,7 +1812,7 @@ BuenasPassword20:
farcall NoRadioName
pop af
ld [hBGMapMode], a
ld hl, WeeklyFlags
ld hl, wWeeklyFlags
res 7, [hl]
ld a, BUENAS_PASSWORD
ld [wCurrentRadioLine], a

2
engine/routines/drawkrispackgfx.asm
View File

@ -5,7 +5,7 @@ DrawKrisPackGFX: ; 48e81
ld a, [hli]
ld e, a
ld d, [hl]
ld hl, VTiles2 tile $50
ld hl, vTiles2 tile $50
lb bc, BANK(PackFGFX), 15
call Request2bpp
ret

4
engine/routines/phonering_copytilemapatonce.asm
View File

@ -21,11 +21,11 @@ PhoneRing_CopyTilemapAtOnce: ; 4d188
jr c, .wait
di
ld a, BANK(VBGMap2)
ld a, BANK(vBGMap2)
ld [rVBK], a
hlcoord 0, 0, AttrMap
call .CopyTilemapAtOnce
ld a, BANK(VBGMap0)
ld a, BANK(vBGMap0)
ld [rVBK], a
hlcoord 0, 0
call .CopyTilemapAtOnce

4
engine/routines/savemenu_copytilemapatonce.asm
View File

@ -18,11 +18,11 @@ SaveMenu_CopyTilemapAtOnce: ; 4cf45 (13:4f45)
jr c, .WaitLY
di
ld a, BANK(VBGMap2)
ld a, BANK(vBGMap2)
ld [rVBK], a
hlcoord 0, 0, AttrMap
call .CopyTilemapAtOnce
ld a, BANK(VBGMap0)
ld a, BANK(vBGMap0)
ld [rVBK], a
hlcoord 0, 0
call .CopyTilemapAtOnce

2
engine/routines/trademonfrontpic.asm
View File

@ -1,7 +1,7 @@
GetTrademonFrontpic: ; 4d7fd
ld a, [wOTTrademonSpecies]
ld hl, wOTTrademonDVs
ld de, VTiles2
ld de, vTiles2
push de
push af
predef GetUnownLetter

8
engine/save.asm
View File

@ -691,8 +691,8 @@ TryLoadSaveData: ; 14f1c
ld de, StartDay
ld bc, 8
call CopyBytes
ld hl, sPlayerData + StatusFlags - wPlayerData
ld de, StatusFlags
ld hl, sPlayerData + wStatusFlags - wPlayerData
ld de, wStatusFlags
ld a, [hl]
ld [de], a
call CloseSRAM
@ -710,8 +710,8 @@ TryLoadSaveData: ; 14f1c
ld de, StartDay
ld bc, 8
call CopyBytes
ld hl, sBackupPlayerData + StatusFlags - wPlayerData
ld de, StatusFlags
ld hl, sBackupPlayerData + wStatusFlags - wPlayerData
ld de, wStatusFlags
ld a, [hl]
ld [de], a
call CloseSRAM

8
engine/scripting.asm
View File

@ -2609,14 +2609,14 @@ _EngineFlagAction:
Script_wildoff:
; script command 0x38
ld hl, StatusFlags
ld hl, wStatusFlags
set 5, [hl]
ret
Script_wildon:
; script command 0x37
ld hl, StatusFlags
ld hl, wStatusFlags
res 5, [hl]
ret
@ -2991,12 +2991,12 @@ Script_end_all:
Script_halloffame:
; script command 0xa1
ld hl, GameTimerPause
ld hl, wGameTimerPause
res 0, [hl]
farcall TrainerRankings_HallOfFame
farcall TrainerRankings_HallOfFame2
farcall HallOfFame
ld hl, GameTimerPause
ld hl, wGameTimerPause
set 0, [hl]
jr ReturnFromCredits

550
engine/slot_machine.asm
View File

File diff suppressed because it is too large Load Diff

2
engine/sprite_anims.asm
View File

@ -357,7 +357,7 @@ DoAnimFrame: ; 8d24b
ret
.SlotsGolem: ; 8d422 (23:5422)
callfar SlotMachine_AnimateGolem
callfar Slots_AnimateGolem
ret
.SlotsChansey: ; 8d429 (23:5429)

4
engine/sprites.asm
View File

@ -386,7 +386,7 @@ InitSpriteAnimBuffer: ; 8d0ec
GetSpriteAnimVTile: ; 8d109
; a = wSpriteAnimDict[a] if a in wSpriteAnimDict else 0
; VTiles offset
; vTiles offset
push hl
push bc
ld hl, wSpriteAnimDict
@ -631,7 +631,7 @@ AnimateEndOfExpBar: ; 8e79d
ld de, SGBEndOfExpBarGFX
.load
ld hl, VTiles0 tile $00
ld hl, vTiles0 tile $00
lb bc, BANK(EndOfExpBarGFX), 1
call Request2bpp
ld c, 8

12
engine/start_menu.asm
View File

@ -7,7 +7,7 @@ StartMenu:: ; 125cd
farcall ReanchorBGMap_NoOAMUpdate
ld hl, StatusFlags2
ld hl, wStatusFlags2
bit 2, [hl] ; bug catching contest
ld hl, .MenuDataHeader
jr z, .GotMenuData
@ -284,7 +284,7 @@ endr
ld [wWhichIndexSet], a
call .FillMenuList
ld hl, StatusFlags
ld hl, wStatusFlags
bit 0, [hl]
jr z, .no_pokedex
ld a, 0 ; pokedex
@ -301,7 +301,7 @@ endr
ld a, [wLinkMode]
and a
jr nz, .no_pack
ld hl, StatusFlags2
ld hl, wStatusFlags2
bit 2, [hl] ; bug catching contest
jr nz, .no_pack
ld a, 2 ; pack
@ -321,7 +321,7 @@ endr
ld a, [wLinkMode]
and a
jr nz, .no_save
ld hl, StatusFlags2
ld hl, wStatusFlags2
bit 2, [hl] ; bug catching contest
ld a, 8 ; quit
jr nz, .write
@ -390,7 +390,7 @@ endr
; 128d1
.DrawBugContestStatusBox: ; 128d1
ld hl, StatusFlags2
ld hl, wStatusFlags2
bit 2, [hl] ; bug catching contest
ret z
farcall StartMenu_DrawBugContestStatusBox
@ -398,7 +398,7 @@ endr
; 128de
.DrawBugContestStatus: ; 128de
ld hl, StatusFlags2
ld hl, wStatusFlags2
bit 2, [hl] ; bug catching contest
jr nz, .contest
ret

6
engine/stats_screen.asm
View File

@ -865,7 +865,7 @@ StatsScreen_PlaceFrontpic: ; 4e226 (13:6226)
call IsAPokemon
ret c
call StatsScreen_LoadTextBoxSpaceGFX
ld de, VTiles2 tile $00
ld de, vTiles2 tile $00
predef GetAnimatedFrontpicPredef
hlcoord 0, 0
ld d, $0
@ -954,7 +954,7 @@ StatsScreen_LoadTextBoxSpaceGFX: ; 4e307 (13:6307)
ld [rVBK], a
ld de, TextBoxSpaceGFX
lb bc, BANK(TextBoxSpaceGFX), 1
ld hl, VTiles2 tile $7f
ld hl, vTiles2 tile $7f
call Get2bpp
pop af
ld [rVBK], a
@ -1071,7 +1071,7 @@ StatsScreen_AnimateEgg: ; 4e497 (13:6497)
ld a, $1
ld [wBoxAlignment], a
call StatsScreen_LoadTextBoxSpaceGFX
ld de, VTiles2 tile $00
ld de, vTiles2 tile $00
predef GetAnimatedFrontpicPredef
pop de
hlcoord 0, 0

6
engine/time.asm
View File

@ -101,7 +101,7 @@ CheckDailyResetTimer:: ; 11452
call CheckDayDependentEventHL
ret nc
xor a
ld hl, DailyFlags
ld hl, wDailyFlags
ld [hli], a
ld [hli], a
ld [hli], a
@ -226,14 +226,14 @@ CheckUnusedTwoDayTimer: ; 1150c
; 1151c
; XXX
ld hl, DailyFlags
ld hl, wDailyFlags
set 2, [hl]
ret
; 11522
; XXX
and a
ld hl, DailyFlags
ld hl, wDailyFlags
bit 2, [hl]
ret nz
scf

2
engine/timeofdaypals.asm
View File

@ -215,7 +215,7 @@ ReplaceTimeOfDayPals: ; 8c0e5
ret
.DarkCave:
ld a, [StatusFlags]
ld a, [wStatusFlags]
bit 2, a ; Flash
jr nz, .UsedFlash
ld a, %11111111 ; 3, 3, 3, 3

10
engine/timeset.asm
View File

@ -24,15 +24,15 @@ InitClock: ; 90672 (24:4672)
ld [hBGMapMode], a
call LoadStandardFont
ld de, TimeSetBackgroundGFX
ld hl, VTiles2 tile $00
ld hl, vTiles2 tile $00
lb bc, BANK(TimeSetBackgroundGFX), 1
call Request1bpp
ld de, TimeSetUpArrowGFX
ld hl, VTiles2 tile $01
ld hl, vTiles2 tile $01
lb bc, BANK(TimeSetUpArrowGFX), 1
call Request1bpp
ld de, TimeSetDownArrowGFX
ld hl, VTiles2 tile $02
ld hl, vTiles2 tile $02
lb bc, BANK(TimeSetDownArrowGFX), 1
call Request1bpp
call .ClearScreen
@ -410,11 +410,11 @@ Special_SetDayOfWeek: ; 90913
ld a, $1
ld [hInMenu], a
ld de, TimeSetUpArrowGFX
ld hl, VTiles1 tile $6f
ld hl, vTiles1 tile $6f
lb bc, BANK(TimeSetUpArrowGFX), 1
call Request1bpp
ld de, TimeSetDownArrowGFX
ld hl, VTiles1 tile $75
ld hl, vTiles1 tile $75
lb bc, BANK(TimeSetDownArrowGFX), 1
call Request1bpp
xor a

18
engine/title.asm
View File

@ -26,7 +26,7 @@ _TitleScreen: ; 10ed67
; Decompress running Suicune gfx
ld hl, TitleSuicuneGFX
ld de, VTiles1
ld de, vTiles1
call Decompress
@ -42,7 +42,7 @@ _TitleScreen: ; 10ed67
; BG Map 1:
; line 0 (copyright)
hlbgcoord 0, 0, VBGMap1
hlbgcoord 0, 0, vBGMap1
ld bc, 1 bgrows
ld a, 7 ; palette
call ByteFill
@ -99,12 +99,12 @@ _TitleScreen: ; 10ed67
; Decompress logo
ld hl, TitleLogoGFX
ld de, VTiles1
ld de, vTiles1
call Decompress
; Decompress background crystal
ld hl, TitleCrystalGFX
ld de, VTiles0
ld de, vTiles0
call Decompress
@ -122,7 +122,7 @@ _TitleScreen: ; 10ed67
call DrawTitleGraphic
; Draw copyright text
hlbgcoord 3, 0, VBGMap1
hlbgcoord 3, 0, vBGMap1
lb bc, 1, 13
ld d, $c
ld e, $10
@ -260,10 +260,10 @@ SuicuneFrameIterator: ; 10eea7
; 10eece
.Frames: ; 10eece
db $80 ; VTiles4 tile $00
db $88 ; VTiles4 tile $08
db $00 ; VTiles5 tile $00
db $08 ; VTiles5 tile $08
db $80 ; vTiles4 tile $00
db $88 ; vTiles4 tile $08
db $00 ; vTiles5 tile $00
db $08 ; vTiles5 tile $08
; 10eed2

50
engine/trade_animation.asm
View File

@ -149,8 +149,8 @@ RunTradeAnimScript: ; 28fa1
jr z, .NotCGB
ld a, $1
ld [rVBK], a
ld hl, VTiles0
ld bc, sScratch - VTiles0
ld hl, vTiles0
ld bc, sScratch - vTiles0
xor a
call ByteFill
ld a, $0
@ -158,19 +158,19 @@ RunTradeAnimScript: ; 28fa1
.NotCGB:
hlbgcoord 0, 0
ld bc, sScratch - VBGMap0
ld bc, sScratch - vBGMap0
ld a, " "
call ByteFill
ld hl, TradeGameBoyLZ
ld de, VTiles2 tile $31
ld de, vTiles2 tile $31
call Decompress
ld hl, TradeArrowGFX
ld de, VTiles1 tile $6d
ld de, vTiles1 tile $6d
ld bc, $10
ld a, BANK(TradeArrowGFX)
call FarCopyBytes
ld hl, TradeArrowGFX + $10
ld de, VTiles1 tile $6e
ld de, vTiles1 tile $6e
ld bc, $10
ld a, BANK(TradeArrowGFX)
call FarCopyBytes
@ -186,11 +186,11 @@ RunTradeAnimScript: ; 28fa1
call LoadTradeBallAndCableGFX
ld a, [wPlayerTrademonSpecies]
ld hl, wPlayerTrademonDVs
ld de, VTiles0
ld de, vTiles0
call TradeAnim_GetFrontpic
ld a, [wOTTrademonSpecies]
ld hl, wOTTrademonDVs
ld de, VTiles0 tile $31
ld de, vTiles0 tile $31
call TradeAnim_GetFrontpic
ld a, [wPlayerTrademonSpecies]
ld de, wPlayerTrademonSpeciesName
@ -490,7 +490,7 @@ TradeAnim_TubeToPlayer8: ; 29229
call DisableLCD
callfar ClearSpriteAnims
hlbgcoord 0, 0
ld bc, sScratch - VBGMap0
ld bc, sScratch - vBGMap0
ld a, " "
call ByteFill
xor a
@ -627,7 +627,7 @@ TradeAnim_PlaceTrademonStatsOnTubeAnim: ; 292f6
push af
call ClearBGPalettes
call WaitTop
ld a, HIGH(VBGMap1)
ld a, HIGH(vBGMap1)
ld [hBGMapAddress + 1], a
call ClearTileMap
hlcoord 0, 0
@ -657,7 +657,7 @@ TradeAnim_PlaceTrademonStatsOnTubeAnim: ; 292f6
call ByteFill
call WaitBGMap
call WaitTop
ld a, HIGH(VBGMap0)
ld a, HIGH(vBGMap0)
ld [hBGMapAddress + 1], a
call ClearTileMap
ret
@ -776,7 +776,7 @@ TradeAnim_TextboxScrollStart: ; 293de
TradeAnim_ScrollOutRight: ; 293ea
call WaitTop
ld a, HIGH(VBGMap1)
ld a, HIGH(vBGMap1)
ld [hBGMapAddress + 1], a
call WaitBGMap
ld a, $7
@ -785,7 +785,7 @@ TradeAnim_ScrollOutRight: ; 293ea
ld [hWY], a
call DelayFrame
call WaitTop
ld a, HIGH(VBGMap0)
ld a, HIGH(vBGMap0)
ld [hBGMapAddress + 1], a
call ClearTileMap
call TradeAnim_IncrementJumptableIndex
@ -802,14 +802,14 @@ TradeAnim_ScrollOutRight2: ; 2940c
ret
.done
ld a, HIGH(VBGMap1)
ld a, HIGH(vBGMap1)
ld [hBGMapAddress + 1], a
call WaitBGMap
ld a, $7
ld [hWX], a
ld a, $90
ld [hWY], a
ld a, HIGH(VBGMap0)
ld a, HIGH(vBGMap0)
ld [hBGMapAddress + 1], a
call TradeAnim_AdvanceScriptPointer
ret
@ -895,14 +895,14 @@ TradeAnim_GetNickname: ; 294a9
; 294bb
TradeAnim_ShowGivemonFrontpic: ; 294bb
ld de, VTiles0
ld de, vTiles0
jr TradeAnim_ShowFrontpic
TradeAnim_ShowGetmonFrontpic: ; 294c0
ld de, VTiles0 tile $31
ld de, vTiles0 tile $31
TradeAnim_ShowFrontpic: ; 294c3
call DelayFrame
ld hl, VTiles2
ld hl, vTiles2
lb bc, 10, $31
call Request2bpp
call WaitTop
@ -1009,7 +1009,7 @@ ShowOTTrademonStats: ; 29549
TrademonStats_MonTemplate: ; 29573
call WaitTop
call TradeAnim_BlankTileMap
ld a, HIGH(VBGMap1)
ld a, HIGH(vBGMap1)
ld [hBGMapAddress + 1], a
hlcoord 3, 0
ld b, $6
@ -1032,7 +1032,7 @@ TrademonStats_MonTemplate: ; 29573
TrademonStats_Egg: ; 295a1
call WaitTop
call TradeAnim_BlankTileMap
ld a, HIGH(VBGMap1)
ld a, HIGH(vBGMap1)
ld [hBGMapAddress + 1], a
hlcoord 3, 0
ld b, 6
@ -1055,7 +1055,7 @@ TrademonStats_Egg: ; 295a1
TrademonStats_WaitBGMap: ; 295d8
call WaitBGMap
call WaitTop
ld a, HIGH(VBGMap0)
ld a, HIGH(vBGMap0)
ld [hBGMapAddress + 1], a
ret
@ -1499,15 +1499,15 @@ TradeAnim_FlashBGPals: ; 2981d
LoadTradeBallAndCableGFX: ; 2982b
call DelayFrame
ld de, TradeBallGFX
ld hl, VTiles0 tile $62
ld hl, vTiles0 tile $62
lb bc, BANK(TradeBallGFX), $6
call Request2bpp
ld de, TradePoofGFX
ld hl, VTiles0 tile $68
ld hl, vTiles0 tile $68
lb bc, BANK(TradePoofGFX), $c
call Request2bpp
ld de, TradeCableGFX
ld hl, VTiles0 tile $74
ld hl, vTiles0 tile $74
lb bc, BANK(TradeCableGFX), $4
call Request2bpp
xor a
@ -1523,7 +1523,7 @@ LoadTradeBubbleGFX: ; 2985a
ld e, $3
callfar LoadMenuMonIcon
ld de, TradeBubbleGFX
ld hl, VTiles0 tile $72
ld hl, vTiles0 tile $72
lb bc, BANK(TradeBubbleGFX), $4
call Request2bpp
xor a

22
engine/trainer_card.asm
View File

@ -37,13 +37,13 @@ TrainerCard: ; 25105
farcall GetCardPic
ld hl, CardRightCornerGFX
ld de, VTiles2 tile $1c
ld de, vTiles2 tile $1c
ld bc, 1 tiles
ld a, BANK(CardRightCornerGFX)
call FarCopyBytes
ld hl, CardStatusGFX
ld de, VTiles2 tile $29
ld de, vTiles2 tile $29
ld bc, 86 tiles
ld a, BANK(CardStatusGFX)
call FarCopyBytes
@ -98,7 +98,7 @@ TrainerCard_Page1_LoadGFX: ; 251b6 (9:51b6)
call TrainerCard_InitBorder
call WaitBGMap
ld de, CardStatusGFX
ld hl, VTiles2 tile $29
ld hl, vTiles2 tile $29
lb bc, BANK(CardStatusGFX), 86
call Request2bpp
call TrainerCard_Page1_PrintDexCaught_GameTime
@ -120,7 +120,7 @@ TrainerCard_Page1_Joypad: ; 251d7 (9:51d7)
.KantoCheck:
; unreferenced
ld a, [KantoBadges]
ld a, [wKantoBadges]
and a
ret z
ld a, $4
@ -136,11 +136,11 @@ TrainerCard_Page2_LoadGFX: ; 251f4 (9:51f4)
call TrainerCard_InitBorder
call WaitBGMap
ld de, LeaderGFX
ld hl, VTiles2 tile $29
ld hl, vTiles2 tile $29
lb bc, BANK(LeaderGFX), $56
call Request2bpp
ld de, BadgeGFX
ld hl, VTiles0 tile $00
ld hl, vTiles0 tile $00
lb bc, BANK(BadgeGFX), $2c
call Request2bpp
call TrainerCard_Page2_3_InitObjectsAndStrings
@ -166,7 +166,7 @@ TrainerCard_Page2_Joypad: ; 25221 (9:5221)
.KantoCheck:
; unreferenced
ld a, [KantoBadges]
ld a, [wKantoBadges]
and a
ret z
ld a, $4
@ -185,11 +185,11 @@ TrainerCard_Page3_LoadGFX: ; 2524c (9:524c)
call TrainerCard_InitBorder
call WaitBGMap
ld de, LeaderGFX2
ld hl, VTiles2 tile $29
ld hl, vTiles2 tile $29
lb bc, BANK(LeaderGFX2), $56
call Request2bpp
ld de, BadgeGFX2
ld hl, VTiles0 tile $00
ld hl, vTiles0 tile $00
lb bc, BANK(BadgeGFX2), $2c
call Request2bpp
call TrainerCard_Page2_3_InitObjectsAndStrings
@ -281,7 +281,7 @@ TrainerCard_Page1_PrintDexCaught_GameTime: ; 2530a (9:530a)
hlcoord 2, 8
ld de, .StatusTilemap
call TrainerCardSetup_PlaceTilemapString
ld a, [StatusFlags] ; pokedex
ld a, [wStatusFlags]
bit 0, a
ret nz
hlcoord 1, 9
@ -562,7 +562,7 @@ TrainerCard_JohtoBadgesOAM: ; 254c9
; cycle 1: face tile, in1 tile, in2 tile, in3 tile
; cycle 2: face tile, in1 tile, in2 tile, in3 tile
dw JohtoBadges
dw wJohtoBadges
; Zephyrbadge
db $68, $18, 0

34
engine/unown_puzzle.asm
View File

@ -19,11 +19,11 @@ UnownPuzzle: ; e1190
xor a
call ByteFill
ld hl, UnownPuzzleCursorGFX
ld de, VTiles1 tile $60
ld de, vTiles1 tile $60
ld bc, 4 tiles
call CopyBytes
ld hl, UnownPuzzleStartCancelLZ
ld de, VTiles1 tile $6d
ld de, vTiles1 tile $6d
call Decompress
call LoadUnownPuzzlePiecesGFX
hlcoord 0, 0
@ -114,13 +114,13 @@ InitUnownPuzzlePiecePositions: ; e124e
; e126d
.PuzzlePieceInitialPositions: ; e126d
initpuzcoord: macro
initpuzcoord: MACRO
rept _NARG / 2
db \1 puzcoord \2
shift
shift
endr
endm
ENDM
initpuzcoord 0,0, 0,1, 0,2, 0,3, 0,4, 0,5
initpuzcoord 1,0, 1,5
initpuzcoord 2,0, 2,5
@ -599,11 +599,11 @@ RedrawUnownPuzzlePieces: ; e14d9
UnownPuzzleCoordData: ; e1559
puzzle_coords: macro
puzzle_coords: MACRO
dbpixel \1, \2, \3, \4
dwcoord \5, \6
db \7, \8
endm
ENDM
; OAM coords, tilemap coords, vacant tile, filler
puzzle_coords 3, 3, 4, 4, 1, 0, PUZZLE_BORDER, 0
puzzle_coords 6, 3, 4, 4, 4, 0, PUZZLE_BORDER, 0
@ -648,8 +648,8 @@ endm
puzzle_coords 18, 18, 4, 4, 16, 15, PUZZLE_BORDER, 0
ConvertLoadedPuzzlePieces: ; e1631
ld hl, VTiles2
ld de, VTiles0
ld hl, vTiles2
ld de, vTiles0
ld b, 6
.loop
push bc
@ -821,14 +821,14 @@ endr
; e1703
GFXHeaders: ; e1703
dw .TileBordersGFX + 0 tiles, VTiles0 tile $00
dw .TileBordersGFX + 1 tiles, VTiles0 tile $01
dw .TileBordersGFX + 2 tiles, VTiles0 tile $02
dw .TileBordersGFX + 3 tiles, VTiles0 tile $0c
dw .TileBordersGFX + 4 tiles, VTiles0 tile $0e
dw .TileBordersGFX + 5 tiles, VTiles0 tile $18
dw .TileBordersGFX + 6 tiles, VTiles0 tile $19
dw .TileBordersGFX + 7 tiles, VTiles0 tile $1a
dw .TileBordersGFX + 0 tiles, vTiles0 tile $00
dw .TileBordersGFX + 1 tiles, vTiles0 tile $01
dw .TileBordersGFX + 2 tiles, vTiles0 tile $02
dw .TileBordersGFX + 3 tiles, vTiles0 tile $0c
dw .TileBordersGFX + 4 tiles, vTiles0 tile $0e
dw .TileBordersGFX + 5 tiles, vTiles0 tile $18
dw .TileBordersGFX + 6 tiles, vTiles0 tile $19
dw .TileBordersGFX + 7 tiles, vTiles0 tile $1a
; e1723
.TileBordersGFX: ; e1723
@ -845,7 +845,7 @@ LoadUnownPuzzlePiecesGFX: ; e17a3
ld a, [hli]
ld h, [hl]
ld l, a
ld de, VTiles2
ld de, vTiles2
call Decompress
call ConvertLoadedPuzzlePieces
ret

Some files were not shown because too many files have changed in this diff Show More