foster/pokered
0
0
Fork 0
mirror of https://github.com/pret/pokered.git synced 2024-10-22 22:55:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace unnecessary tabs with spaces

Browse source
This commit is contained in:
dannye 2016-07-27 22:33:48 -05:00
parent 5207a14af3
commit 52bb07ca18
13 changed files with 157 additions and 157 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
audio/engine_2.asm
View file

@ -37,11 +37,11 @@ Audio2_UpdateMusic::
; this routine checks flags for music effects currently applied
; to the channel and calls certain functions based on flags.
; known flags for wChannelFlags1:
; 0: toggleperfectpitch has been used
; 1: call has been used
; 3: a toggle used only by this routine for vibrato
; 4: pitchbend flag
; 6: dutycycle flag
; 0: toggleperfectpitch has been used
; 1: call has been used
; 3: a toggle used only by this routine for vibrato
; 4: pitchbend flag
; 6: dutycycle flag
Audio2_ApplyMusicAffects:
ld b, $0
ld hl, wChannelNoteDelayCounters ; delay until next note

10
audio/engine_3.asm
View file

@ -37,11 +37,11 @@ Audio3_UpdateMusic::
; this routine checks flags for music effects currently applied
; to the channel and calls certain functions based on flags.
; known flags for wChannelFlags1:
; 0: toggleperfectpitch has been used
; 1: call has been used
; 3: a toggle used only by this routine for vibrato
; 4: pitchbend flag
; 6: dutycycle flag
; 0: toggleperfectpitch has been used
; 1: call has been used
; 3: a toggle used only by this routine for vibrato
; 4: pitchbend flag
; 6: dutycycle flag
Audio3_ApplyMusicAffects:
ld b, $0
ld hl, wChannelNoteDelayCounters ; delay until next note

12
constants/misc_constants.asm
View file

@ -105,12 +105,12 @@ QUESTION_BUBBLE EQU 1
SMILE_BUBBLE EQU 2
; slot symbols
SLOTS7 EQU $0200
SLOTSBAR EQU $0604
SLOTSCHERRY EQU $0A08
SLOTSFISH EQU $0E0C
SLOTSBIRD EQU $1210
SLOTSMOUSE EQU $1614
SLOTS7 EQU $0200
SLOTSBAR EQU $0604
SLOTSCHERRY EQU $0A08
SLOTSFISH EQU $0E0C
SLOTSBIRD EQU $1210
SLOTSMOUSE EQU $1614
; party menu types
NORMAL_PARTY_MENU EQU 0

2
data/baseStats/victreebel.asm
View file

@ -1,4 +1,4 @@
db DEX_VICTREEBEL ; pokedex id
db DEX_VICTREEBEL ; pokedex id
db 80 ; base hp
db 105 ; base attack
db 65 ; base defense

78
data/evos_moves.asm
View file

