pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Arrays end with -1, not $ff

Browse Source
This commit is contained in:
Remy Oukaour 2018-01-10 22:53:42 -05:00
parent 546f1f7115
commit 0a3b251dcb
19 changed files with 884 additions and 881 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
constants/battle_constants.asm
View File

@ -22,6 +22,7 @@ BASE_PRIORITY EQU 1
; type effectiveness factors, scaled by 10 ; type effectiveness factors, scaled by 10
SUPER_EFFECTIVE EQU 20 SUPER_EFFECTIVE EQU 20
MORE_EFFECTIVE EQU 15
EFFECTIVE EQU 10 EFFECTIVE EQU 10
NOT_VERY_EFFECTIVE EQU 05 NOT_VERY_EFFECTIVE EQU 05
NO_EFFECT EQU 00 NO_EFFECT EQU 00

70
data/items/marts.asm
View File

@ -43,7 +43,7 @@ MartCherrygrove: ; 160ed
db ANTIDOTE db ANTIDOTE
db PARLYZ_HEAL db PARLYZ_HEAL
db AWAKENING db AWAKENING
db $ff db -1 ; end
; 160f3 ; 160f3
MartCherrygroveDex: ; 160f3 MartCherrygroveDex: ; 160f3
@ -53,7 +53,7 @@ MartCherrygroveDex: ; 160f3
db ANTIDOTE db ANTIDOTE
db PARLYZ_HEAL db PARLYZ_HEAL
db AWAKENING db AWAKENING
db $ff db -1 ; end
; 160fa ; 160fa
MartViolet: ; 160fa MartViolet: ; 160fa
@ -68,7 +68,7 @@ MartViolet: ; 160fa
db X_ATTACK db X_ATTACK
db X_SPEED db X_SPEED
db FLOWER_MAIL db FLOWER_MAIL
db $ff db -1 ; end
; 16106 ; 16106
MartAzalea: ; 16106 MartAzalea: ; 16106
@ -82,7 +82,7 @@ MartAzalea: ; 16106
db ANTIDOTE db ANTIDOTE
db PARLYZ_HEAL db PARLYZ_HEAL
db FLOWER_MAIL db FLOWER_MAIL
db $ff db -1 ; end
; 16111 ; 16111
MartCianwood: ; 16111 MartCianwood: ; 16111
@ -92,7 +92,7 @@ MartCianwood: ; 16111
db HYPER_POTION db HYPER_POTION
db FULL_HEAL db FULL_HEAL
db REVIVE db REVIVE
db $ff db -1 ; end
; 16118 ; 16118
MartGoldenrod2F1: ; 16118 MartGoldenrod2F1: ; 16118
@ -104,7 +104,7 @@ MartGoldenrod2F1: ; 16118
db AWAKENING db AWAKENING
db BURN_HEAL db BURN_HEAL
db ICE_HEAL db ICE_HEAL
db $ff db -1 ; end
; 16121 ; 16121
MartGoldenrod2F2: ; 16121 MartGoldenrod2F2: ; 16121
@ -117,7 +117,7 @@ MartGoldenrod2F2: ; 16121
db FULL_HEAL db FULL_HEAL
db POKE_DOLL db POKE_DOLL
db FLOWER_MAIL db FLOWER_MAIL
db $ff db -1 ; end
; 1612b ; 1612b
MartGoldenrod3F: ; 1612b MartGoldenrod3F: ; 1612b
@ -129,7 +129,7 @@ MartGoldenrod3F: ; 1612b
db DIRE_HIT db DIRE_HIT
db GUARD_SPEC db GUARD_SPEC
db X_ACCURACY db X_ACCURACY
db $ff db -1 ; end
; 16134 ; 16134
MartGoldenrod4F: ; 16134 MartGoldenrod4F: ; 16134
@ -139,7 +139,7 @@ MartGoldenrod4F: ; 16134
db CARBOS db CARBOS
db CALCIUM db CALCIUM
db HP_UP db HP_UP
db $ff db -1 ; end
; 1613b ; 1613b
MartGoldenrod5F1: ; 1613b MartGoldenrod5F1: ; 1613b
@ -147,7 +147,7 @@ MartGoldenrod5F1: ; 1613b
db TM_THUNDERPUNCH db TM_THUNDERPUNCH
db TM_FIRE_PUNCH db TM_FIRE_PUNCH
db TM_ICE_PUNCH db TM_ICE_PUNCH
db $ff db -1 ; end
; 16140 ; 16140
MartGoldenrod5F2: ; 16140 MartGoldenrod5F2: ; 16140
@ -156,7 +156,7 @@ MartGoldenrod5F2: ; 16140
db TM_FIRE_PUNCH db TM_FIRE_PUNCH
db TM_ICE_PUNCH db TM_ICE_PUNCH
db TM_HEADBUTT db TM_HEADBUTT
db $ff db -1 ; end
; 16146 ; 16146
MartGoldenrod5F3: ; 16146 MartGoldenrod5F3: ; 16146
@ -165,7 +165,7 @@ MartGoldenrod5F3: ; 16146
db TM_FIRE_PUNCH db TM_FIRE_PUNCH
db TM_ICE_PUNCH db TM_ICE_PUNCH
db TM_ROCK_SMASH db TM_ROCK_SMASH
db $ff db -1 ; end
; 1614c ; 1614c
MartGoldenrod5F4: ; 1614c MartGoldenrod5F4: ; 1614c
@ -175,7 +175,7 @@ MartGoldenrod5F4: ; 1614c
db TM_ICE_PUNCH db TM_ICE_PUNCH
db TM_HEADBUTT db TM_HEADBUTT
db TM_ROCK_SMASH db TM_ROCK_SMASH
db $ff db -1 ; end
; 16153 ; 16153
MartOlivine: ; 16153 MartOlivine: ; 16153
@ -189,7 +189,7 @@ MartOlivine: ; 16153
db ICE_HEAL db ICE_HEAL
db SUPER_REPEL db SUPER_REPEL
db SURF_MAIL db SURF_MAIL
db $ff db -1 ; end
; 1615e ; 1615e
MartEcruteak: ; 1615e MartEcruteak: ; 1615e
@ -204,7 +204,7 @@ MartEcruteak: ; 1615e
db BURN_HEAL db BURN_HEAL
db ICE_HEAL db ICE_HEAL
db REVIVE db REVIVE
db $ff db -1 ; end
; 1616a ; 1616a
MartMahogany1: ; 1616a MartMahogany1: ; 1616a
@ -213,7 +213,7 @@ MartMahogany1: ; 1616a
db SLOWPOKETAIL db SLOWPOKETAIL
db POKE_BALL db POKE_BALL
db POTION db POTION
db $ff db -1 ; end
; 16170 ; 16170
MartMahogany2: ; 16170 MartMahogany2: ; 16170
@ -227,7 +227,7 @@ MartMahogany2: ; 16170
db SUPER_REPEL db SUPER_REPEL
db REVIVE db REVIVE
db FLOWER_MAIL db FLOWER_MAIL
db $ff db -1 ; end
; 1617b ; 1617b
MartBlackthorn: ; 1617b MartBlackthorn: ; 1617b
@ -241,7 +241,7 @@ MartBlackthorn: ; 1617b
db MAX_REPEL db MAX_REPEL
db X_DEFEND db X_DEFEND
db X_ATTACK db X_ATTACK
db $ff db -1 ; end
; 16186 ; 16186
MartViridian: ; 16186 MartViridian: ; 16186
@ -255,7 +255,7 @@ MartViridian: ; 16186
db AWAKENING db AWAKENING
db BURN_HEAL db BURN_HEAL
db FLOWER_MAIL db FLOWER_MAIL
db $ff db -1 ; end
; 16191 ; 16191
MartPewter: ; 16191 MartPewter: ; 16191
@ -267,7 +267,7 @@ MartPewter: ; 16191
db PARLYZ_HEAL db PARLYZ_HEAL
db AWAKENING db AWAKENING
db BURN_HEAL db BURN_HEAL
db $ff db -1 ; end
; 1619a ; 1619a
MartCerulean: ; 1619a MartCerulean: ; 1619a
@ -281,7 +281,7 @@ MartCerulean: ; 1619a
db X_ATTACK db X_ATTACK
db DIRE_HIT db DIRE_HIT
db SURF_MAIL db SURF_MAIL
db $ff db -1 ; end
; 161a5 ; 161a5
MartLavender: ; 161a5 MartLavender: ; 161a5
@ -294,7 +294,7 @@ MartLavender: ; 161a5
db PARLYZ_HEAL db PARLYZ_HEAL
db AWAKENING db AWAKENING
db BURN_HEAL db BURN_HEAL
db $ff db -1 ; end
; 161af ; 161af
MartVermilion: ; 161af MartVermilion: ; 161af
@ -307,7 +307,7 @@ MartVermilion: ; 161af
db AWAKENING db AWAKENING
db BURN_HEAL db BURN_HEAL
db LITEBLUEMAIL db LITEBLUEMAIL
db $ff db -1 ; end
; 161b9 ; 161b9
MartCeladon2F1: ; 161b9 MartCeladon2F1: ; 161b9
@ -319,7 +319,7 @@ MartCeladon2F1: ; 161b9
db REVIVE db REVIVE
db SUPER_REPEL db SUPER_REPEL
db MAX_REPEL db MAX_REPEL
db $ff db -1 ; end
; 161c2 ; 161c2
MartCeladon2F2: ; 161c2 MartCeladon2F2: ; 161c2
@ -334,7 +334,7 @@ MartCeladon2F2: ; 161c2
db ICE_HEAL db ICE_HEAL
db AWAKENING db AWAKENING
db PARLYZ_HEAL db PARLYZ_HEAL
db $ff db -1 ; end
; 161ce ; 161ce
MartCeladon3F: ; 161ce MartCeladon3F: ; 161ce
@ -344,7 +344,7 @@ MartCeladon3F: ; 161ce
db TM_PROTECT db TM_PROTECT
db TM_RAIN_DANCE db TM_RAIN_DANCE
db TM_SANDSTORM db TM_SANDSTORM
db $ff db -1 ; end
; 161d5 ; 161d5
MartCeladon4F: ; 161d5 MartCeladon4F: ; 161d5
@ -352,7 +352,7 @@ MartCeladon4F: ; 161d5
db POKE_DOLL db POKE_DOLL
db LOVELY_MAIL db LOVELY_MAIL
db SURF_MAIL db SURF_MAIL
db $ff db -1 ; end
; 161da ; 161da
MartCeladon5F1: ; 161da MartCeladon5F1: ; 161da
@ -362,7 +362,7 @@ MartCeladon5F1: ; 161da
db IRON db IRON
db CARBOS db CARBOS
db CALCIUM db CALCIUM
db $ff db -1 ; end
; 161e1 ; 161e1
MartCeladon5F2: ; 161e1 MartCeladon5F2: ; 161e1
@ -374,7 +374,7 @@ MartCeladon5F2: ; 161e1
db X_DEFEND db X_DEFEND
db X_SPEED db X_SPEED
db X_SPECIAL db X_SPECIAL
db $ff db -1 ; end
; 161ea ; 161ea
MartFuchsia: ; 161ea MartFuchsia: ; 161ea
@ -386,7 +386,7 @@ MartFuchsia: ; 161ea
db FULL_HEAL db FULL_HEAL
db MAX_REPEL db MAX_REPEL
db FLOWER_MAIL db FLOWER_MAIL
db $ff db -1 ; end
; 161f3 ; 161f3
MartSaffron: ; 161f3 MartSaffron: ; 161f3
@ -399,7 +399,7 @@ MartSaffron: ; 161f3
db X_ATTACK db X_ATTACK
db X_DEFEND db X_DEFEND
db FLOWER_MAIL db FLOWER_MAIL
db $ff db -1 ; end
; 161fd ; 161fd
MartMtMoon: ; 161fd MartMtMoon: ; 161fd
@ -410,7 +410,7 @@ MartMtMoon: ; 161fd
db LEMONADE db LEMONADE
db REPEL db REPEL
db PORTRAITMAIL db PORTRAITMAIL
db $ff db -1 ; end
; 16205 ; 16205
MartIndigoPlateau: ; 16205 MartIndigoPlateau: ; 16205
@ -422,7 +422,7 @@ MartIndigoPlateau: ; 16205
db FULL_RESTORE db FULL_RESTORE
db REVIVE db REVIVE
db FULL_HEAL db FULL_HEAL
db $ff db -1 ; end
; 1620e ; 1620e
MartUnderground: ; 1620e MartUnderground: ; 1620e
@ -431,12 +431,12 @@ MartUnderground: ; 1620e
db ENERGY_ROOT db ENERGY_ROOT
db HEAL_POWDER db HEAL_POWDER
db REVIVAL_HERB db REVIVAL_HERB
db $ff db -1 ; end
; 16214 ; 16214
DefaultMart: ; 16214 DefaultMart: ; 16214
db 2 ; # items db 2 ; # items
db POKE_BALL db POKE_BALL
db POTION db POTION
db $ff db -1 ; end
; 16218 ; 16218

