mirror of
https://github.com/thornAvery/kep-hack.git
synced 2025-10-16 12:06:25 +13:00
Merge pull request #294 from SatoMew/master
Give a better label to ghost Marowak's constant
This commit is contained in:
Rangi
GitHub
commit
3e830f98d8
|
|
@ -6,197 +6,197 @@
|
|||
; - PokedexOrder (see data/pokemon/dex_order.asm)
|
||||
; - PokedexEntryPointers (see data/pokemon/dex_entries.asm)
|
||||
const_def
|
||||
const NO_MON ; $00
|
||||
const RHYDON ; $01
|
||||
const KANGASKHAN ; $02
|
||||
const NIDORAN_M ; $03
|
||||
const CLEFAIRY ; $04
|
||||
const SPEAROW ; $05
|
||||
const VOLTORB ; $06
|
||||
const NIDOKING ; $07
|
||||
const SLOWBRO ; $08
|
||||
const IVYSAUR ; $09
|
||||
const EXEGGUTOR ; $0A
|
||||
const LICKITUNG ; $0B
|
||||
const EXEGGCUTE ; $0C
|
||||
const GRIMER ; $0D
|
||||
const GENGAR ; $0E
|
||||
const NIDORAN_F ; $0F
|
||||
const NIDOQUEEN ; $10
|
||||
const CUBONE ; $11
|
||||
const RHYHORN ; $12
|
||||
const LAPRAS ; $13
|
||||
const ARCANINE ; $14
|
||||
const MEW ; $15
|
||||
const GYARADOS ; $16
|
||||
const SHELLDER ; $17
|
||||
const TENTACOOL ; $18
|
||||
const GASTLY ; $19
|
||||
const SCYTHER ; $1A
|
||||
const STARYU ; $1B
|
||||
const BLASTOISE ; $1C
|
||||
const PINSIR ; $1D
|
||||
const TANGELA ; $1E
|
||||
const_skip ; $1F
|
||||
const_skip ; $20
|
||||
const GROWLITHE ; $21
|
||||
const ONIX ; $22
|
||||
const FEAROW ; $23
|
||||
const PIDGEY ; $24
|
||||
const SLOWPOKE ; $25
|
||||
const KADABRA ; $26
|
||||
const GRAVELER ; $27
|
||||
const CHANSEY ; $28
|
||||
const MACHOKE ; $29
|
||||
const MR_MIME ; $2A
|
||||
const HITMONLEE ; $2B
|
||||
const HITMONCHAN ; $2C
|
||||
const ARBOK ; $2D
|
||||
const PARASECT ; $2E
|
||||
const PSYDUCK ; $2F
|
||||
const DROWZEE ; $30
|
||||
const GOLEM ; $31
|
||||
const_skip ; $32
|
||||
const MAGMAR ; $33
|
||||
const_skip ; $34
|
||||
const ELECTABUZZ ; $35
|
||||
const MAGNETON ; $36
|
||||
const KOFFING ; $37
|
||||
const_skip ; $38
|
||||
const MANKEY ; $39
|
||||
const SEEL ; $3A
|
||||
const DIGLETT ; $3B
|
||||
const TAUROS ; $3C
|
||||
const_skip ; $3D
|
||||
const_skip ; $3E
|
||||
const_skip ; $3F
|
||||
const FARFETCHD ; $40
|
||||
const VENONAT ; $41
|
||||
const DRAGONITE ; $42
|
||||
const_skip ; $43
|
||||
const_skip ; $44
|
||||
const_skip ; $45
|
||||
const DODUO ; $46
|
||||
const POLIWAG ; $47
|
||||
const JYNX ; $48
|
||||
const MOLTRES ; $49
|
||||
const ARTICUNO ; $4A
|
||||
const ZAPDOS ; $4B
|
||||
const DITTO ; $4C
|
||||
const MEOWTH ; $4D
|
||||
const KRABBY ; $4E
|
||||
const_skip ; $4F
|
||||
const_skip ; $50
|
||||
const_skip ; $51
|
||||
const VULPIX ; $52
|
||||
const NINETALES ; $53
|
||||
const PIKACHU ; $54
|
||||
const RAICHU ; $55
|
||||
const_skip ; $56
|
||||
const_skip ; $57
|
||||
const DRATINI ; $58
|
||||
const DRAGONAIR ; $59
|
||||
const KABUTO ; $5A
|
||||
const KABUTOPS ; $5B
|
||||
const HORSEA ; $5C
|
||||
const SEADRA ; $5D
|
||||
const_skip ; $5E
|
||||
const_skip ; $5F
|
||||
const SANDSHREW ; $60
|
||||
const SANDSLASH ; $61
|
||||
const OMANYTE ; $62
|
||||
const OMASTAR ; $63
|
||||
const JIGGLYPUFF ; $64
|
||||
const WIGGLYTUFF ; $65
|
||||
const EEVEE ; $66
|
||||
const FLAREON ; $67
|
||||
const JOLTEON ; $68
|
||||
const VAPOREON ; $69
|
||||
const MACHOP ; $6A
|
||||
const ZUBAT ; $6B
|
||||
const EKANS ; $6C
|
||||
const PARAS ; $6D
|
||||
const POLIWHIRL ; $6E
|
||||
const POLIWRATH ; $6F
|
||||
const WEEDLE ; $70
|
||||
const KAKUNA ; $71
|
||||
const BEEDRILL ; $72
|
||||
const_skip ; $73
|
||||
const DODRIO ; $74
|
||||
const PRIMEAPE ; $75
|
||||
const DUGTRIO ; $76
|
||||
const VENOMOTH ; $77
|
||||
const DEWGONG ; $78
|
||||
const_skip ; $79
|
||||
const_skip ; $7A
|
||||
const CATERPIE ; $7B
|
||||
const METAPOD ; $7C
|
||||
const BUTTERFREE ; $7D
|
||||
const MACHAMP ; $7E
|
||||
const_skip ; $7F
|
||||
const GOLDUCK ; $80
|
||||
const HYPNO ; $81
|
||||
const GOLBAT ; $82
|
||||
const MEWTWO ; $83
|
||||
const SNORLAX ; $84
|
||||
const MAGIKARP ; $85
|
||||
const_skip ; $86
|
||||
const_skip ; $87
|
||||
const MUK ; $88
|
||||
const_skip ; $89
|
||||
const KINGLER ; $8A
|
||||
const CLOYSTER ; $8B
|
||||
const_skip ; $8C
|
||||
const ELECTRODE ; $8D
|
||||
const CLEFABLE ; $8E
|
||||
const WEEZING ; $8F
|
||||
const PERSIAN ; $90
|
||||
const MAROWAK ; $91
|
||||
const_skip ; $92
|
||||
const HAUNTER ; $93
|
||||
const ABRA ; $94
|
||||
const ALAKAZAM ; $95
|
||||
const PIDGEOTTO ; $96
|
||||
const PIDGEOT ; $97
|
||||
const STARMIE ; $98
|
||||
const BULBASAUR ; $99
|
||||
const VENUSAUR ; $9A
|
||||
const TENTACRUEL ; $9B
|
||||
const_skip ; $9C
|
||||
const GOLDEEN ; $9D
|
||||
const SEAKING ; $9E
|
||||
const_skip ; $9F
|
||||
const_skip ; $A0
|
||||
const_skip ; $A1
|
||||
const_skip ; $A2
|
||||
const PONYTA ; $A3
|
||||
const RAPIDASH ; $A4
|
||||
const RATTATA ; $A5
|
||||
const RATICATE ; $A6
|
||||
const NIDORINO ; $A7
|
||||
const NIDORINA ; $A8
|
||||
const GEODUDE ; $A9
|
||||
const PORYGON ; $AA
|
||||
const AERODACTYL ; $AB
|
||||
const_skip ; $AC
|
||||
const MAGNEMITE ; $AD
|
||||
const_skip ; $AE
|
||||
const_skip ; $AF
|
||||
const CHARMANDER ; $B0
|
||||
const SQUIRTLE ; $B1
|
||||
const CHARMELEON ; $B2
|
||||
const WARTORTLE ; $B3
|
||||
const CHARIZARD ; $B4
|
||||
const_skip ; $B5
|
||||
const FOSSIL_KABUTOPS ; $B6
|
||||
const FOSSIL_AERODACTYL ; $B7
|
||||
const MON_GHOST ; $B8
|
||||
const ODDISH ; $B9
|
||||
const GLOOM ; $BA
|
||||
const VILEPLUME ; $BB
|
||||
const BELLSPROUT ; $BC
|
||||
const WEEPINBELL ; $BD
|
||||
const VICTREEBEL ; $BE
|
||||
const NO_MON ; $00
|
||||
const RHYDON ; $01
|
||||
const KANGASKHAN ; $02
|
||||
const NIDORAN_M ; $03
|
||||
const CLEFAIRY ; $04
|
||||
const SPEAROW ; $05
|
||||
const VOLTORB ; $06
|
||||
const NIDOKING ; $07
|
||||
const SLOWBRO ; $08
|
||||
const IVYSAUR ; $09
|
||||
const EXEGGUTOR ; $0A
|
||||
const LICKITUNG ; $0B
|
||||
const EXEGGCUTE ; $0C
|
||||
const GRIMER ; $0D
|
||||
const GENGAR ; $0E
|
||||
const NIDORAN_F ; $0F
|
||||
const NIDOQUEEN ; $10
|
||||
const CUBONE ; $11
|
||||
const RHYHORN ; $12
|
||||
const LAPRAS ; $13
|
||||
const ARCANINE ; $14
|
||||
const MEW ; $15
|
||||
const GYARADOS ; $16
|
||||
const SHELLDER ; $17
|
||||
const TENTACOOL ; $18
|
||||
const GASTLY ; $19
|
||||
const SCYTHER ; $1A
|
||||
const STARYU ; $1B
|
||||
const BLASTOISE ; $1C
|
||||
const PINSIR ; $1D
|
||||
const TANGELA ; $1E
|
||||
const_skip ; $1F
|
||||
const_skip ; $20
|
||||
const GROWLITHE ; $21
|
||||
const ONIX ; $22
|
||||
const FEAROW ; $23
|
||||
const PIDGEY ; $24
|
||||
const SLOWPOKE ; $25
|
||||
const KADABRA ; $26
|
||||
const GRAVELER ; $27
|
||||
const CHANSEY ; $28
|
||||
const MACHOKE ; $29
|
||||
const MR_MIME ; $2A
|
||||
const HITMONLEE ; $2B
|
||||
const HITMONCHAN ; $2C
|
||||
const ARBOK ; $2D
|
||||
const PARASECT ; $2E
|
||||
const PSYDUCK ; $2F
|
||||
const DROWZEE ; $30
|
||||
const GOLEM ; $31
|
||||
const_skip ; $32
|
||||
const MAGMAR ; $33
|
||||
const_skip ; $34
|
||||
const ELECTABUZZ ; $35
|
||||
const MAGNETON ; $36
|
||||
const KOFFING ; $37
|
||||
const_skip ; $38
|
||||
const MANKEY ; $39
|
||||
const SEEL ; $3A
|
||||
const DIGLETT ; $3B
|
||||
const TAUROS ; $3C
|
||||
const_skip ; $3D
|
||||
const_skip ; $3E
|
||||
const_skip ; $3F
|
||||
const FARFETCHD ; $40
|
||||
const VENONAT ; $41
|
||||
const DRAGONITE ; $42
|
||||
const_skip ; $43
|
||||
const_skip ; $44
|
||||
const_skip ; $45
|
||||
const DODUO ; $46
|
||||
const POLIWAG ; $47
|
||||
const JYNX ; $48
|
||||
const MOLTRES ; $49
|
||||
const ARTICUNO ; $4A
|
||||
const ZAPDOS ; $4B
|
||||
const DITTO ; $4C
|
||||
const MEOWTH ; $4D
|
||||
const KRABBY ; $4E
|
||||
const_skip ; $4F
|
||||
const_skip ; $50
|
||||
const_skip ; $51
|
||||
const VULPIX ; $52
|
||||
const NINETALES ; $53
|
||||
const PIKACHU ; $54
|
||||
const RAICHU ; $55
|
||||
const_skip ; $56
|
||||
const_skip ; $57
|
||||
const DRATINI ; $58
|
||||
const DRAGONAIR ; $59
|
||||
const KABUTO ; $5A
|
||||
const KABUTOPS ; $5B
|
||||
const HORSEA ; $5C
|
||||
const SEADRA ; $5D
|
||||
const_skip ; $5E
|
||||
const_skip ; $5F
|
||||
const SANDSHREW ; $60
|
||||
const SANDSLASH ; $61
|
||||
const OMANYTE ; $62
|
||||
const OMASTAR ; $63
|
||||
const JIGGLYPUFF ; $64
|
||||
const WIGGLYTUFF ; $65
|
||||
const EEVEE ; $66
|
||||
const FLAREON ; $67
|
||||
const JOLTEON ; $68
|
||||
const VAPOREON ; $69
|
||||
const MACHOP ; $6A
|
||||
const ZUBAT ; $6B
|
||||
const EKANS ; $6C
|
||||
const PARAS ; $6D
|
||||
const POLIWHIRL ; $6E
|
||||
const POLIWRATH ; $6F
|
||||
const WEEDLE ; $70
|
||||
const KAKUNA ; $71
|
||||
const BEEDRILL ; $72
|
||||
const_skip ; $73
|
||||
const DODRIO ; $74
|
||||
const PRIMEAPE ; $75
|
||||
const DUGTRIO ; $76
|
||||
const VENOMOTH ; $77
|
||||
const DEWGONG ; $78
|
||||
const_skip ; $79
|
||||
const_skip ; $7A
|
||||
const CATERPIE ; $7B
|
||||
const METAPOD ; $7C
|
||||
const BUTTERFREE ; $7D
|
||||
const MACHAMP ; $7E
|
||||
const_skip ; $7F
|
||||
const GOLDUCK ; $80
|
||||
const HYPNO ; $81
|
||||
const GOLBAT ; $82
|
||||
const MEWTWO ; $83
|
||||
const SNORLAX ; $84
|
||||
const MAGIKARP ; $85
|
||||
const_skip ; $86
|
||||
const_skip ; $87
|
||||
const MUK ; $88
|
||||
const_skip ; $89
|
||||
const KINGLER ; $8A
|
||||
const CLOYSTER ; $8B
|
||||
const_skip ; $8C
|
||||
const ELECTRODE ; $8D
|
||||
const CLEFABLE ; $8E
|
||||
const WEEZING ; $8F
|
||||
const PERSIAN ; $90
|
||||
const MAROWAK ; $91
|
||||
const_skip ; $92
|
||||
const HAUNTER ; $93
|
||||
const ABRA ; $94
|
||||
const ALAKAZAM ; $95
|
||||
const PIDGEOTTO ; $96
|
||||
const PIDGEOT ; $97
|
||||
const STARMIE ; $98
|
||||
const BULBASAUR ; $99
|
||||
const VENUSAUR ; $9A
|
||||
const TENTACRUEL ; $9B
|
||||
const_skip ; $9C
|
||||
const GOLDEEN ; $9D
|
||||
const SEAKING ; $9E
|
||||
const_skip ; $9F
|
||||
const_skip ; $A0
|
||||
const_skip ; $A1
|
||||
const_skip ; $A2
|
||||
const PONYTA ; $A3
|
||||
const RAPIDASH ; $A4
|
||||
const RATTATA ; $A5
|
||||
const RATICATE ; $A6
|
||||
const NIDORINO ; $A7
|
||||
const NIDORINA ; $A8
|
||||
const GEODUDE ; $A9
|
||||
const PORYGON ; $AA
|
||||
const AERODACTYL ; $AB
|
||||
const_skip ; $AC
|
||||
const MAGNEMITE ; $AD
|
||||
const_skip ; $AE
|
||||
const_skip ; $AF
|
||||
const CHARMANDER ; $B0
|
||||
const SQUIRTLE ; $B1
|
||||
const CHARMELEON ; $B2
|
||||
const WARTORTLE ; $B3
|
||||
const CHARIZARD ; $B4
|
||||
const_skip ; $B5
|
||||
const FOSSIL_KABUTOPS ; $B6
|
||||
const FOSSIL_AERODACTYL ; $B7
|
||||
const MON_GHOST ; $B8
|
||||
const ODDISH ; $B9
|
||||
const GLOOM ; $BA
|
||||
const VILEPLUME ; $BB
|
||||
const BELLSPROUT ; $BC
|
||||
const WEEPINBELL ; $BD
|
||||
const VICTREEBEL ; $BE
|
||||
|
||||
NUM_POKEMON_INDEXES EQU const_value - 1
|
||||
|
||||
|
|
@ -206,4 +206,4 @@ STARTER2 EQU SQUIRTLE
|
|||
STARTER3 EQU BULBASAUR
|
||||
|
||||
; ghost in Pokémon Tower
|
||||
GHOST_MON EQU MAROWAK
|
||||
RESTLESS_SOUL EQU MAROWAK
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ PrintBeginningBattleText:
|
|||
call IsItemInBag
|
||||
ld a, [wEnemyMonSpecies2]
|
||||
ld [wcf91], a
|
||||
cp GHOST_MON
|
||||
cp RESTLESS_SOUL
|
||||
jr z, .isMarowak
|
||||
ld a, b
|
||||
and a
|
||||
|
|
|
|||
|
|
@ -6784,7 +6784,7 @@ InitWildBattle:
|
|||
call LoadEnemyMonData
|
||||
call DoBattleTransitionAndInitBattleVariables
|
||||
ld a, [wCurOpponent]
|
||||
cp GHOST_MON
|
||||
cp RESTLESS_SOUL
|
||||
jr z, .isGhost
|
||||
call IsGhostBattle
|
||||
jr nz, .isNoGhost
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ MarowakAnim:
|
|||
xor a
|
||||
ldh [hAutoBGTransferEnabled], a ; disable BG transfer so we don't see the Marowak too soon
|
||||
; replace ghost pic with Marowak in BG
|
||||
ld a, GHOST_MON
|
||||
ld a, RESTLESS_SOUL
|
||||
ld [wChangeMonPicEnemyTurnSpecies], a
|
||||
ld a, $1
|
||||
ldh [hWhoseTurn], a
|
||||
|
|
|
|||
|
|
@ -170,7 +170,7 @@ ItemUseBall:
|
|||
cp POKEMON_TOWER_6F
|
||||
jr nz, .loop
|
||||
ld a, [wEnemyMonSpecies2]
|
||||
cp GHOST_MON
|
||||
cp RESTLESS_SOUL
|
||||
ld b, $10 ; can't be caught value
|
||||
jp z, .setAnimData
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ PokemonTower6Script0:
|
|||
ld a, $6
|
||||
ldh [hSpriteIndexOrTextID], a
|
||||
call DisplayTextID
|
||||
ld a, MAROWAK
|
||||
ld a, RESTLESS_SOUL
|
||||
ld [wCurOpponent], a
|
||||
ld a, 30
|
||||
ld [wCurEnemyLVL], a
|
||||
|
|
@ -134,7 +134,7 @@ PokemonTower6Text7:
|
|||
text_asm
|
||||
ld hl, PokemonTower2Text_60c1f
|
||||
call PrintText
|
||||
ld a, MAROWAK
|
||||
ld a, RESTLESS_SOUL
|
||||
call PlayCry
|
||||
call WaitForSoundToFinish
|
||||
ld c, 30
|
||||
|
|
|
|||
Loading…
Reference in a new issue