@ -29,8 +29,8 @@ EvosMovesPointerTable:
dw Mon009_EvosMoves
dw Mon127_EvosMoves
dw Mon114_EvosMoves
dw Mon152_EvosMoves ;MissingNo
dw Mon153_EvosMoves ;MissingNo
dw Mon152_EvosMoves ;MissingNo
dw Mon153_EvosMoves ;MissingNo
dw Mon058_EvosMoves
dw Mon095_EvosMoves
dw Mon022_EvosMoves
@ -48,26 +48,26 @@ EvosMovesPointerTable:
dw Mon054_EvosMoves
dw Mon096_EvosMoves
dw Mon076_EvosMoves
dw Mon154_EvosMoves ;MissingNo
dw Mon154_EvosMoves ;MissingNo
dw Mon126_EvosMoves
dw Mon155_EvosMoves ;MissingNo
dw Mon155_EvosMoves ;MissingNo
dw Mon125_EvosMoves
dw Mon082_EvosMoves
dw Mon109_EvosMoves
dw Mon156_EvosMoves ;MissingNo
dw Mon156_EvosMoves ;MissingNo
dw Mon056_EvosMoves
dw Mon086_EvosMoves
dw Mon050_EvosMoves
dw Mon128_EvosMoves
dw Mon157_EvosMoves ;MissingNo
dw Mon158_EvosMoves ;MissingNo
dw Mon159_EvosMoves ;MissingNo
dw Mon157_EvosMoves ;MissingNo
dw Mon158_EvosMoves ;MissingNo
dw Mon159_EvosMoves ;MissingNo
dw Mon083_EvosMoves
dw Mon048_EvosMoves
dw Mon149_EvosMoves
dw Mon160_EvosMoves ;MissingNo
dw Mon161_EvosMoves ;MissingNo
dw Mon162_EvosMoves ;MissingNo
dw Mon160_EvosMoves ;MissingNo
dw Mon161_EvosMoves ;MissingNo
dw Mon162_EvosMoves ;MissingNo
dw Mon084_EvosMoves
dw Mon060_EvosMoves
dw Mon124_EvosMoves
@ -77,23 +77,23 @@ EvosMovesPointerTable:
dw Mon132_EvosMoves
dw Mon052_EvosMoves
dw Mon098_EvosMoves
dw Mon163_EvosMoves ;MissingNo
dw Mon164_EvosMoves ;MissingNo
dw Mon165_EvosMoves ;MissingNo
dw Mon163_EvosMoves ;MissingNo
dw Mon164_EvosMoves ;MissingNo
dw Mon165_EvosMoves ;MissingNo
dw Mon037_EvosMoves
dw Mon038_EvosMoves
dw Mon025_EvosMoves
dw Mon026_EvosMoves
dw Mon166_EvosMoves ;MissingNo
dw Mon167_EvosMoves ;MissingNo
dw Mon166_EvosMoves ;MissingNo
dw Mon167_EvosMoves ;MissingNo
dw Mon147_EvosMoves
dw Mon148_EvosMoves
dw Mon140_EvosMoves
dw Mon141_EvosMoves
dw Mon116_EvosMoves
dw Mon117_EvosMoves
dw Mon168_EvosMoves ;MissingNo
dw Mon169_EvosMoves ;MissingNo
dw Mon168_EvosMoves ;MissingNo
dw Mon169_EvosMoves ;MissingNo
dw Mon027_EvosMoves
dw Mon028_EvosMoves
dw Mon138_EvosMoves
@ -113,38 +113,38 @@ EvosMovesPointerTable:
dw Mon013_EvosMoves
dw Mon014_EvosMoves
dw Mon015_EvosMoves
dw Mon170_EvosMoves ;MissingNo
dw Mon170_EvosMoves ;MissingNo
dw Mon085_EvosMoves
dw Mon057_EvosMoves
dw Mon051_EvosMoves
dw Mon049_EvosMoves
dw Mon087_EvosMoves
dw Mon171_EvosMoves ;MissingNo
dw Mon172_EvosMoves ;MissingNo
dw Mon171_EvosMoves ;MissingNo
dw Mon172_EvosMoves ;MissingNo
dw Mon010_EvosMoves
dw Mon011_EvosMoves
dw Mon012_EvosMoves
dw Mon068_EvosMoves
dw Mon173_EvosMoves ;MissingNo
dw Mon173_EvosMoves ;MissingNo
dw Mon055_EvosMoves
dw Mon097_EvosMoves
dw Mon042_EvosMoves
dw Mon150_EvosMoves
dw Mon143_EvosMoves
dw Mon129_EvosMoves
dw Mon174_EvosMoves ;MissingNo
dw Mon175_EvosMoves ;MissingNo
dw Mon174_EvosMoves ;MissingNo
dw Mon175_EvosMoves ;MissingNo
dw Mon089_EvosMoves
dw Mon176_EvosMoves ;MissingNo
dw Mon176_EvosMoves ;MissingNo
dw Mon099_EvosMoves
dw Mon091_EvosMoves
dw Mon177_EvosMoves ;MissingNo
dw Mon177_EvosMoves ;MissingNo
dw Mon101_EvosMoves
dw Mon036_EvosMoves
dw Mon110_EvosMoves
dw Mon053_EvosMoves
dw Mon105_EvosMoves
dw Mon178_EvosMoves ;MissingNo
dw Mon178_EvosMoves ;MissingNo
dw Mon093_EvosMoves
dw Mon063_EvosMoves
dw Mon065_EvosMoves
@ -154,13 +154,13 @@ EvosMovesPointerTable:
dw Mon001_EvosMoves
dw Mon003_EvosMoves
dw Mon073_EvosMoves
dw Mon179_EvosMoves ;MissingNo
dw Mon179_EvosMoves ;MissingNo
dw Mon118_EvosMoves
dw Mon119_EvosMoves
dw Mon180_EvosMoves ;MissingNo
dw Mon181_EvosMoves ;MissingNo
dw Mon182_EvosMoves ;MissingNo
dw Mon183_EvosMoves ;MissingNo
dw Mon180_EvosMoves ;MissingNo
dw Mon181_EvosMoves ;MissingNo
dw Mon182_EvosMoves ;MissingNo
dw Mon183_EvosMoves ;MissingNo
dw Mon077_EvosMoves
dw Mon078_EvosMoves
dw Mon019_EvosMoves
@ -170,19 +170,19 @@ EvosMovesPointerTable:
dw Mon074_EvosMoves
dw Mon137_EvosMoves
dw Mon142_EvosMoves
dw Mon184_EvosMoves ;MissingNo
dw Mon184_EvosMoves ;MissingNo
dw Mon081_EvosMoves
dw Mon185_EvosMoves ;MissingNo
dw Mon186_EvosMoves ;MissingNo
dw Mon185_EvosMoves ;MissingNo
dw Mon186_EvosMoves ;MissingNo
dw Mon004_EvosMoves
dw Mon007_EvosMoves
dw Mon005_EvosMoves
dw Mon008_EvosMoves
dw Mon006_EvosMoves
dw Mon187_EvosMoves ;MissingNo
dw Mon188_EvosMoves ;MissingNo
dw Mon189_EvosMoves ;MissingNo
dw Mon190_EvosMoves ;MissingNo
dw Mon187_EvosMoves ;MissingNo
dw Mon188_EvosMoves ;MissingNo
dw Mon189_EvosMoves ;MissingNo
dw Mon190_EvosMoves ;MissingNo
dw Mon043_EvosMoves
dw Mon044_EvosMoves
dw Mon045_EvosMoves