97
data/moves/grammar.asm Normal file
View File

@ -0,0 +1,97 @@
; Used by GetMoveGrammar (see engine/battle/used_move_text.asm)
; Each move is given an identifier for what usedmovetext to use (0-4).
; Made redundant in English localization.
MoveGrammar: ; 105e7a
; 0
db SWORDS_DANCE
db GROWTH
db STRENGTH
db HARDEN
db MINIMIZE
db SMOKESCREEN
db WITHDRAW
db DEFENSE_CURL
db EGG_BOMB
db SMOG
db BONE_CLUB
db FLASH
db SPLASH
db ACID_ARMOR
db BONEMERANG
db REST
db SHARPEN
db SUBSTITUTE
db MIND_READER
db SNORE
db PROTECT
db SPIKES
db ENDURE
db ROLLOUT
db SWAGGER
db SLEEP_TALK
db HIDDEN_POWER
db PSYCH_UP
db EXTREMESPEED
db 0 ; end set
; 1
db RECOVER
db TELEPORT
db BIDE
db SELFDESTRUCT
db AMNESIA
db FLAIL
db 0 ; end set
; 2
db MEDITATE
db AGILITY
db MIMIC
db DOUBLE_TEAM
db BARRAGE
db TRANSFORM
db STRUGGLE
db SCARY_FACE
db 0 ; end set
; 3
db POUND
db SCRATCH
db VICEGRIP
db WING_ATTACK
db FLY
db BIND
db SLAM
db HORN_ATTACK
db WRAP
db THRASH
db TAIL_WHIP
db LEER
db BITE
db GROWL
db ROAR
db SING
db PECK
db ABSORB
db STRING_SHOT
db EARTHQUAKE
db FISSURE
db DIG
db TOXIC
db SCREECH
db METRONOME
db LICK
db CLAMP
db CONSTRICT
db POISON_GAS
db BUBBLE
db SLASH
db SPIDER_WEB
db NIGHTMARE
db CURSE
db FORESIGHT
db CHARM
db ATTRACT
db ROCK_SMASH
db 0 ; end set
; all other moves = 4
db -1 ; end
; 105ed0

