diff options
| -rw-r--r-- | constants.asm | 4 | ||||
| -rw-r--r-- | pokered.asm | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/constants.asm b/constants.asm index 4dbf65a4..e8c01320 100644 --- a/constants.asm +++ b/constants.asm @@ -229,7 +229,7 @@ KADABRA EQU $26 GRAVELER EQU $27 CHANSEY EQU $28 MACHOKE EQU $29 -MR__MIME EQU $2A +MR_MIME EQU $2A HITMONLEE EQU $2B HITMONCHAN EQU $2C ARBOK EQU $2D @@ -515,7 +515,7 @@ DEX_GOLDEEN EQU 118 DEX_SEAKING EQU 119 DEX_STARYU EQU 120 DEX_STARMIE EQU 121 -DEX_MR__MIME EQU 122 +DEX_MR_MIME EQU 122 DEX_SCYTHER EQU 123 DEX_JYNX EQU 124 DEX_ELECTABUZZ EQU 125 diff --git a/pokered.asm b/pokered.asm index 064a47e8..b640a87a 100644 --- a/pokered.asm +++ b/pokered.asm @@ -10395,19 +10395,19 @@ BeautyData: db 29,STARYU,STARYU,STARYU,0 db 30,SEADRA,HORSEA,SEADRA,0 PsychicData: - db 31,KADABRA,SLOWPOKE,MR__MIME,KADABRA,0 - db 34,MR__MIME,KADABRA,0 + db 31,KADABRA,SLOWPOKE,MR_MIME,KADABRA,0 + db 34,MR_MIME,KADABRA,0 db 33,SLOWPOKE,SLOWPOKE,SLOWBRO,0 db 38,SLOWBRO,0 RockerData: db 20,VOLTORB,MAGNEMITE,VOLTORB,0 db 29,VOLTORB,ELECTRODE,0 JugglerData: - db 29,KADABRA,MR__MIME,0 + db 29,KADABRA,MR_MIME,0 db 41,DROWZEE,HYPNO,KADABRA,KADABRA,0 db 31,DROWZEE,DROWZEE,KADABRA,DROWZEE,0 db 34,DROWZEE,HYPNO,0 - db 48,MR__MIME,0 + db 48,MR_MIME,0 db 33,HYPNO,0 db 38,HYPNO,0 db 34,DROWZEE,KADABRA,0 @@ -10557,7 +10557,7 @@ KogaData: BlaineData: db $FF,42,GROWLITHE,40,PONYTA,42,RAPIDASH,47,ARCANINE,0 SabrinaData: - db $FF,38,KADABRA,37,MR__MIME,38,VENOMOTH,43,ALAKAZAM,0 + db $FF,38,KADABRA,37,MR_MIME,38,VENOMOTH,43,ALAKAZAM,0 GentlemanData: db 18,GROWLITHE,GROWLITHE,0 db 19,NIDORAN_M,NIDORAN_F,0 @@ -11789,7 +11789,7 @@ Mon067_EvosAttacks: db 52,SUBMISSION db 0 Mon122_EvosAttacks: -;MR__MIME +;MR_MIME ;Evolutions db 0 ;Learnset @@ -15443,7 +15443,7 @@ PokedexOrder: ; 5024 db DEX_GRAVELER db DEX_CHANSEY db DEX_MACHOKE - db DEX_MR__MIME + db DEX_MR_MIME db DEX_HITMONLEE db DEX_HITMONCHAN db DEX_ARBOK @@ -27182,7 +27182,7 @@ INCBIN "baserom.gbc",$716BE,$71B7B-$716BE TradeMons: ; 5B7B ; givemonster, getmonster, textstring, nickname (11 bytes), 14 bytes total db NIDORINO, NIDORINA, 0,"TERRY@@@@@@" - db ABRA, MR__MIME, 0,"MARCEL@@@@@" + db ABRA, MR_MIME, 0,"MARCEL@@@@@" db BUTTERFREE,BEEDRILL, 2,"CHIKUCHIKU@" db PONYTA, SEEL, 0,"SAILOR@@@@@" db SPEAROW, FARFETCH_D,2,"DUX@@@@@@@@" @@ -27317,7 +27317,7 @@ MonsterPalettes: ; 65C8 db PAL_REDMON ; SEAKING db PAL_REDMON ; STARYU db PAL_GREYMON ; STARMIE - db PAL_PINKMON ; MR__MIME + db PAL_PINKMON ; MR_MIME db PAL_GREENMON ; SCYTHER db PAL_MEWMON ; JYNX db PAL_YELLOWMON ; ELECTABUZZ |