4
data/hide_show_data.asm
View file

@ -266,8 +266,8 @@ MapHSPointers:
; This Data is loaded into RAM at wd5ce-$D5F?. (wMissableObjectList)
; These constants come from the bytes for Predef functions:
Hide equ $11
Show equ $15
Hide equ $11
Show equ $15
MapHSXX:
db $FF,$FF,$FF

152
data/mon_party_sprites.asm
View file

@ -1,77 +1,77 @@
MonPartyData:
dn SPRITE_GRASS, SPRITE_GRASS ;Bulbasaur/Ivysaur
dn SPRITE_GRASS, SPRITE_MON ;Venusaur/Charmander
dn SPRITE_MON, SPRITE_MON ;Charmeleon/Charizard
dn SPRITE_WATER, SPRITE_WATER ;Squirtle/Wartortle
dn SPRITE_WATER, SPRITE_BUG ;Blastoise/Caterpie
dn SPRITE_BUG, SPRITE_BUG ;Metapod/Butterfree
dn SPRITE_BUG, SPRITE_BUG ;Weedle/Kakuna
dn SPRITE_BUG, SPRITE_BIRD_M ;Beedrill/Pidgey
dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Pidgeotto/Pidgeot
dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Rattata/Raticate
dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Spearow/Fearow
dn SPRITE_SNAKE, SPRITE_SNAKE ;Ekans/Arbok
dn SPRITE_FAIRY, SPRITE_FAIRY ;Pikachu/Raichu
dn SPRITE_MON, SPRITE_MON ;Sandshrew/Sandslash
dn SPRITE_MON, SPRITE_MON ;NidoranF/Nidorina
dn SPRITE_MON, SPRITE_MON ;Nidoqueen/NidoranM
dn SPRITE_MON, SPRITE_MON ;Nidorino/Nidoking
dn SPRITE_FAIRY, SPRITE_FAIRY ;Clefairy/Clefable
dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Vulpix/Ninetales
dn SPRITE_FAIRY, SPRITE_FAIRY ;Jigglypuff/Wigglytuff
dn SPRITE_MON, SPRITE_MON ;Zubat/Golbat
dn SPRITE_GRASS, SPRITE_GRASS ;Oddish/Gloom
dn SPRITE_GRASS, SPRITE_BUG ;Vileplume/Paras
dn SPRITE_BUG, SPRITE_BUG ;Parasect/Venonat
dn SPRITE_BUG, SPRITE_MON ;Venomoth/Diglett
dn SPRITE_MON, SPRITE_MON ;Dugtrio/Meowth
dn SPRITE_MON, SPRITE_MON ;Persian/Psyduck
dn SPRITE_MON, SPRITE_MON ;Golduck/Mankey
dn SPRITE_MON, SPRITE_QUADRUPED ;Primeape/Growlithe
dn SPRITE_QUADRUPED, SPRITE_MON ;Arcanine/Poliwag
dn SPRITE_MON, SPRITE_MON ;Poliwhirl/Poliwrath
dn SPRITE_MON, SPRITE_MON ;Abra/Kadabra
dn SPRITE_MON, SPRITE_MON ;Alakazam/Machop
dn SPRITE_MON, SPRITE_MON ;Machoke/Machamp
dn SPRITE_GRASS, SPRITE_GRASS ;Bellsprout/Weepinbell
dn SPRITE_GRASS, SPRITE_WATER ;Victreebel/Tentacool
dn SPRITE_WATER, SPRITE_MON ;Tentacruel/Geodude
dn SPRITE_MON, SPRITE_MON ;Graveler/Golem
dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Ponyta/Rapidash
dn SPRITE_QUADRUPED, SPRITE_MON ;Slowpoke/Slowbro
dn SPRITE_BALL_M, SPRITE_BALL_M ;Magnemite/Magneton
dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Farfetch'd/Doduo
dn SPRITE_BIRD_M, SPRITE_WATER ;Dodrio/Seel
dn SPRITE_WATER, SPRITE_MON ;Dewgong/Grimer
dn SPRITE_MON, SPRITE_HELIX ;Muk/Shellder
dn SPRITE_HELIX, SPRITE_MON ;Cloyster/Gastly
dn SPRITE_MON, SPRITE_MON ;Haunter/Gengar
dn SPRITE_SNAKE, SPRITE_MON ;Onix/Drowzee
dn SPRITE_MON, SPRITE_WATER ;Hypno/Krabby
dn SPRITE_WATER, SPRITE_BALL_M ;Kingler/Voltorb
dn SPRITE_BALL_M, SPRITE_GRASS ;Electrode/Exeggcute
dn SPRITE_GRASS, SPRITE_MON ;Exeggutor/Cubone
dn SPRITE_MON, SPRITE_MON ;Marowak/Hitmonlee
dn SPRITE_MON, SPRITE_MON ;Hitmonchan/Lickitung
dn SPRITE_MON, SPRITE_MON ;Koffing/Weezing
dn SPRITE_QUADRUPED, SPRITE_MON ;Rhyhorn/Rhydon
dn SPRITE_FAIRY, SPRITE_GRASS ;Chansey/Tangela
dn SPRITE_MON, SPRITE_WATER ;Kangaskhan/Horsea
dn SPRITE_WATER, SPRITE_WATER ;Seadra/Goldeen
dn SPRITE_WATER, SPRITE_HELIX ;Seaking/Staryu
dn SPRITE_HELIX, SPRITE_MON ;Starmie/Mr.Mime
dn SPRITE_BUG, SPRITE_MON ;Scyther/Jynx
dn SPRITE_MON, SPRITE_MON ;Electabuzz/Magmar
dn SPRITE_BUG, SPRITE_QUADRUPED ;Pinsir/Tauros
dn SPRITE_WATER, SPRITE_SNAKE ;Magikarp/Gyarados
dn SPRITE_WATER, SPRITE_MON ;Lapras/Ditto
dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Eevee/Vaporeon
dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Jolteon/Flareon
dn SPRITE_MON, SPRITE_HELIX ;Porygon/Omanyte
dn SPRITE_HELIX, SPRITE_HELIX ;Omastar/Kabuto
dn SPRITE_HELIX, SPRITE_BIRD_M ;Kabutops/Aerodactyl
dn SPRITE_MON, SPRITE_BIRD_M ;Snorlax/Articuno
dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Zapdos/Moltres
dn SPRITE_SNAKE, SPRITE_SNAKE ;Dratini/Dragonair
dn SPRITE_SNAKE, SPRITE_MON ;Dragonite/Mewtwo
dn SPRITE_MON, 0 ;Mew/Padding
dn SPRITE_GRASS, SPRITE_GRASS ;Bulbasaur/Ivysaur
dn SPRITE_GRASS, SPRITE_MON ;Venusaur/Charmander
dn SPRITE_MON, SPRITE_MON ;Charmeleon/Charizard
dn SPRITE_WATER, SPRITE_WATER ;Squirtle/Wartortle
dn SPRITE_WATER, SPRITE_BUG ;Blastoise/Caterpie
dn SPRITE_BUG, SPRITE_BUG ;Metapod/Butterfree
dn SPRITE_BUG, SPRITE_BUG ;Weedle/Kakuna
dn SPRITE_BUG, SPRITE_BIRD_M ;Beedrill/Pidgey
dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Pidgeotto/Pidgeot
dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Rattata/Raticate
dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Spearow/Fearow
dn SPRITE_SNAKE, SPRITE_SNAKE ;Ekans/Arbok
dn SPRITE_FAIRY, SPRITE_FAIRY ;Pikachu/Raichu
dn SPRITE_MON, SPRITE_MON ;Sandshrew/Sandslash
dn SPRITE_MON, SPRITE_MON ;NidoranF/Nidorina
dn SPRITE_MON, SPRITE_MON ;Nidoqueen/NidoranM
dn SPRITE_MON, SPRITE_MON ;Nidorino/Nidoking
dn SPRITE_FAIRY, SPRITE_FAIRY ;Clefairy/Clefable
dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Vulpix/Ninetales
dn SPRITE_FAIRY, SPRITE_FAIRY ;Jigglypuff/Wigglytuff
dn SPRITE_MON, SPRITE_MON ;Zubat/Golbat
dn SPRITE_GRASS, SPRITE_GRASS ;Oddish/Gloom
dn SPRITE_GRASS, SPRITE_BUG ;Vileplume/Paras
dn SPRITE_BUG, SPRITE_BUG ;Parasect/Venonat
dn SPRITE_BUG, SPRITE_MON ;Venomoth/Diglett
dn SPRITE_MON, SPRITE_MON ;Dugtrio/Meowth
dn SPRITE_MON, SPRITE_MON ;Persian/Psyduck
dn SPRITE_MON, SPRITE_MON ;Golduck/Mankey
dn SPRITE_MON, SPRITE_QUADRUPED ;Primeape/Growlithe
dn SPRITE_QUADRUPED, SPRITE_MON ;Arcanine/Poliwag
dn SPRITE_MON, SPRITE_MON ;Poliwhirl/Poliwrath
dn SPRITE_MON, SPRITE_MON ;Abra/Kadabra
dn SPRITE_MON, SPRITE_MON ;Alakazam/Machop
dn SPRITE_MON, SPRITE_MON ;Machoke/Machamp
dn SPRITE_GRASS, SPRITE_GRASS ;Bellsprout/Weepinbell
dn SPRITE_GRASS, SPRITE_WATER ;Victreebel/Tentacool
dn SPRITE_WATER, SPRITE_MON ;Tentacruel/Geodude
dn SPRITE_MON, SPRITE_MON ;Graveler/Golem
dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Ponyta/Rapidash
dn SPRITE_QUADRUPED, SPRITE_MON ;Slowpoke/Slowbro
dn SPRITE_BALL_M, SPRITE_BALL_M ;Magnemite/Magneton
dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Farfetch'd/Doduo
dn SPRITE_BIRD_M, SPRITE_WATER ;Dodrio/Seel
dn SPRITE_WATER, SPRITE_MON ;Dewgong/Grimer
dn SPRITE_MON, SPRITE_HELIX ;Muk/Shellder
dn SPRITE_HELIX, SPRITE_MON ;Cloyster/Gastly
dn SPRITE_MON, SPRITE_MON ;Haunter/Gengar
dn SPRITE_SNAKE, SPRITE_MON ;Onix/Drowzee
dn SPRITE_MON, SPRITE_WATER ;Hypno/Krabby
dn SPRITE_WATER, SPRITE_BALL_M ;Kingler/Voltorb
dn SPRITE_BALL_M, SPRITE_GRASS ;Electrode/Exeggcute
dn SPRITE_GRASS, SPRITE_MON ;Exeggutor/Cubone
dn SPRITE_MON, SPRITE_MON ;Marowak/Hitmonlee
dn SPRITE_MON, SPRITE_MON ;Hitmonchan/Lickitung
dn SPRITE_MON, SPRITE_MON ;Koffing/Weezing
dn SPRITE_QUADRUPED, SPRITE_MON ;Rhyhorn/Rhydon
dn SPRITE_FAIRY, SPRITE_GRASS ;Chansey/Tangela
dn SPRITE_MON, SPRITE_WATER ;Kangaskhan/Horsea
dn SPRITE_WATER, SPRITE_WATER ;Seadra/Goldeen
dn SPRITE_WATER, SPRITE_HELIX ;Seaking/Staryu
dn SPRITE_HELIX, SPRITE_MON ;Starmie/Mr.Mime
dn SPRITE_BUG, SPRITE_MON ;Scyther/Jynx
dn SPRITE_MON, SPRITE_MON ;Electabuzz/Magmar
dn SPRITE_BUG, SPRITE_QUADRUPED ;Pinsir/Tauros
dn SPRITE_WATER, SPRITE_SNAKE ;Magikarp/Gyarados
dn SPRITE_WATER, SPRITE_MON ;Lapras/Ditto
dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Eevee/Vaporeon
dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Jolteon/Flareon
dn SPRITE_MON, SPRITE_HELIX ;Porygon/Omanyte
dn SPRITE_HELIX, SPRITE_HELIX ;Omastar/Kabuto
dn SPRITE_HELIX, SPRITE_BIRD_M ;Kabutops/Aerodactyl
dn SPRITE_MON, SPRITE_BIRD_M ;Snorlax/Articuno
dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Zapdos/Moltres
dn SPRITE_SNAKE, SPRITE_SNAKE ;Dratini/Dragonair
dn SPRITE_SNAKE, SPRITE_MON ;Dragonite/Mewtwo
dn SPRITE_MON, 0 ;Mew/Padding