214
data/pokemon/egg_moves.asm
View File

File diff suppressed because it is too large Load Diff

1082
data/trainers/parties.asm
View File

File diff suppressed because it is too large Load Diff

2
engine/battle/ai/items.asm
View File

@ -291,7 +291,7 @@ AI_Items: ; 39196
dbw X_DEFEND, .XDefend dbw X_DEFEND, .XDefend
dbw X_SPEED, .XSpeed dbw X_SPEED, .XSpeed
dbw X_SPECIAL, .XSpecial dbw X_SPECIAL, .XSpecial
db $ff db -1 ; end
; 381be ; 381be
.FullHeal: ; 381be .FullHeal: ; 381be

24
engine/battle/ai/scoring.asm
View File

@ -68,7 +68,7 @@ AI_Basic: ; 38591
db EFFECT_TOXIC db EFFECT_TOXIC
db EFFECT_POISON db EFFECT_POISON
db EFFECT_PARALYZE db EFFECT_PARALYZE
db $ff db -1 ; end
; 385e0 ; 385e0
@ -400,7 +400,7 @@ AI_Smart: ; 386be
dbw EFFECT_SOLARBEAM, AI_Smart_Solarbeam dbw EFFECT_SOLARBEAM, AI_Smart_Solarbeam
dbw EFFECT_THUNDER, AI_Smart_Thunder dbw EFFECT_THUNDER, AI_Smart_Thunder
dbw EFFECT_FLY, AI_Smart_Fly dbw EFFECT_FLY, AI_Smart_Fly
db $ff db -1 ; end
; 387e3 ; 387e3
@ -1553,7 +1553,7 @@ AI_Smart_Encore: ; 38c3b
db AEROBLAST db AEROBLAST
db COTTON_SPORE db COTTON_SPORE
db POWDER_SNOW db POWDER_SNOW
db $ff db -1 ; end
; 38ca4 ; 38ca4
@ -2214,7 +2214,7 @@ AI_Smart_Sandstorm: ; 38f7a
db ROCK db ROCK
db GROUND db GROUND
db STEEL db STEEL
db $ff db -1 ; end
; 38fac ; 38fac
@ -2533,7 +2533,7 @@ RainDanceMoves: ; 390e7
db CRABHAMMER db CRABHAMMER
db OCTAZOOKA db OCTAZOOKA
db WHIRLPOOL db WHIRLPOOL
db $ff db -1 ; end
; 390f3 ; 390f3
@ -2622,7 +2622,7 @@ SunnyDayMoves: ; 39134
db SACRED_FIRE db SACRED_FIRE
db MORNING_SUN db MORNING_SUN
db SYNTHESIS db SYNTHESIS
db $ff db -1 ; end
; 3913d ; 3913d
@ -3125,7 +3125,7 @@ UsefulMoves: ; 39301
db FIRE_BLAST db FIRE_BLAST
db SOFTBOILED db SOFTBOILED
db SUPER_FANG db SUPER_FANG
db $ff db -1 ; end
; 39315 ; 39315
@ -3209,7 +3209,7 @@ AI_Opportunist: ; 39315
db CONVERSION db CONVERSION
db SUBSTITUTE db SUBSTITUTE
db FLAME_WHEEL db FLAME_WHEEL
db $ff db -1 ; end
; 39369 ; 39369
@ -3324,7 +3324,7 @@ AI_Aggressive: ; 39369
db EFFECT_RAMPAGE db EFFECT_RAMPAGE
db EFFECT_MULTI_HIT db EFFECT_MULTI_HIT
db EFFECT_DOUBLE_HIT db EFFECT_DOUBLE_HIT
db $ff db -1 ; end
; 393e7 ; 393e7
@ -3350,7 +3350,7 @@ AIDamageCalc: ; 393e7
db EFFECT_STATIC_DAMAGE db EFFECT_STATIC_DAMAGE
db EFFECT_LEVEL_DAMAGE db EFFECT_LEVEL_DAMAGE
db EFFECT_PSYWAVE db EFFECT_PSYWAVE
db $ff db -1 ; end
; 39418 ; 39418
@ -3406,7 +3406,7 @@ AI_Cautious: ; 39418
db CONVERSION db CONVERSION
db SUBSTITUTE db SUBSTITUTE
db SPIKES db SPIKES
db $ff db -1 ; end
; 39453 ; 39453
@ -3544,7 +3544,7 @@ endr
.RiskyMoves: .RiskyMoves:
db EFFECT_SELFDESTRUCT db EFFECT_SELFDESTRUCT
db EFFECT_OHKO db EFFECT_OHKO
db $ff db -1 ; end
; 39502 ; 39502

4
engine/battle/core.asm
View File

@ -4548,7 +4548,7 @@ UseHeldStatusHealingItem: ; 3dde9
db HELD_HEAL_SLEEP, SLP db HELD_HEAL_SLEEP, SLP
db HELD_HEAL_PARALYZE, 1 << PAR db HELD_HEAL_PARALYZE, 1 << PAR
db HELD_HEAL_STATUS, ALL_STATUS db HELD_HEAL_STATUS, ALL_STATUS
db $ff db -1 ; end
; 3de51 ; 3de51
UseConfusionHealingItem: ; 3de51 UseConfusionHealingItem: ; 3de51
@ -4672,7 +4672,7 @@ HandleStatBoostingHeldItems: ; 3de97
dbw HELD_SP_DEFENSE_UP, BattleCommand_SpecialDefenseUp dbw HELD_SP_DEFENSE_UP, BattleCommand_SpecialDefenseUp
dbw HELD_ACCURACY_UP, BattleCommand_AccuracyUp dbw HELD_ACCURACY_UP, BattleCommand_AccuracyUp
dbw HELD_EVASION_UP, BattleCommand_EvasionUp dbw HELD_EVASION_UP, BattleCommand_EvasionUp
db $ff db -1 ; end
; 3df12 ; 3df12
GetPartymonItem: ; 3df12 GetPartymonItem: ; 3df12

4
engine/battle/effect_commands/present.asm
View File