12
data/wild_mons.asm
View file

@ -253,12 +253,12 @@ WildDataPointers:
; first part: pokemon found in grass
; second part: pokemon found while surfing
; each part goes as follows:
; if first byte == 00, then
; no wild pokemon on this map
; if first byte != 00, then
; first byte is encounter rate
; followed by 20 bytes:
; level, species (ten times)
; if first byte == 00, then
; no wild pokemon on this map
; if first byte != 00, then
; first byte is encounter rate
; followed by 20 bytes:
; level, species (ten times)
INCLUDE "data/wildPokemon/nomons.asm"
INCLUDE "data/wildPokemon/route1.asm"

14
engine/battle/core.asm
View file

@ -4502,10 +4502,10 @@ GetEnemyMonStat:
CalculateDamage:
; input:
; b: attack
; c: opponent defense
; d: base power
; e: level
; b: attack
; c: opponent defense
; d: base power
; e: level
ld a, [H_WHOSETURN] ; whose turn?
and a
@ -7512,7 +7512,7 @@ FrozenText:
CheckDefrost:
; any fire-type move that has a chance inflict burn (all but Fire Spin) will defrost a frozen target
and a, 1 << FRZ ; are they frozen?
and a, 1 << FRZ ; are they frozen?
ret z ; return if so
ld a, [H_WHOSETURN]
and a
@ -7521,7 +7521,7 @@ CheckDefrost:
ld a, [wPlayerMoveType]
sub a, FIRE
ret nz ; return if type of move used isn't fire
ld [wEnemyMonStatus], a ; set opponent status to 00 ["defrost" a frozen monster]
ld [wEnemyMonStatus], a ; set opponent status to 00 ["defrost" a frozen monster]
ld hl, wEnemyMon1Status
ld a, [wEnemyMonPartyPos]
ld bc, wEnemyMon2 - wEnemyMon1
@ -7531,7 +7531,7 @@ CheckDefrost:
ld hl, FireDefrostedText
jr .common
.opponent
ld a, [wEnemyMoveType] ; same as above with addresses swapped
ld a, [wEnemyMoveType] ; same as above with addresses swapped
sub a, FIRE
ret nz
ld [wBattleMonStatus], a