@ -31,7 +31,7 @@ BattleCommand_Present: ; 37874
ld c, 0 ld c, 0
.next .next
ld a, [hli] ld a, [hli]
cp $ff cp -1
jr z, .heal_effect ; 378a4 $11 jr z, .heal_effect ; 378a4 $11
cp b cp b
jr nc, .got_power ; 378a7 $4 jr nc, .got_power ; 378a7 $4
@ -89,5 +89,5 @@ BattleCommand_Present: ; 37874
db 40 percent, 40 db 40 percent, 40
db 70 percent + 1, 80 db 70 percent + 1, 80
db 80 percent, 120 db 80 percent, 120
db $ff db -1 ; end
; 3790e ; 3790e

54
engine/battle/misc.asm
View File

@ -146,15 +146,15 @@ DoWeatherModifiers: ; fbda4
ret ret
.WeatherTypeModifiers: .WeatherTypeModifiers:
db WEATHER_RAIN, WATER, 15 db WEATHER_RAIN, WATER, MORE_EFFECTIVE
db WEATHER_RAIN, FIRE, 05 db WEATHER_RAIN, FIRE, NOT_VERY_EFFECTIVE
db WEATHER_SUN, FIRE, 15 db WEATHER_SUN, FIRE, MORE_EFFECTIVE
db WEATHER_SUN, WATER, 05 db WEATHER_SUN, WATER, NOT_VERY_EFFECTIVE
db $ff db -1 ; end
.WeatherMoveModifiers: .WeatherMoveModifiers:
db WEATHER_RAIN, EFFECT_SOLARBEAM, 05 db WEATHER_RAIN, EFFECT_SOLARBEAM, NOT_VERY_EFFECTIVE
db $ff db -1 ; end
; fbe24 ; fbe24
@ -183,7 +183,7 @@ DoBadgeTypeBoosts: ; fbe24
.CheckBadge: .CheckBadge:
ld a, [hl] ld a, [hl]
cp $ff cp -1
jr z, .done jr z, .done
srl b srl b
@ -236,22 +236,24 @@ DoBadgeTypeBoosts: ; fbe24
ret ret
.BadgeTypes: .BadgeTypes:
db FLYING ; zephyrbadge ; entries correspond to wJohtoBadges constants
db BUG ; hivebadge db FLYING ; ZEPHYRBADGE
db NORMAL ; plainbadge db BUG ; HIVEBADGE
db GHOST ; fogbadge db NORMAL ; PLAINBADGE
db STEEL ; mineralbadge db GHOST ; FOGBADGE
db FIGHTING ; stormbadge db STEEL ; MINERALBADGE
db ICE ; glacierbadge db FIGHTING ; STORMBADGE
db DRAGON ; risingbadge db ICE ; GLACIERBADGE
db DRAGON ; RISINGBADGE
db ROCK ; boulderbadge ; fallthrough
db WATER ; cascadebadge ; entries correspond to wKantoBadges constants
db ELECTRIC ; thunderbadge db ROCK ; BOULDERBADGE
db GRASS ; rainbowbadge db WATER ; CASCADEBADGE
db POISON ; soulbadge db ELECTRIC ; THUNDERBADGE
db PSYCHIC ; marshbadge db GRASS ; RAINBOWBADGE
db FIRE ; volcanobadge db POISON ; SOULBADGE
db GROUND ; earthbadge db PSYCHIC ; MARSHBADGE
db $ff db FIRE ; VOLCANOBADGE
db GROUND ; EARTHBADGE
db -1 ; end
; fbe91 ; fbe91

105
engine/battle/used_move_text.asm
View File

@ -157,12 +157,12 @@ GetMoveGrammar: ; 105e5c
.loop .loop
ld a, [hli] ld a, [hli]
; end of table? ; end of table?
cp $ff cp -1
jr z, .end jr z, .end
; match? ; match?
cp c cp c
jr z, .end jr z, .end
; advance grammar type at $00 ; advance grammar type at 0
and a and a
jr nz, .loop jr nz, .loop
; next grammar type ; next grammar type
@ -179,106 +179,7 @@ GetMoveGrammar: ; 105e5c
ret ret
; 105e7a ; 105e7a
MoveGrammar: ; 105e7a INCLUDE "data/moves/grammar.asm"
; made redundant in localization
; each move is given an identifier for what usedmovetext to use (0-4):
; 0
db SWORDS_DANCE
db GROWTH
db STRENGTH
db HARDEN
db MINIMIZE
db SMOKESCREEN
db WITHDRAW
db DEFENSE_CURL
db EGG_BOMB
db SMOG
db BONE_CLUB
db FLASH
db SPLASH
db ACID_ARMOR
db BONEMERANG
db REST
db SHARPEN
db SUBSTITUTE
db MIND_READER
db SNORE
db PROTECT
db SPIKES
db ENDURE
db ROLLOUT
db SWAGGER
db SLEEP_TALK
db HIDDEN_POWER
db PSYCH_UP
db EXTREMESPEED
db 0 ; end set
; 1
db RECOVER
db TELEPORT
db BIDE
db SELFDESTRUCT
db AMNESIA
db FLAIL
db 0 ; end set
; 2
db MEDITATE
db AGILITY
db MIMIC
db DOUBLE_TEAM
db BARRAGE
db TRANSFORM
db STRUGGLE
db SCARY_FACE
db 0 ; end set
; 3
db POUND
db SCRATCH
db VICEGRIP
db WING_ATTACK
db FLY
db BIND
db SLAM
db HORN_ATTACK
db WRAP
db THRASH
db TAIL_WHIP
db LEER
db BITE
db GROWL
db ROAR
db SING
db PECK
db ABSORB
db STRING_SHOT
db EARTHQUAKE
db FISSURE
db DIG
db TOXIC
db SCREECH
db METRONOME
db LICK
db CLAMP
db CONSTRICT
db POISON_GAS
db BUBBLE
db SLASH
db SPIDER_WEB
db NIGHTMARE
db CURSE
db FORESIGHT
db CHARM
db ATTRACT
db ROCK_SMASH
db 0 ; end set
; all other moves = 4
db $ff ; end
; 105ed0
UpdateUsedMoves: ; 105ed0 UpdateUsedMoves: ; 105ed0

4
engine/events/crystal_unown.asm
View File

@ -137,7 +137,7 @@ Special_DisplayUnownWords: ; 8ae68
.loop2 .loop2
ld a, [de] ld a, [de]
inc de inc de
cp $ff cp -1
jr nz, .loop2 jr nz, .loop2
dec c dec c
jr nz, .loop2 jr nz, .loop2
@ -175,7 +175,7 @@ endc
db x db x
shift shift
endr endr
db $ff db -1 ; end
ENDM ENDM
.UnownText: ; 8aebc .UnownText: ; 8aebc

2
engine/item_effects.asm
View File

@ -748,7 +748,7 @@ BallMultiplierFunctionTable:
dbw MOON_BALL, MoonBallMultiplier dbw MOON_BALL, MoonBallMultiplier
dbw LOVE_BALL, LoveBallMultiplier dbw LOVE_BALL, LoveBallMultiplier
dbw PARK_BALL, ParkBallMultiplier dbw PARK_BALL, ParkBallMultiplier
db $ff db -1 ; end
UltraBallMultiplier: UltraBallMultiplier:
; multiply catch rate by 2 ; multiply catch rate by 2

4
engine/namingscreen.asm
View File

@ -774,12 +774,12 @@ Dakutens: ; Dummied out
db "サザ", "シジ", "スズ", "セゼ", "ソゾ" db "サザ", "シジ", "スズ", "セゼ", "ソゾ"
db "タダ", "チヂ", "ツヅ", "テデ", "トド" db "タダ", "チヂ", "ツヅ", "テデ", "トド"
db "ハバ", "ヒビ", "フブ", "へべ", "ホボ" db "ハバ", "ヒビ", "フブ", "へべ", "ホボ"
db $ff db -1 ; end
Handakutens: ; Dummied out Handakutens: ; Dummied out
db "はぱ", "ひぴ", "ふぷ", "へぺ", "ほぽ" db "はぱ", "ひぴ", "ふぷ", "へぺ", "ほぽ"
db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ" db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ"
db $ff db -1 ; end
; 11bbc ; 11bbc

6
engine/overworld.asm
View File

@ -77,7 +77,7 @@ GetPlayerSprite: ; 14183
cp c cp c
jr z, .good jr z, .good
inc hl inc hl
cp $ff cp -1
jr nz, .loop jr nz, .loop
; Any player state not in the array defaults to Chris's sprite. ; Any player state not in the array defaults to Chris's sprite.
@ -100,14 +100,14 @@ GetPlayerSprite: ; 14183
db PLAYER_BIKE, SPRITE_CHRIS_BIKE db PLAYER_BIKE, SPRITE_CHRIS_BIKE
db PLAYER_SURF, SPRITE_SURF db PLAYER_SURF, SPRITE_SURF
db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU
db $ff db -1 ; end
.Kris: .Kris:
db PLAYER_NORMAL, SPRITE_KRIS db PLAYER_NORMAL, SPRITE_KRIS
db PLAYER_BIKE, SPRITE_KRIS_BIKE db PLAYER_BIKE, SPRITE_KRIS_BIKE
db PLAYER_SURF, SPRITE_SURF db PLAYER_SURF, SPRITE_SURF
db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU
db $ff db -1 ; end
; 141c9 ; 141c9

44
engine/slot_machine.asm
View File