4
engine/items/items.asm
View file

@ -1,7 +1,7 @@
UseItem_:
ld a,1
ld [wActionResultOrTookBattleTurn],a ; initialise to success value
ld a,[wcf91] ;contains item_ID
ld a,[wcf91] ;contains item_ID
cp a,HM_01
jp nc,ItemUseTMHM
ld hl,ItemUsePtrTable
@ -235,7 +235,7 @@ ItemUseBall:
ld b,a
.skipAilmentValueSubtraction
push bc ; save (Rand1 - Status)
push bc ; save (Rand1 - Status)
; Calculate MaxHP * 255.
xor a

2
home.asm
View file

@ -725,7 +725,7 @@ UncompressMonSprite::
; define (by index number) the bank that a pokemon's image is in
; index = Mew, bank 1
; index = Kabutops fossil, bank $B
; index < $1F, bank 9
; index < $1F, bank 9
; $1F ≤ index < $4A, bank $A
; $4A ≤ index < $74, bank $B
; $74 ≤ index < $99, bank $C

4
home/pic.asm
View file

@ -48,8 +48,8 @@ _UncompressSpriteData::
ld [wSpriteWidth], a
call ReadNextInputBit
ld [wSpriteLoadFlags], a ; initialite bit1 to 0 and bit0 to the first input bit
; this will load two chunks of data to sSpriteBuffer1 and sSpriteBuffer2
; bit 0 decides in which one the first chunk is placed
; this will load two chunks of data to sSpriteBuffer1 and sSpriteBuffer2
; bit 0 decides in which one the first chunk is placed
; fall through
; uncompresses a chunk from the sprite input data stream (pointed to at wd0da) into sSpriteBuffer1 or sSpriteBuffer2

10
macros.asm
View file

@ -140,13 +140,13 @@ overworldMapCoord: MACRO
;\3 = X movement (X-blocks)
EVENT_DISP: MACRO
dw (wOverworldMap + 7 + (\1) + ((\1) + 6) * ((\2) >> 1) + ((\3) >> 1)) ; Ev.Disp
db \2,\3 ;Y,X
db \2,\3 ;Y,X
ENDM
FLYWARP_DATA: MACRO
EVENT_DISP \1,\2,\3
db ((\2) & $01) ;sub-block Y
db ((\3) & $01) ;sub-block X
db ((\2) & $01) ;sub-block Y
db ((\3) & $01) ;sub-block X
ENDM
; external map entry macro
@ -588,8 +588,8 @@ ENDM
; format: notetype speed, volume, fade
notetype: MACRO
db $D0 | \1
db (\2 << 4) | \3
db $D0 | \1
db (\2 << 4) | \3
ENDM
dspeed: MACRO