@ -1,11 +1,13 @@
SLOTS_NOBIAS EQU -1 SLOTS_NO_BIAS EQU -1
SLOTS_NOMATCH EQU -1 SLOTS_NO_MATCH EQU -1
SLOTS_SEVEN EQU $00
SLOTS_SEVEN EQU $00
SLOTS_POKEBALL EQU $04 SLOTS_POKEBALL EQU $04
SLOTS_CHERRY EQU $08 SLOTS_CHERRY EQU $08
SLOTS_PIKACHU EQU $0c SLOTS_PIKACHU EQU $0c
SLOTS_SQUIRTLE EQU $10 SLOTS_SQUIRTLE EQU $10
SLOTS_STARYU EQU $14 SLOTS_STARYU EQU $14
REEL_SIZE EQU 15 REEL_SIZE EQU 15
; Constants for slot_reel offsets (see macros/wram.asm) ; Constants for slot_reel offsets (see macros/wram.asm)
@ -148,7 +150,7 @@ _SlotMachine:
ld [hl], $40 ld [hl], $40
xor a ; SLOTS_INIT xor a ; SLOTS_INIT
ld [wJumptableIndex], a ld [wJumptableIndex], a
ld a, SLOTS_NOBIAS ld a, SLOTS_NO_BIAS
ld [wSlotBias], a ld [wSlotBias], a
ld de, MUSIC_GAME_CORNER ld de, MUSIC_GAME_CORNER
call PlayMusic call PlayMusic
@ -309,7 +311,7 @@ SlotsAction_Init: ; 9287e (24:687e)
xor a xor a
ld [wFirstTwoReelsMatching], a ld [wFirstTwoReelsMatching], a
ld [wFirstTwoReelsMatchingSevens], a ld [wFirstTwoReelsMatchingSevens], a
ld a, SLOTS_NOMATCH ld a, SLOTS_NO_MATCH
ld [wSlotMatched], a ld [wSlotMatched], a
ret ret
@ -417,7 +419,7 @@ SlotsAction_WaitStopReel3: ; 9293a (24:693a)
SlotsAction_FlashIfWin: ; 92955 (24:6955) SlotsAction_FlashIfWin: ; 92955 (24:6955)
ld a, [wSlotMatched] ld a, [wSlotMatched]
cp SLOTS_NOMATCH cp SLOTS_NO_MATCH
jr nz, .GotIt jr nz, .GotIt
call SlotsAction_Next call SlotsAction_Next
call SlotsAction_Next call SlotsAction_Next
@ -587,7 +589,7 @@ Slots_StopReel2: ; 92a2e (24:6a2e)
ld a, [wSlotBias] ld a, [wSlotBias]
and a and a
jr z, .skip jr z, .skip
cp SLOTS_NOBIAS cp SLOTS_NO_BIAS
jr nz, .dont_jump jr nz, .dont_jump
.skip .skip
call .CheckReel1ForASeven call .CheckReel1ForASeven
@ -997,7 +999,7 @@ ReelAction_StopReel1: ; 92c5e
; even if the current bet won't allow lining it up. ; even if the current bet won't allow lining it up.
ld a, [wSlotBias] ld a, [wSlotBias]
cp SLOTS_NOBIAS cp SLOTS_NO_BIAS
jr z, .NoBias jr z, .NoBias
ld hl, REEL_MANIP_COUNTER ld hl, REEL_MANIP_COUNTER
add hl, bc add hl, bc
@ -1043,7 +1045,7 @@ ReelAction_StopReel2: ; 92c86
jr z, .NoBias jr z, .NoBias
.nope .nope
ld a, [wSlotBias] ld a, [wSlotBias]
cp SLOTS_NOBIAS cp SLOTS_NO_BIAS
jr z, .NoBias jr z, .NoBias
ld hl, REEL_MANIP_COUNTER ld hl, REEL_MANIP_COUNTER
add hl, bc add hl, bc
@ -1079,7 +1081,7 @@ ReelAction_StopReel3: ; 92ca9
.NoMatch: .NoMatch:
ld a, [wSlotBias] ld a, [wSlotBias]
cp SLOTS_NOBIAS cp SLOTS_NO_BIAS
jr z, .NoBias jr z, .NoBias
ld hl, REEL_MANIP_COUNTER ld hl, REEL_MANIP_COUNTER
add hl, bc add hl, bc
@ -1532,7 +1534,7 @@ Slots_CheckMatchedFirstTwoReels: ; 92e94
; 92f1d ; 92f1d
Slots_CheckMatchedAllThreeReels: ; 92f1d Slots_CheckMatchedAllThreeReels: ; 92f1d
ld a, SLOTS_NOMATCH ld a, SLOTS_NO_MATCH
ld [wSlotMatched], a ld [wSlotMatched], a
call Slots_GetCurrentReelState call Slots_GetCurrentReelState
call Slots_CopyReelState call Slots_CopyReelState
@ -1552,7 +1554,7 @@ Slots_CheckMatchedAllThreeReels: ; 92f1d
.return .return
ld a, [wSlotMatched] ld a, [wSlotMatched]
cp SLOTS_NOMATCH cp SLOTS_NO_MATCH
jr nz, .matched_nontrivial jr nz, .matched_nontrivial
and a and a
ret ret
@ -1753,7 +1755,7 @@ Slots_InitBias: ; 93002 (24:7002)
db $14, SLOTS_SQUIRTLE ; 5/128 db $14, SLOTS_SQUIRTLE ; 5/128
db $28, SLOTS_PIKACHU ; 5/64 db $28, SLOTS_PIKACHU ; 5/64
db $30, SLOTS_CHERRY ; 1/32 db $30, SLOTS_CHERRY ; 1/32
db $ff, SLOTS_NOBIAS ; everything else db $ff, SLOTS_NO_BIAS ; everything else
; 93031 ; 93031
.Lucky: ; 93031 .Lucky: ; 93031
@ -1763,7 +1765,7 @@ Slots_InitBias: ; 93002 (24:7002)
db $10, SLOTS_SQUIRTLE ; 1/32 db $10, SLOTS_SQUIRTLE ; 1/32
db $1e, SLOTS_PIKACHU ; 7/128 db $1e, SLOTS_PIKACHU ; 7/128
db $50, SLOTS_CHERRY ; 25/128 db $50, SLOTS_CHERRY ; 25/128
db $ff, SLOTS_NOBIAS ; everything else db $ff, SLOTS_NO_BIAS ; everything else
; 9303f ; 9303f
Slots_IlluminateBetLights: ; 9303f (24:703f) Slots_IlluminateBetLights: ; 9303f (24:703f)
@ -1924,7 +1926,7 @@ Slots_AskPlayAgain: ; 930e9 (24:70e9)
Slots_GetPayout: ; 93124 (24:7124) Slots_GetPayout: ; 93124 (24:7124)
ld a, [wSlotMatched] ld a, [wSlotMatched]
cp SLOTS_NOMATCH cp SLOTS_NO_MATCH
jr z, .no_win jr z, .no_win
srl a srl a
ld e, a ld e, a
@ -1957,7 +1959,7 @@ Slots_GetPayout: ; 93124 (24:7124)
Slots_PayoutText: ; 93158 (24:7158) Slots_PayoutText: ; 93158 (24:7158)
ld a, [wSlotMatched] ld a, [wSlotMatched]
cp SLOTS_NOMATCH cp SLOTS_NO_MATCH
jr nz, .MatchedSomething jr nz, .MatchedSomething
ld hl, .Text_Darn ld hl, .Text_Darn
call PrintText call PrintText
@ -2047,7 +2049,7 @@ endr
call Random call Random
and %0010100 and %0010100
ret z ; 25% chance to stick with seven symbol bias ret z ; 25% chance to stick with seven symbol bias
ld a, SLOTS_NOBIAS ld a, SLOTS_NO_BIAS
ld [wSlotBias], a ld [wSlotBias], a
ret ret
@ -2055,7 +2057,7 @@ endr
call Random call Random
and %0011100 and %0011100
ret z ; 12.5% chance to stick with seven symbol bias ret z ; 12.5% chance to stick with seven symbol bias
ld a, SLOTS_NOBIAS ld a, SLOTS_NO_BIAS
ld [wSlotBias], a ld [wSlotBias], a
ret ret

2
maps/CeladonDeptStoreElevator.asm
View File

@ -25,7 +25,7 @@ CeladonDeptStoreElevatorData:
elevfloor FLOOR_4F, 3, CELADON_DEPT_STORE_4F elevfloor FLOOR_4F, 3, CELADON_DEPT_STORE_4F
elevfloor FLOOR_5F, 3, CELADON_DEPT_STORE_5F elevfloor FLOOR_5F, 3, CELADON_DEPT_STORE_5F
elevfloor FLOOR_6F, 2, CELADON_DEPT_STORE_6F elevfloor FLOOR_6F, 2, CELADON_DEPT_STORE_6F
db $ff ; end db -1 ; end
CeladonDeptStoreElevator_MapEventHeader: CeladonDeptStoreElevator_MapEventHeader:
; filler ; filler

40
mobile/mobile_22.asm
View File

@ -1966,32 +1966,32 @@ Unknown_89bd8: ; 89bd8
; 89be0 ; 89be0
Unknown_89be0: ; 89be0 Unknown_89be0: ; 89be0
db $01, $12, $4e, $01, $00 db $01, $12, $4e, $01, 0
db $01, $19, $4e, $01, $40 db $01, $19, $4e, $01, 0 | Y_FLIP
db $01, $12, $72, $01, $20 db $01, $12, $72, $01, 0 | X_FLIP
db $01, $19, $72, $01, $60 db $01, $19, $72, $01, 0 | X_FLIP | Y_FLIP
db $ff db -1 ; end
Unknown_89bf5: ; 89bf5 Unknown_89bf5: ; 89bf5
db $01, $60, $16, $01, $00 db $01, $60, $16, $01, 0
db $01, $62, $16, $01, $40 db $01, $62, $16, $01, 0 | Y_FLIP
db $01, $60, $92, $01, $20 db $01, $60, $92, $01, 0 | X_FLIP
db $01, $62, $92, $01, $60 db $01, $62, $92, $01, 0 | X_FLIP | Y_FLIP
db $ff db -1 ; end
Unknown_89c0a: ; 89c0a Unknown_89c0a: ; 89c0a
db $01, $78, $66, $01, $00 db $01, $78, $66, $01, 0
db $01, $78, $66, $01, $40 db $01, $78, $66, $01, 0 | Y_FLIP
db $01, $78, $92, $01, $20 db $01, $78, $92, $01, 0 | X_FLIP
db $01, $78, $92, $01, $60 db $01, $78, $92, $01, 0 | X_FLIP | Y_FLIP
db $ff db -1 ; end
Unknown_89c1f: ; 89c1f Unknown_89c1f: ; 89c1f
db $01, $80, $66, $01, $00 db $01, $80, $66, $01, 0
db $01, $80, $66, $01, $40 db $01, $80, $66, $01, 0 | Y_FLIP
db $01, $80, $92, $01, $20 db $01, $80, $92, $01, 0 | X_FLIP
db $01, $80, $92, $01, $60 db $01, $80, $92, $01, 0 | X_FLIP | Y_FLIP
db $ff db -1 ; end
; 89c34 ; 89c34
Function89c34: ; 89c34 (22:5c34) Function89c34: ; 89c34 (22:5c34)

6
mobile/mobile_45.asm
View File

@ -5844,7 +5844,7 @@ Unknown_116815: ; 116815
db $c, $5 db $c, $5
db $9, $8 db $9, $8
db $8, $4 db $8, $4
db $ff db -1 ; end
Unknown_11683e: ; 11683e Unknown_11683e: ; 11683e
db $fd, $20 db $fd, $20
@ -5867,7 +5867,7 @@ Unknown_11683e: ; 11683e
db $12, $5 db $12, $5
db $f, $8 db $f, $8
db $e, $4 db $e, $4
db $ff db -1 ; end
Unknown_116867: ; 116867 Unknown_116867: ; 116867
db $14, $8 db $14, $8
@ -5910,7 +5910,7 @@ Unknown_116881: ; 116881
db $fd, $2 db $fd, $2
db $23, $2 db $23, $2
db $fd, $40 db $fd, $40
db $ff db -1 ; end
Unknown_1168ae: ; 1168ae Unknown_1168ae: ; 1168ae
db $24, $4 db $24, $4