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 pull request #654 from Rangi42/master

Browse Source 
Miscellaneous cleanup issues
This commit is contained in:
Rangi 2019-11-04 19:40:58 -05:00 committed by GitHub
commit 9ebe549347
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
243 changed files with 1921 additions and 1897 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -166,6 +166,7 @@ gfx/mail/flower_mail_border.1bpp: tools/gfx += --remove-whitespace
gfx/mail/litebluemail_border.1bpp: tools/gfx += --remove-whitespace
gfx/pokedex/pokedex.2bpp: tools/gfx += --trim-whitespace
gfx/pokedex/question_mark.2bpp: rgbgfx += -h
gfx/pokedex/sgb.2bpp: tools/gfx += --trim-whitespace
gfx/pokedex/slowpoke.2bpp: tools/gfx += --trim-whitespace

4
constants/map_object_constants.asm
View File

@ -34,7 +34,7 @@
const OBJECT_1F ; 1f
const OBJECT_RANGE ; 20
; 21-27 are not used
OBJECT_STRUCT_LENGTH EQU 40
OBJECT_LENGTH EQU 40
NUM_OBJECT_STRUCTS EQU 13 ; see wObjectStructs
; object_struct OBJECT_FACING values
@ -114,7 +114,7 @@ ABSOLUTE_TILE_ID EQU 1 << ABSOLUTE_TILE_ID_F
const MAPOBJECT_FLAG_HI ; d
const MAPOBJECT_E ; unused
const MAPOBJECT_F ; unused
OBJECT_LENGTH EQU const_value
MAPOBJECT_LENGTH EQU const_value
; SpriteMovementData struct members (see data/sprites/map_objects.asm)
const_def

11
constants/script_constants.asm
View File

@ -92,6 +92,17 @@ RETVAR_EXECUTE EQU (2 << 6)
const PLAYEREVENT_JOYCHANGEFACING
NUM_PLAYER_EVENTS EQU const_value
; PlayerMovement.pointers indexes (see engine/overworld/events.asm)
const_def
const PLAYERMOVEMENT_NORMAL
const PLAYERMOVEMENT_WARP
const PLAYERMOVEMENT_TURN
const PLAYERMOVEMENT_FORCE_TURN
const PLAYERMOVEMENT_FINISH
const PLAYERMOVEMENT_CONTINUE
const PLAYERMOVEMENT_EXIT_WATER
const PLAYERMOVEMENT_JUMP
; script data sizes (see macros/scripts/maps.asm)
SCENE_SCRIPT_SIZE EQU 4 ; scene_script
CALLBACK_SIZE EQU 3 ; callback

4
constants/text_constants.asm
View File

@ -33,12 +33,12 @@ TEXTBOX_INNERY EQU TEXTBOX_Y + 2
; PrintNum bit flags
const_def 5
const PRINTNUM_MONEY_F ; 5
const PRINTNUM_RIGHTALIGN_F ; 6
const PRINTNUM_LEFTALIGN_F ; 6
const PRINTNUM_LEADINGZEROS_F ; 7
; PrintNum arguments (see engine/math/print_num.asm)
PRINTNUM_MONEY EQU 1 << PRINTNUM_MONEY_F
PRINTNUM_RIGHTALIGN EQU 1 << PRINTNUM_RIGHTALIGN_F
PRINTNUM_LEFTALIGN EQU 1 << PRINTNUM_LEFTALIGN_F
PRINTNUM_LEADINGZEROS EQU 1 << PRINTNUM_LEADINGZEROS_F
; character sets (see charmap.asm)

2
constants/tileset_constants.asm
View File

@ -21,7 +21,7 @@
const TILESET_LIGHTHOUSE ; 13
const TILESET_PLAYERS_ROOM ; 14
const TILESET_POKECOM_CENTER ; 15
const TILESET_BATTLE_TOWER ; 16
const TILESET_BATTLE_TOWER_INSIDE ; 16
const TILESET_TOWER ; 17
const TILESET_CAVE ; 18
const TILESET_PARK ; 19

8
data/maps/maps.asm
View File

@ -416,10 +416,10 @@ MapGroup_Cianwood:
map CianwoodPhotoStudio, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map CianwoodLugiaSpeechHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map PokeSeersHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map BattleTower1F, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_LOBBY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map BattleTowerBattleRoom, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map BattleTowerElevator, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_NONE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map BattleTowerHallway, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map BattleTower1F, TILESET_BATTLE_TOWER_INSIDE, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_LOBBY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map BattleTowerBattleRoom, TILESET_BATTLE_TOWER_INSIDE, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map BattleTowerElevator, TILESET_BATTLE_TOWER_INSIDE, INDOOR, BATTLE_TOWER, MUSIC_NONE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map BattleTowerHallway, TILESET_BATTLE_TOWER_INSIDE, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map Route40BattleTowerGate, TILESET_GATE, GATE, BATTLE_TOWER, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map BattleTowerOutside, TILESET_BATTLE_TOWER_OUTSIDE, ROUTE, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

510
data/pokemon/cries.asm
View File

@ -5,258 +5,258 @@ ENDM
PokemonCries::
; entries correspond to constants/pokemon_constants.asm
mon_cry CRY_BULBASAUR, $080, $081 ; BULBASAUR
mon_cry CRY_BULBASAUR, $020, $100 ; IVYSAUR
mon_cry CRY_BULBASAUR, $000, $140 ; VENUSAUR
mon_cry CRY_CHARMANDER, $060, $0c0 ; CHARMANDER
mon_cry CRY_CHARMANDER, $020, $0c0 ; CHARMELEON
mon_cry CRY_CHARMANDER, $000, $100 ; CHARIZARD
mon_cry CRY_SQUIRTLE, $060, $0c0 ; SQUIRTLE
mon_cry CRY_SQUIRTLE, $020, $0c0 ; WARTORTLE
mon_cry CRY_BLASTOISE, $000, $100 ; BLASTOISE
mon_cry CRY_CATERPIE, $080, $0a0 ; CATERPIE
mon_cry CRY_METAPOD, $0cc, $081 ; METAPOD
mon_cry CRY_CATERPIE, $077, $0c0 ; BUTTERFREE
mon_cry CRY_WEEDLE, $0ee, $081 ; WEEDLE
mon_cry CRY_BLASTOISE, $0ff, $081 ; KAKUNA
mon_cry CRY_BLASTOISE, $060, $100 ; BEEDRILL
mon_cry CRY_PIDGEY, $0df, $084 ; PIDGEY
mon_cry CRY_PIDGEOTTO, $028, $140 ; PIDGEOTTO
mon_cry CRY_PIDGEOTTO, $011, $17f ; PIDGEOT
mon_cry CRY_RATTATA, $000, $100 ; RATTATA
mon_cry CRY_RATTATA, $020, $17f ; RATICATE
mon_cry CRY_SPEAROW, $000, $100 ; SPEAROW
mon_cry CRY_FEAROW, $040, $120 ; FEAROW
mon_cry CRY_EKANS, $012, $0c0 ; EKANS
mon_cry CRY_EKANS, $0e0, $090 ; ARBOK
mon_cry CRY_BULBASAUR, $0ee, $081 ; PIKACHU
mon_cry CRY_RAICHU, $0ee, $088 ; RAICHU
mon_cry CRY_NIDORAN_M, $020, $0c0 ; SANDSHREW
mon_cry CRY_NIDORAN_M, $0ff, $17f ; SANDSLASH
mon_cry CRY_NIDORAN_F, $000, $100 ; NIDORAN_F
mon_cry CRY_NIDORAN_F, $02c, $160 ; NIDORINA
mon_cry CRY_NIDOQUEEN, $000, $100 ; NIDOQUEEN
mon_cry CRY_NIDORAN_M, $000, $100 ; NIDORAN_M
mon_cry CRY_NIDORAN_M, $02c, $140 ; NIDORINO
mon_cry CRY_RAICHU, $000, $100 ; NIDOKING
mon_cry CRY_CLEFAIRY, $0cc, $081 ; CLEFAIRY
mon_cry CRY_CLEFAIRY, $0aa, $0a0 ; CLEFABLE
mon_cry CRY_VULPIX, $04f, $090 ; VULPIX
mon_cry CRY_VULPIX, $088, $0e0 ; NINETALES
mon_cry CRY_PIDGEY, $0ff, $0b5 ; JIGGLYPUFF
mon_cry CRY_PIDGEY, $068, $0e0 ; WIGGLYTUFF
mon_cry CRY_SQUIRTLE, $0e0, $100 ; ZUBAT
mon_cry CRY_SQUIRTLE, $0fa, $100 ; GOLBAT
mon_cry CRY_ODDISH, $0dd, $081 ; ODDISH
mon_cry CRY_ODDISH, $0aa, $0c0 ; GLOOM
mon_cry CRY_VILEPLUME, $022, $17f ; VILEPLUME
mon_cry CRY_PARAS, $020, $160 ; PARAS
mon_cry CRY_PARAS, $042, $17f ; PARASECT
mon_cry CRY_VENONAT, $044, $0c0 ; VENONAT
mon_cry CRY_VENONAT, $029, $100 ; VENOMOTH
mon_cry CRY_DIGLETT, $0aa, $081 ; DIGLETT
mon_cry CRY_DIGLETT, $02a, $090 ; DUGTRIO
mon_cry CRY_CLEFAIRY, $077, $090 ; MEOWTH
mon_cry CRY_CLEFAIRY, $099, $17f ; PERSIAN
mon_cry CRY_PSYDUCK, $020, $0e0 ; PSYDUCK
mon_cry CRY_PSYDUCK, $0ff, $0c0 ; GOLDUCK
mon_cry CRY_NIDOQUEEN, $0dd, $0e0 ; MANKEY
mon_cry CRY_NIDOQUEEN, $0af, $0c0 ; PRIMEAPE
mon_cry CRY_GROWLITHE, $020, $0c0 ; GROWLITHE
mon_cry CRY_WEEDLE, $000, $100 ; ARCANINE
mon_cry CRY_PIDGEY, $0ff, $17f ; POLIWAG
mon_cry CRY_PIDGEY, $077, $0e0 ; POLIWHIRL
mon_cry CRY_PIDGEY, $000, $17f ; POLIWRATH
mon_cry CRY_METAPOD, $0c0, $081 ; ABRA
mon_cry CRY_METAPOD, $0a8, $140 ; KADABRA
mon_cry CRY_METAPOD, $098, $17f ; ALAKAZAM
mon_cry CRY_GROWLITHE, $0ee, $081 ; MACHOP
mon_cry CRY_GROWLITHE, $048, $0e0 ; MACHOKE
mon_cry CRY_GROWLITHE, $008, $140 ; MACHAMP
mon_cry CRY_PSYDUCK, $055, $081 ; BELLSPROUT
mon_cry CRY_WEEPINBELL, $044, $0a0 ; WEEPINBELL
mon_cry CRY_WEEPINBELL, $066, $14c ; VICTREEBEL
mon_cry CRY_VENONAT, $000, $100 ; TENTACOOL
mon_cry CRY_VENONAT, $0ee, $17f ; TENTACRUEL
mon_cry CRY_VULPIX, $0f0, $090 ; GEODUDE
mon_cry CRY_VULPIX, $000, $100 ; GRAVELER
mon_cry CRY_GOLEM, $0e0, $0c0 ; GOLEM
mon_cry CRY_WEEPINBELL, $000, $100 ; PONYTA
mon_cry CRY_WEEPINBELL, $020, $140 ; RAPIDASH
mon_cry CRY_SLOWPOKE, $000, $100 ; SLOWPOKE
mon_cry CRY_GROWLITHE, $000, $100 ; SLOWBRO
mon_cry CRY_METAPOD, $080, $0e0 ; MAGNEMITE
mon_cry CRY_METAPOD, $020, $140 ; MAGNETON
mon_cry CRY_SPEAROW, $0dd, $081 ; FARFETCH_D
mon_cry CRY_DIGLETT, $0bb, $081 ; DODUO
mon_cry CRY_DIGLETT, $099, $0a0 ; DODRIO
mon_cry CRY_SEEL, $088, $140 ; SEEL
mon_cry CRY_SEEL, $023, $17f ; DEWGONG
mon_cry CRY_GRIMER, $000, $100 ; GRIMER
mon_cry CRY_MUK, $0ef, $17f ; MUK
mon_cry CRY_FEAROW, $000, $100 ; SHELLDER
mon_cry CRY_FEAROW, $06f, $160 ; CLOYSTER
mon_cry CRY_METAPOD, $000, $100 ; GASTLY
mon_cry CRY_METAPOD, $030, $0c0 ; HAUNTER
mon_cry CRY_MUK, $000, $17f ; GENGAR
mon_cry CRY_EKANS, $0ff, $140 ; ONIX
mon_cry CRY_DROWZEE, $088, $0a0 ; DROWZEE
mon_cry CRY_DROWZEE, $0ee, $0c0 ; HYPNO
mon_cry CRY_KRABBY, $020, $160 ; KRABBY
mon_cry CRY_KRABBY, $0ee, $160 ; KINGLER
mon_cry CRY_VOLTORB, $0ed, $100 ; VOLTORB
mon_cry CRY_VOLTORB, $0a8, $110 ; ELECTRODE
mon_cry CRY_DIGLETT, $000, $100 ; EXEGGCUTE
mon_cry CRY_DROWZEE, $000, $100 ; EXEGGUTOR
mon_cry CRY_CLEFAIRY, $000, $100 ; CUBONE
mon_cry CRY_ODDISH, $04f, $0e0 ; MAROWAK
mon_cry CRY_GOLEM, $080, $140 ; HITMONLEE
mon_cry CRY_SEEL, $0ee, $140 ; HITMONCHAN
mon_cry CRY_SEEL, $000, $100 ; LICKITUNG
mon_cry CRY_GOLEM, $0e6, $15d ; KOFFING
mon_cry CRY_GOLEM, $0ff, $17f ; WEEZING
mon_cry CRY_CHARMANDER, $000, $100 ; RHYHORN
mon_cry CRY_RHYDON, $000, $100 ; RHYDON
mon_cry CRY_PIDGEOTTO, $00a, $140 ; CHANSEY
mon_cry CRY_GOLEM, $000, $100 ; TANGELA
mon_cry CRY_KANGASKHAN, $000, $100 ; KANGASKHAN
mon_cry CRY_CLEFAIRY, $099, $090 ; HORSEA
mon_cry CRY_CLEFAIRY, $03c, $081 ; SEADRA
mon_cry CRY_CATERPIE, $080, $0c0 ; GOLDEEN
mon_cry CRY_CATERPIE, $010, $17f ; SEAKING
mon_cry CRY_PARAS, $002, $0a0 ; STARYU
mon_cry CRY_PARAS, $000, $100 ; STARMIE
mon_cry CRY_KRABBY, $008, $0c0 ; MR__MIME
mon_cry CRY_CATERPIE, $000, $100 ; SCYTHER
mon_cry CRY_DROWZEE, $0ff, $17f ; JYNX
mon_cry CRY_VOLTORB, $08f, $17f ; ELECTABUZZ
mon_cry CRY_CHARMANDER, $0ff, $0b0 ; MAGMAR
mon_cry CRY_PIDGEOTTO, $000, $100 ; PINSIR
mon_cry CRY_SQUIRTLE, $011, $0c0 ; TAUROS
mon_cry CRY_EKANS, $080, $080 ; MAGIKARP
mon_cry CRY_EKANS, $000, $100 ; GYARADOS
mon_cry CRY_LAPRAS, $000, $100 ; LAPRAS
mon_cry CRY_PIDGEY, $0ff, $17f ; DITTO
mon_cry CRY_VENONAT, $088, $0e0 ; EEVEE
mon_cry CRY_VENONAT, $0aa, $17f ; VAPOREON
mon_cry CRY_VENONAT, $03d, $100 ; JOLTEON
mon_cry CRY_VENONAT, $010, $0a0 ; FLAREON
mon_cry CRY_WEEPINBELL, $0aa, $17f ; PORYGON
mon_cry CRY_GROWLITHE, $0f0, $081 ; OMANYTE
mon_cry CRY_GROWLITHE, $0ff, $0c0 ; OMASTAR
mon_cry CRY_CATERPIE, $0bb, $0c0 ; KABUTO
mon_cry CRY_FEAROW, $0ee, $081 ; KABUTOPS
mon_cry CRY_VILEPLUME, $020, $170 ; AERODACTYL
mon_cry CRY_GRIMER, $055, $081 ; SNORLAX
mon_cry CRY_RAICHU, $080, $0c0 ; ARTICUNO
mon_cry CRY_FEAROW, $0ff, $100 ; ZAPDOS
mon_cry CRY_RAICHU, $0f8, $0c0 ; MOLTRES
mon_cry CRY_BULBASAUR, $060, $0c0 ; DRATINI
mon_cry CRY_BULBASAUR, $040, $100 ; DRAGONAIR
mon_cry CRY_BULBASAUR, $03c, $140 ; DRAGONITE
mon_cry CRY_PARAS, $099, $17f ; MEWTWO
mon_cry CRY_PARAS, $0ee, $17f ; MEW
mon_cry CRY_CHIKORITA, -$010, $0b0 ; CHIKORITA
mon_cry CRY_CHIKORITA, -$022, $120 ; BAYLEEF
mon_cry CRY_CHIKORITA, -$0b7, $200 ; MEGANIUM
mon_cry CRY_CYNDAQUIL, $347, $080 ; CYNDAQUIL
mon_cry CRY_CYNDAQUIL, $321, $120 ; QUILAVA
mon_cry CRY_TYPHLOSION, $f00, $0d4 ; TYPHLOSION
mon_cry CRY_TOTODILE, $46c, $0e8 ; TOTODILE
mon_cry CRY_TOTODILE, $440, $110 ; CROCONAW
mon_cry CRY_TOTODILE, $3fc, $180 ; FERALIGATR
mon_cry CRY_SENTRET, $08a, $0b8 ; SENTRET
mon_cry CRY_SENTRET, $06b, $102 ; FURRET
mon_cry CRY_HOOTHOOT, $091, $0d8 ; HOOTHOOT
mon_cry CRY_HOOTHOOT, $000, $1a0 ; NOCTOWL
mon_cry CRY_LEDYBA, $000, $0de ; LEDYBA
mon_cry CRY_LEDYBA, -$096, $138 ; LEDIAN
mon_cry CRY_SPINARAK, $011, $200 ; SPINARAK
mon_cry CRY_SPINARAK, -$0ae, $1e2 ; ARIADOS
mon_cry CRY_SQUIRTLE, -$010, $140 ; CROBAT
mon_cry CRY_CYNDAQUIL, $3c9, $140 ; CHINCHOU
mon_cry CRY_CYNDAQUIL, $2d0, $110 ; LANTURN
mon_cry CRY_PICHU, $000, $140 ; PICHU
mon_cry CRY_CLEFFA, $061, $091 ; CLEFFA
mon_cry CRY_CHIKORITA, $0e8, $0e8 ; IGGLYBUFF
mon_cry CRY_TOGEPI, $010, $100 ; TOGEPI
mon_cry CRY_TOGETIC, $03b, $038 ; TOGETIC
mon_cry CRY_NATU, -$067, $100 ; NATU
mon_cry CRY_NATU, -$0a7, $168 ; XATU
mon_cry CRY_MAREEP, $022, $0d8 ; MAREEP
mon_cry CRY_MAREEP, -$007, $180 ; FLAAFFY
mon_cry CRY_AMPHAROS, -$07c, $0e8 ; AMPHAROS
mon_cry CRY_CLEFFA, $084, $150 ; BELLOSSOM
mon_cry CRY_MARILL, $11b, $120 ; MARILL
mon_cry CRY_MARILL, $0b6, $180 ; AZUMARILL
mon_cry CRY_CLEFFA, $f40, $180 ; SUDOWOODO
mon_cry CRY_CLEFFA, -$2a3, $1c8 ; POLITOED
mon_cry CRY_CLEFFA, $03b, $0c8 ; HOPPIP
mon_cry CRY_CLEFFA, $027, $138 ; SKIPLOOM
mon_cry CRY_CLEFFA, $000, $180 ; JUMPLUFF
mon_cry CRY_AIPOM, -$051, $0e8 ; AIPOM
mon_cry CRY_MARILL, $12b, $0b8 ; SUNKERN
mon_cry CRY_SUNFLORA, -$020, $180 ; SUNFLORA
mon_cry CRY_TOTODILE, $031, $0c8 ; YANMA
mon_cry CRY_WOOPER, $093, $0af ; WOOPER
mon_cry CRY_WOOPER, -$0c6, $140 ; QUAGSIRE
mon_cry CRY_AIPOM, $0a2, $140 ; ESPEON
mon_cry CRY_VENONAT, -$0e9, $0f0 ; UMBREON
mon_cry CRY_MARILL, -$01f, $180 ; MURKROW
mon_cry CRY_SLOWKING, $104, $200 ; SLOWKING
mon_cry CRY_HOOTHOOT, $130, $0e8 ; MISDREAVUS
mon_cry CRY_HOOTHOOT, $162, $100 ; UNOWN
mon_cry CRY_AMPHAROS, $27b, $144 ; WOBBUFFET
mon_cry CRY_GIRAFARIG, $041, $200 ; GIRAFARIG
mon_cry CRY_SLOWKING, $080, $100 ; PINECO
mon_cry CRY_SLOWKING, $000, $180 ; FORRETRESS
mon_cry CRY_DUNSPARCE, $1c4, $100 ; DUNSPARCE
mon_cry CRY_GLIGAR, -$102, $100 ; GLIGAR
mon_cry CRY_TYPHLOSION, $0ef, $0f7 ; STEELIX
mon_cry CRY_DUNSPARCE, $112, $0e8 ; SNUBBULL
mon_cry CRY_DUNSPARCE, $000, $180 ; GRANBULL
mon_cry CRY_SLOWKING, $160, $0e0 ; QWILFISH
mon_cry CRY_AMPHAROS, $000, $160 ; SCIZOR
mon_cry CRY_DUNSPARCE, $290, $0a8 ; SHUCKLE
mon_cry CRY_AMPHAROS, $035, $0e0 ; HERACROSS
mon_cry CRY_WOOPER, $053, $0af ; SNEASEL
mon_cry CRY_TEDDIURSA, $7a2, $06e ; TEDDIURSA
mon_cry CRY_TEDDIURSA, $640, $0d8 ; URSARING
mon_cry CRY_SLUGMA, -$1d8, $140 ; SLUGMA
mon_cry CRY_MAGCARGO, -$20d, $1c0 ; MAGCARGO
mon_cry CRY_CYNDAQUIL, $1fe, $140 ; SWINUB
mon_cry CRY_MAGCARGO, -$109, $100 ; PILOSWINE
mon_cry CRY_MAGCARGO, $0a1, $0e8 ; CORSOLA
mon_cry CRY_SUNFLORA, $00d, $100 ; REMORAID
mon_cry CRY_TOTODILE, $000, $180 ; OCTILLERY
mon_cry CRY_TEDDIURSA, $002, $06a ; DELIBIRD
mon_cry CRY_MANTINE, -$0be, $0f0 ; MANTINE
mon_cry CRY_AMPHAROS, $8a9, $180 ; SKARMORY
mon_cry CRY_CYNDAQUIL, $039, $140 ; HOUNDOUR
mon_cry CRY_TOTODILE, -$10a, $100 ; HOUNDOOM
mon_cry CRY_SLUGMA, $2fb, $100 ; KINGDRA
mon_cry CRY_SENTRET, $048, $230 ; PHANPY
mon_cry CRY_DONPHAN, $000, $1a0 ; DONPHAN
mon_cry CRY_GIRAFARIG, $073, $240 ; PORYGON2
mon_cry CRY_AIPOM, -$160, $180 ; STANTLER
mon_cry CRY_PICHU, -$21a, $1f0 ; SMEARGLE
mon_cry CRY_AIPOM, $02c, $108 ; TYROGUE
mon_cry CRY_SLUGMA, $000, $100 ; HITMONTOP
mon_cry CRY_MARILL, $068, $100 ; SMOOCHUM
mon_cry CRY_SUNFLORA, -$2d8, $0b4 ; ELEKID
mon_cry CRY_TEDDIURSA, $176, $03a ; MAGBY
mon_cry CRY_GLIGAR, -$1cd, $1a0 ; MILTANK
mon_cry CRY_SLOWKING, $293, $140 ; BLISSEY
mon_cry CRY_RAIKOU, $22e, $120 ; RAIKOU
mon_cry CRY_ENTEI, $000, $1a0 ; ENTEI
mon_cry CRY_MAGCARGO, $000, $180 ; SUICUNE
mon_cry CRY_RAIKOU, $05f, $0d0 ; LARVITAR
mon_cry CRY_SPINARAK, -$1db, $150 ; PUPITAR
mon_cry CRY_RAIKOU, -$100, $180 ; TYRANITAR
mon_cry CRY_TYPHLOSION, $000, $100 ; LUGIA
mon_cry CRY_AIPOM, $000, $180 ; HO_OH
mon_cry CRY_ENTEI, $14a, $111 ; CELEBI
mon_cry CRY_NIDORAN_M, 0, 0 ; 252
mon_cry CRY_NIDORAN_M, 0, 0 ; 253
mon_cry CRY_NIDORAN_M, 0, 0 ; 254
mon_cry CRY_NIDORAN_M, 0, 0 ; 255
mon_cry CRY_BULBASAUR, 128, 129 ; BULBASAUR
mon_cry CRY_BULBASAUR, 32, 256 ; IVYSAUR
mon_cry CRY_BULBASAUR, 0, 320 ; VENUSAUR
mon_cry CRY_CHARMANDER, 96, 192 ; CHARMANDER
mon_cry CRY_CHARMANDER, 32, 192 ; CHARMELEON
mon_cry CRY_CHARMANDER, 0, 256 ; CHARIZARD
mon_cry CRY_SQUIRTLE, 96, 192 ; SQUIRTLE
mon_cry CRY_SQUIRTLE, 32, 192 ; WARTORTLE
mon_cry CRY_BLASTOISE, 0, 256 ; BLASTOISE
mon_cry CRY_CATERPIE, 128, 160 ; CATERPIE
mon_cry CRY_METAPOD, 204, 129 ; METAPOD
mon_cry CRY_CATERPIE, 119, 192 ; BUTTERFREE
mon_cry CRY_WEEDLE, 238, 129 ; WEEDLE
mon_cry CRY_BLASTOISE, 255, 129 ; KAKUNA
mon_cry CRY_BLASTOISE, 96, 256 ; BEEDRILL
mon_cry CRY_PIDGEY, 223, 132 ; PIDGEY
mon_cry CRY_PIDGEOTTO, 40, 320 ; PIDGEOTTO
mon_cry CRY_PIDGEOTTO, 17, 383 ; PIDGEOT
mon_cry CRY_RATTATA, 0, 256 ; RATTATA
mon_cry CRY_RATTATA, 32, 383 ; RATICATE
mon_cry CRY_SPEAROW, 0, 256 ; SPEAROW
mon_cry CRY_FEAROW, 64, 288 ; FEAROW
mon_cry CRY_EKANS, 18, 192 ; EKANS
mon_cry CRY_EKANS, 224, 144 ; ARBOK
mon_cry CRY_BULBASAUR, 238, 129 ; PIKACHU
mon_cry CRY_RAICHU, 238, 136 ; RAICHU
mon_cry CRY_NIDORAN_M, 32, 192 ; SANDSHREW
mon_cry CRY_NIDORAN_M, 255, 383 ; SANDSLASH
mon_cry CRY_NIDORAN_F, 0, 256 ; NIDORAN_F
mon_cry CRY_NIDORAN_F, 44, 352 ; NIDORINA
mon_cry CRY_NIDOQUEEN, 0, 256 ; NIDOQUEEN
mon_cry CRY_NIDORAN_M, 0, 256 ; NIDORAN_M
mon_cry CRY_NIDORAN_M, 44, 320 ; NIDORINO
mon_cry CRY_RAICHU, 0, 256 ; NIDOKING
mon_cry CRY_CLEFAIRY, 204, 129 ; CLEFAIRY
mon_cry CRY_CLEFAIRY, 170, 160 ; CLEFABLE
mon_cry CRY_VULPIX, 79, 144 ; VULPIX
mon_cry CRY_VULPIX, 136, 224 ; NINETALES
mon_cry CRY_PIDGEY, 255, 181 ; JIGGLYPUFF
mon_cry CRY_PIDGEY, 104, 224 ; WIGGLYTUFF
mon_cry CRY_SQUIRTLE, 224, 256 ; ZUBAT
mon_cry CRY_SQUIRTLE, 250, 256 ; GOLBAT
mon_cry CRY_ODDISH, 221, 129 ; ODDISH
mon_cry CRY_ODDISH, 170, 192 ; GLOOM
mon_cry CRY_VILEPLUME, 34, 383 ; VILEPLUME
mon_cry CRY_PARAS, 32, 352 ; PARAS
mon_cry CRY_PARAS, 66, 383 ; PARASECT
mon_cry CRY_VENONAT, 68, 192 ; VENONAT
mon_cry CRY_VENONAT, 41, 256 ; VENOMOTH
mon_cry CRY_DIGLETT, 170, 129 ; DIGLETT
mon_cry CRY_DIGLETT, 42, 144 ; DUGTRIO
mon_cry CRY_CLEFAIRY, 119, 144 ; MEOWTH
mon_cry CRY_CLEFAIRY, 153, 383 ; PERSIAN
mon_cry CRY_PSYDUCK, 32, 224 ; PSYDUCK
mon_cry CRY_PSYDUCK, 255, 192 ; GOLDUCK
mon_cry CRY_NIDOQUEEN, 221, 224 ; MANKEY
mon_cry CRY_NIDOQUEEN, 175, 192 ; PRIMEAPE
mon_cry CRY_GROWLITHE, 32, 192 ; GROWLITHE
mon_cry CRY_WEEDLE, 0, 256 ; ARCANINE
mon_cry CRY_PIDGEY, 255, 383 ; POLIWAG
mon_cry CRY_PIDGEY, 119, 224 ; POLIWHIRL
mon_cry CRY_PIDGEY, 0, 383 ; POLIWRATH
mon_cry CRY_METAPOD, 192, 129 ; ABRA
mon_cry CRY_METAPOD, 168, 320 ; KADABRA
mon_cry CRY_METAPOD, 152, 383 ; ALAKAZAM
mon_cry CRY_GROWLITHE, 238, 129 ; MACHOP
mon_cry CRY_GROWLITHE, 72, 224 ; MACHOKE
mon_cry CRY_GROWLITHE, 8, 320 ; MACHAMP
mon_cry CRY_PSYDUCK, 85, 129 ; BELLSPROUT
mon_cry CRY_WEEPINBELL, 68, 160 ; WEEPINBELL
mon_cry CRY_WEEPINBELL, 102, 332 ; VICTREEBEL
mon_cry CRY_VENONAT, 0, 256 ; TENTACOOL
mon_cry CRY_VENONAT, 238, 383 ; TENTACRUEL
mon_cry CRY_VULPIX, 240, 144 ; GEODUDE
mon_cry CRY_VULPIX, 0, 256 ; GRAVELER
mon_cry CRY_GOLEM, 224, 192 ; GOLEM
mon_cry CRY_WEEPINBELL, 0, 256 ; PONYTA
mon_cry CRY_WEEPINBELL, 32, 320 ; RAPIDASH
mon_cry CRY_SLOWPOKE, 0, 256 ; SLOWPOKE
mon_cry CRY_GROWLITHE, 0, 256 ; SLOWBRO
mon_cry CRY_METAPOD, 128, 224 ; MAGNEMITE
mon_cry CRY_METAPOD, 32, 320 ; MAGNETON
mon_cry CRY_SPEAROW, 221, 129 ; FARFETCH_D
mon_cry CRY_DIGLETT, 187, 129 ; DODUO
mon_cry CRY_DIGLETT, 153, 160 ; DODRIO
mon_cry CRY_SEEL, 136, 320 ; SEEL
mon_cry CRY_SEEL, 35, 383 ; DEWGONG
mon_cry CRY_GRIMER, 0, 256 ; GRIMER
mon_cry CRY_MUK, 239, 383 ; MUK
mon_cry CRY_FEAROW, 0, 256 ; SHELLDER
mon_cry CRY_FEAROW, 111, 352 ; CLOYSTER
mon_cry CRY_METAPOD, 0, 256 ; GASTLY
mon_cry CRY_METAPOD, 48, 192 ; HAUNTER
mon_cry CRY_MUK, 0, 383 ; GENGAR
mon_cry CRY_EKANS, 255, 320 ; ONIX
mon_cry CRY_DROWZEE, 136, 160 ; DROWZEE
mon_cry CRY_DROWZEE, 238, 192 ; HYPNO
mon_cry CRY_KRABBY, 32, 352 ; KRABBY
mon_cry CRY_KRABBY, 238, 352 ; KINGLER
mon_cry CRY_VOLTORB, 237, 256 ; VOLTORB
mon_cry CRY_VOLTORB, 168, 272 ; ELECTRODE
mon_cry CRY_DIGLETT, 0, 256 ; EXEGGCUTE
mon_cry CRY_DROWZEE, 0, 256 ; EXEGGUTOR
mon_cry CRY_CLEFAIRY, 0, 256 ; CUBONE
mon_cry CRY_ODDISH, 79, 224 ; MAROWAK
mon_cry CRY_GOLEM, 128, 320 ; HITMONLEE
mon_cry CRY_SEEL, 238, 320 ; HITMONCHAN
mon_cry CRY_SEEL, 0, 256 ; LICKITUNG
mon_cry CRY_GOLEM, 230, 349 ; KOFFING
mon_cry CRY_GOLEM, 255, 383 ; WEEZING
mon_cry CRY_CHARMANDER, 0, 256 ; RHYHORN
mon_cry CRY_RHYDON, 0, 256 ; RHYDON
mon_cry CRY_PIDGEOTTO, 10, 320 ; CHANSEY
mon_cry CRY_GOLEM, 0, 256 ; TANGELA
mon_cry CRY_KANGASKHAN, 0, 256 ; KANGASKHAN
mon_cry CRY_CLEFAIRY, 153, 144 ; HORSEA
mon_cry CRY_CLEFAIRY, 60, 129 ; SEADRA
mon_cry CRY_CATERPIE, 128, 192 ; GOLDEEN
mon_cry CRY_CATERPIE, 16, 383 ; SEAKING
mon_cry CRY_PARAS, 2, 160 ; STARYU
mon_cry CRY_PARAS, 0, 256 ; STARMIE
mon_cry CRY_KRABBY, 8, 192 ; MR__MIME
mon_cry CRY_CATERPIE, 0, 256 ; SCYTHER
mon_cry CRY_DROWZEE, 255, 383 ; JYNX
mon_cry CRY_VOLTORB, 143, 383 ; ELECTABUZZ
mon_cry CRY_CHARMANDER, 255, 176 ; MAGMAR
mon_cry CRY_PIDGEOTTO, 0, 256 ; PINSIR
mon_cry CRY_SQUIRTLE, 17, 192 ; TAUROS
mon_cry CRY_EKANS, 128, 128 ; MAGIKARP
mon_cry CRY_EKANS, 0, 256 ; GYARADOS
mon_cry CRY_LAPRAS, 0, 256 ; LAPRAS
mon_cry CRY_PIDGEY, 255, 383 ; DITTO
mon_cry CRY_VENONAT, 136, 224 ; EEVEE
mon_cry CRY_VENONAT, 170, 383 ; VAPOREON
mon_cry CRY_VENONAT, 61, 256 ; JOLTEON
mon_cry CRY_VENONAT, 16, 160 ; FLAREON
mon_cry CRY_WEEPINBELL, 170, 383 ; PORYGON
mon_cry CRY_GROWLITHE, 240, 129 ; OMANYTE
mon_cry CRY_GROWLITHE, 255, 192 ; OMASTAR
mon_cry CRY_CATERPIE, 187, 192 ; KABUTO
mon_cry CRY_FEAROW, 238, 129 ; KABUTOPS
mon_cry CRY_VILEPLUME, 32, 368 ; AERODACTYL
mon_cry CRY_GRIMER, 85, 129 ; SNORLAX
mon_cry CRY_RAICHU, 128, 192 ; ARTICUNO
mon_cry CRY_FEAROW, 255, 256 ; ZAPDOS
mon_cry CRY_RAICHU, 248, 192 ; MOLTRES
mon_cry CRY_BULBASAUR, 96, 192 ; DRATINI
mon_cry CRY_BULBASAUR, 64, 256 ; DRAGONAIR
mon_cry CRY_BULBASAUR, 60, 320 ; DRAGONITE
mon_cry CRY_PARAS, 153, 383 ; MEWTWO
mon_cry CRY_PARAS, 238, 383 ; MEW
mon_cry CRY_CHIKORITA, -16, 176 ; CHIKORITA
mon_cry CRY_CHIKORITA, -34, 288 ; BAYLEEF
mon_cry CRY_CHIKORITA, -183, 512 ; MEGANIUM
mon_cry CRY_CYNDAQUIL, 839, 128 ; CYNDAQUIL
mon_cry CRY_CYNDAQUIL, 801, 288 ; QUILAVA
mon_cry CRY_TYPHLOSION, 3840, 212 ; TYPHLOSION
mon_cry CRY_TOTODILE, 1132, 232 ; TOTODILE
mon_cry CRY_TOTODILE, 1088, 272 ; CROCONAW
mon_cry CRY_TOTODILE, 1020, 384 ; FERALIGATR
mon_cry CRY_SENTRET, 138, 184 ; SENTRET
mon_cry CRY_SENTRET, 107, 258 ; FURRET
mon_cry CRY_HOOTHOOT, 145, 216 ; HOOTHOOT
mon_cry CRY_HOOTHOOT, 0, 416 ; NOCTOWL
mon_cry CRY_LEDYBA, 0, 222 ; LEDYBA
mon_cry CRY_LEDYBA, -150, 312 ; LEDIAN
mon_cry CRY_SPINARAK, 17, 512 ; SPINARAK
mon_cry CRY_SPINARAK, -174, 482 ; ARIADOS
mon_cry CRY_SQUIRTLE, -16, 320 ; CROBAT
mon_cry CRY_CYNDAQUIL, 969, 320 ; CHINCHOU
mon_cry CRY_CYNDAQUIL, 720, 272 ; LANTURN
mon_cry CRY_PICHU, 0, 320 ; PICHU
mon_cry CRY_CLEFFA, 97, 145 ; CLEFFA
mon_cry CRY_CHIKORITA, 232, 232 ; IGGLYBUFF
mon_cry CRY_TOGEPI, 16, 256 ; TOGEPI
mon_cry CRY_TOGETIC, 59, 56 ; TOGETIC
mon_cry CRY_NATU, -103, 256 ; NATU
mon_cry CRY_NATU, -167, 360 ; XATU
mon_cry CRY_MAREEP, 34, 216 ; MAREEP
mon_cry CRY_MAREEP, -7, 384 ; FLAAFFY
mon_cry CRY_AMPHAROS, -124, 232 ; AMPHAROS
mon_cry CRY_CLEFFA, 132, 336 ; BELLOSSOM
mon_cry CRY_MARILL, 283, 288 ; MARILL
mon_cry CRY_MARILL, 182, 384 ; AZUMARILL
mon_cry CRY_CLEFFA, 3904, 384 ; SUDOWOODO
mon_cry CRY_CLEFFA, -675, 456 ; POLITOED
mon_cry CRY_CLEFFA, 59, 200 ; HOPPIP
mon_cry CRY_CLEFFA, 39, 312 ; SKIPLOOM
mon_cry CRY_CLEFFA, 0, 384 ; JUMPLUFF
mon_cry CRY_AIPOM, -81, 232 ; AIPOM
mon_cry CRY_MARILL, 299, 184 ; SUNKERN
mon_cry CRY_SUNFLORA, -32, 384 ; SUNFLORA
mon_cry CRY_TOTODILE, 49, 200 ; YANMA
mon_cry CRY_WOOPER, 147, 175 ; WOOPER
mon_cry CRY_WOOPER, -198, 320 ; QUAGSIRE
mon_cry CRY_AIPOM, 162, 320 ; ESPEON
mon_cry CRY_VENONAT, -233, 240 ; UMBREON
mon_cry CRY_MARILL, -31, 384 ; MURKROW
mon_cry CRY_SLOWKING, 260, 512 ; SLOWKING
mon_cry CRY_HOOTHOOT, 304, 232 ; MISDREAVUS
mon_cry CRY_HOOTHOOT, 354, 256 ; UNOWN
mon_cry CRY_AMPHAROS, 635, 324 ; WOBBUFFET
mon_cry CRY_GIRAFARIG, 65, 512 ; GIRAFARIG
mon_cry CRY_SLOWKING, 128, 256 ; PINECO
mon_cry CRY_SLOWKING, 0, 384 ; FORRETRESS
mon_cry CRY_DUNSPARCE, 452, 256 ; DUNSPARCE
mon_cry CRY_GLIGAR, -258, 256 ; GLIGAR
mon_cry CRY_TYPHLOSION, 239, 247 ; STEELIX
mon_cry CRY_DUNSPARCE, 274, 232 ; SNUBBULL
mon_cry CRY_DUNSPARCE, 0, 384 ; GRANBULL
mon_cry CRY_SLOWKING, 352, 224 ; QWILFISH
mon_cry CRY_AMPHAROS, 0, 352 ; SCIZOR
mon_cry CRY_DUNSPARCE, 656, 168 ; SHUCKLE
mon_cry CRY_AMPHAROS, 53, 224 ; HERACROSS
mon_cry CRY_WOOPER, 83, 175 ; SNEASEL
mon_cry CRY_TEDDIURSA, 1954, 110 ; TEDDIURSA
mon_cry CRY_TEDDIURSA, 1600, 216 ; URSARING
mon_cry CRY_SLUGMA, -472, 320 ; SLUGMA
mon_cry CRY_MAGCARGO, -525, 448 ; MAGCARGO
mon_cry CRY_CYNDAQUIL, 510, 320 ; SWINUB
mon_cry CRY_MAGCARGO, -265, 256 ; PILOSWINE
mon_cry CRY_MAGCARGO, 161, 232 ; CORSOLA
mon_cry CRY_SUNFLORA, 13, 256 ; REMORAID
mon_cry CRY_TOTODILE, 0, 384 ; OCTILLERY
mon_cry CRY_TEDDIURSA, 2, 106 ; DELIBIRD
mon_cry CRY_MANTINE, -190, 240 ; MANTINE
mon_cry CRY_AMPHAROS, 2217, 384 ; SKARMORY
mon_cry CRY_CYNDAQUIL, 57, 320 ; HOUNDOUR
mon_cry CRY_TOTODILE, -266, 256 ; HOUNDOOM
mon_cry CRY_SLUGMA, 763, 256 ; KINGDRA
mon_cry CRY_SENTRET, 72, 560 ; PHANPY
mon_cry CRY_DONPHAN, 0, 416 ; DONPHAN
mon_cry CRY_GIRAFARIG, 115, 576 ; PORYGON2
mon_cry CRY_AIPOM, -352, 384 ; STANTLER
mon_cry CRY_PICHU, -538, 496 ; SMEARGLE
mon_cry CRY_AIPOM, 44, 264 ; TYROGUE
mon_cry CRY_SLUGMA, 0, 256 ; HITMONTOP
mon_cry CRY_MARILL, 104, 256 ; SMOOCHUM
mon_cry CRY_SUNFLORA, -728, 180 ; ELEKID
mon_cry CRY_TEDDIURSA, 374, 58 ; MAGBY
mon_cry CRY_GLIGAR, -461, 416 ; MILTANK
mon_cry CRY_SLOWKING, 659, 320 ; BLISSEY
mon_cry CRY_RAIKOU, 558, 288 ; RAIKOU
mon_cry CRY_ENTEI, 0, 416 ; ENTEI
mon_cry CRY_MAGCARGO, 0, 384 ; SUICUNE
mon_cry CRY_RAIKOU, 95, 208 ; LARVITAR
mon_cry CRY_SPINARAK, -475, 336 ; PUPITAR
mon_cry CRY_RAIKOU, -256, 384 ; TYRANITAR
mon_cry CRY_TYPHLOSION, 0, 256 ; LUGIA
mon_cry CRY_AIPOM, 0, 384 ; HO_OH
mon_cry CRY_ENTEI, 330, 273 ; CELEBI
mon_cry CRY_NIDORAN_M, 0, 0 ; 252
mon_cry CRY_NIDORAN_M, 0, 0 ; 253
mon_cry CRY_NIDORAN_M, 0, 0 ; 254
mon_cry CRY_NIDORAN_M, 0, 0 ; 255

4
data/text/common_1.asm
View File

@ -94,7 +94,7 @@ _GrewToLevelText::
text_decimal wCurPartyLevel, 1, 3
text "!@"
sound_dex_fanfare_50_79 ; plays SFX_DEX_FANFARE_50_79, identical to SFX_LEVEL_UP
text_waitbutton
text_promptbutton
text_end
text_end ; unused
@ -1343,7 +1343,7 @@ _ReceiveItemText::
text_ram wStringBuffer1
text "!@"
sound_item
text_waitbutton
text_promptbutton
text_end
text_end ; unused

8
data/text/common_2.asm
View File

@ -314,7 +314,7 @@ _CutNothingText::
_BlindingFlashText::
text "A blinding FLASH"
line "lights the area!@"
text_waitbutton
text_promptbutton
text_end
text_end ; unused
@ -794,7 +794,7 @@ _BreedEggHatchText::
text " came"
line "out of its EGG!@"
sound_caught_mon
text_waitbutton
text_promptbutton
text_end
text_end ; unused
@ -1055,7 +1055,7 @@ _KarpGuruRecordText::
text " caught by"
line "@"
text_ram wMagikarpRecordHoldersName
text_waitbutton
text_promptbutton
text_end
text_end ; unused
@ -1551,7 +1551,7 @@ _OakText2::
text_end
_OakText3::
text_waitbutton
text_promptbutton
text_end
text_end ; unused

8
data/text/common_3.asm
View File

@ -959,7 +959,7 @@ _LearnedMoveText::
text_ram wStringBuffer2
text "!@"
sound_dex_fanfare_50_79
text_waitbutton
text_promptbutton
text_end
text_end ; unused
@ -1244,7 +1244,7 @@ Text_BallCaught::
text_end ; unused
_WaitButtonText::
text_waitbutton
text_promptbutton
text_end
text_end ; unused
@ -1261,7 +1261,7 @@ _NewDexDataText::
line "was newly added to"
cont "the #DEX.@"
sound_slot_machine_start
text_waitbutton
text_promptbutton
text_end
text_end ; unused
@ -1308,7 +1308,7 @@ _FluteWakeUpText::
Text_PlayedPokeFlute::
text "<PLAYER> played the"
line "# FLUTE.@"
text_waitbutton
text_promptbutton
text_end
text_end ; unused

2
data/tilesets.asm
View File

@ -34,7 +34,7 @@ Tilesets::
tileset TilesetLighthouse
tileset TilesetPlayersRoom
tileset TilesetPokeComCenter
tileset TilesetBattleTower
tileset TilesetBattleTowerInside
tileset TilesetTower
tileset TilesetCave
tileset TilesetPark

0
data/tilesets/battle_tower_collision.asm → data/tilesets/battle_tower_inside_collision.asm
View File

0
data/tilesets/battle_tower_metatiles.bin → data/tilesets/battle_tower_inside_metatiles.bin
View File

11
docs/design_flaws.md
View File

@ -216,6 +216,17 @@ INCBIN "gfx/footprints/wartortle.1bpp"
Edit `Pokedex_LoadAnyFootprint`:
```diff
ld a, [wTempSpecies]
dec a
and %111
swap a ; * $10
+ add a, a
ld l, a
ld h, 0
add hl, de
ld de, Footprints
add hl, de
- push hl
ld e, l
ld d, h

2
docs/event_commands.md
View File

@ -298,7 +298,7 @@ If <code><i>item_id</i></code> = `USE_SCRIPT_VAR`, then it uses `[wScriptVar]` i
## `$54`: `waitbutton`
## `$55`: `buttonsound`
## `$55`: `promptbutton`
## `$56`: <code>pokepic <i>mon_id</i></code>

4
docs/text_commands.md
View File

@ -35,7 +35,7 @@ Draw a box.
Write text at (1, 16).
## `$06`: `text_waitbutton`
## `$06`: `text_promptbutton`
Wait for button press; show arrow.
@ -71,7 +71,7 @@ Play `SFX_DEX_FANFARE_50_79`.
Print *n* `"…"`s, pausing for 10 frames after each; interrupt if A or B is pressed.
## `$0D`: `text_linkwaitbutton`
## `$0D`: `text_linkpromptbutton`
Wait for button press; show arrow.

2
engine/events/diploma.asm
View File

@ -86,3 +86,5 @@ INCBIN "gfx/diploma/page1.tilemap"
DiplomaPage2Tilemap:
INCBIN "gfx/diploma/page2.tilemap"
ret ; unused

4
engine/events/fish.asm
View File

@ -1,7 +1,7 @@
Fish:
; Using a fishing rod.
; Fish for monsters with rod e in encounter group d.
; Return monster e at level d.
; Return monster d at level e.
push af
push bc
@ -23,7 +23,7 @@ endr
.Fish:
; Fish for monsters with rod b from encounter data in FishGroup at hl.
; Return monster e at level d.
; Return monster d at level e.
call Random
cp [hl]

6
engine/events/fruit_trees.asm
View File

@ -4,7 +4,7 @@ FruitTreeScript::
readmem wCurFruit
getitemname STRING_BUFFER_3, USE_SCRIPT_VAR
writetext FruitBearingTreeText
buttonsound
promptbutton
callasm TryResetFruitTrees
callasm CheckFruitTree
iffalse .fruit
@ -17,7 +17,7 @@ FruitTreeScript::
readmem wCurFruit
giveitem ITEM_FROM_MEM
iffalse .packisfull
buttonsound
promptbutton
writetext ObtainedFruitText
callasm PickedFruitTree
specialsound
@ -25,7 +25,7 @@ FruitTreeScript::
sjump .end
.packisfull
buttonsound
promptbutton
writetext FruitPackIsFullText
waitbutton

4
engine/events/magikarp.asm
View File

@ -89,12 +89,12 @@ PrintMagikarpLength:
call Magikarp_LoadFeetInchesChars
ld hl, wStringBuffer1
ld de, wMagikarpLength
lb bc, PRINTNUM_RIGHTALIGN | 1, 2
lb bc, PRINTNUM_LEFTALIGN | 1, 2
call PrintNum
ld [hl], "′"
inc hl
ld de, wMagikarpLength + 1
lb bc, PRINTNUM_RIGHTALIGN | 1, 2
lb bc, PRINTNUM_LEFTALIGN | 1, 2
call PrintNum
ld [hl], "″"
inc hl

2
engine/events/misc_scripts_2.asm
View File

@ -22,7 +22,7 @@ HiddenItemScript::
sjump .finish
.bag_full
buttonsound
promptbutton
writetext .ButNoSpaceText
waitbutton

2
engine/events/poke_seer.asm
View File

@ -164,7 +164,7 @@ GetCaughtLevel:
ld [wSeerCaughtLevel], a
ld hl, wSeerCaughtLevelString
ld de, wSeerCaughtLevel
lb bc, PRINTNUM_RIGHTALIGN | 1, 3
lb bc, PRINTNUM_LEFTALIGN | 1, 3
call PrintNum
ret

2
engine/events/prof_oaks_pc.asm
View File

@ -70,7 +70,7 @@ Rate:
ld bc, ITEM_NAME_LENGTH
call ByteFill
pop hl
lb bc, PRINTNUM_RIGHTALIGN | 1, 3
lb bc, PRINTNUM_LEFTALIGN | 1, 3
call PrintNum
ret

66
engine/events/std_scripts.asm
View File

@ -69,33 +69,33 @@ PokecenterNurseScript:
checkevent EVENT_WELCOMED_TO_POKECOM_CENTER
iftrue .morn_comcenter
farwritetext NurseMornText
buttonsound
promptbutton
sjump .ok
.morn_comcenter
farwritetext PokeComNurseMornText
buttonsound
promptbutton
sjump .ok
.day
checkevent EVENT_WELCOMED_TO_POKECOM_CENTER
iftrue .day_comcenter
farwritetext NurseDayText
buttonsound
promptbutton
sjump .ok
.day_comcenter
farwritetext PokeComNurseDayText
buttonsound
promptbutton
sjump .ok
.nite
checkevent EVENT_WELCOMED_TO_POKECOM_CENTER
iftrue .nite_comcenter
farwritetext NurseNiteText
buttonsound
promptbutton
sjump .ok
.nite_comcenter
farwritetext PokeComNurseNiteText
buttonsound
promptbutton
sjump .ok
.ok
@ -326,19 +326,19 @@ BugContestResultsScript:
ifequal 2, BugContestResults_SecondPlace
ifequal 3, BugContestResults_ThirdPlace
farwritetext ContestResults_ConsolationPrizeText
buttonsound
promptbutton
waitsfx
verbosegiveitem BERRY
iffalse BugContestResults_NoRoomForBerry
BugContestResults_DidNotWin:
farwritetext ContestResults_DidNotWinText
buttonsound
promptbutton
sjump BugContestResults_FinishUp
BugContestResults_ReturnAfterWinnersPrize:
farwritetext ContestResults_JoinUsNextTimeText
buttonsound
promptbutton
BugContestResults_FinishUp:
checkevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
@ -408,25 +408,25 @@ BugContestResults_ThirdPlace:
BugContestResults_NoRoomForSunStone:
farwritetext BugContestPrizeNoRoomText
buttonsound
promptbutton
setevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE
sjump BugContestResults_ReturnAfterWinnersPrize
BugContestResults_NoRoomForEverstone:
farwritetext BugContestPrizeNoRoomText
buttonsound
promptbutton
setevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE
sjump BugContestResults_ReturnAfterWinnersPrize
BugContestResults_NoRoomForGoldBerry:
farwritetext BugContestPrizeNoRoomText
buttonsound
promptbutton
setevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY
sjump BugContestResults_ReturnAfterWinnersPrize
BugContestResults_NoRoomForBerry:
farwritetext BugContestPrizeNoRoomText
buttonsound
promptbutton
setevent EVENT_CONTEST_OFFICER_HAS_BERRY
sjump BugContestResults_DidNotWin
@ -786,7 +786,7 @@ RegisteredNumberMScript:
farwritetext RegisteredNumber1Text
playsound SFX_REGISTER_PHONE_NUMBER
waitsfx
buttonsound
promptbutton
end
NumberAcceptedMScript:
@ -1279,31 +1279,31 @@ GiftMScript:
.Jose:
farwritetext JoseGiftText
buttonsound
promptbutton
end
.Wade:
farwritetext WadeGiftText
buttonsound
promptbutton
end
.Alan:
farwritetext AlanGiftText
buttonsound
promptbutton
end
.Derek:
farwritetext DerekGiftText
buttonsound
promptbutton
end
.Tully:
farwritetext TullyGiftText
buttonsound
promptbutton
end
.Wilton:
farwritetext WiltonGiftText
buttonsound
promptbutton
end
.Kenji:
farwritetext KenjiGiftText
buttonsound
promptbutton
end
PackFullMScript:
@ -1386,19 +1386,19 @@ RematchGiftMScript:
.Huey:
farwritetext HueyRematchGiftText
buttonsound
promptbutton
end
.Joey:
farwritetext JoeyRematchGiftText
buttonsound
promptbutton
end
.Vance:
farwritetext VanceRematchGiftText
buttonsound
promptbutton
end
.Parry:
farwritetext ParryRematchGiftText
buttonsound
promptbutton
end
AskNumber1FScript:
@ -1477,7 +1477,7 @@ RegisteredNumberFScript:
farwritetext RegisteredNumber2Text
playsound SFX_REGISTER_PHONE_NUMBER
waitsfx
buttonsound
promptbutton
end
NumberAcceptedFScript:
@ -1691,19 +1691,19 @@ GiftFScript:
.Beverly:
farwritetext BeverlyGiftText
buttonsound
promptbutton
end
.Gina:
farwritetext GinaGiftText
buttonsound
promptbutton
end
.Dana:
farwritetext DanaGiftText
buttonsound
promptbutton
end
.Tiffany:
farwritetext TiffanyGiftText
buttonsound
promptbutton
end
PackFullFScript:
@ -1747,7 +1747,7 @@ RematchGiftFScript:
.Erin:
opentext
farwritetext ErinRematchGiftText
buttonsound
promptbutton
end
GymStatue1Script:
@ -1762,7 +1762,7 @@ GymStatue2Script:
getcurlandmarkname STRING_BUFFER_3
opentext
farwritetext GymStatue_CityGymText
buttonsound
promptbutton
farwritetext GymStatue_WinningTrainersText
waitbutton
closetext
@ -1786,7 +1786,7 @@ GameCornerCoinVendorScript:
faceplayer
opentext
farwritetext CoinVendor_WelcomeText
buttonsound
promptbutton
checkitem COIN_CASE
iftrue CoinVendor_IntroScript
farwritetext CoinVendor_NoCoinCaseText

13
engine/gfx/color.asm
View File

@ -1075,21 +1075,21 @@ SGBBorder_MorePalPushing:
ld a, $e4
ldh [rBGP], a
ld de, vTiles1
ld bc, 20 tiles
ld bc, (6 + SCREEN_WIDTH + 6) * 5 * 2
call CopyData
ld b, 18
ld b, SCREEN_HEIGHT
.loop
push bc
ld bc, $c
ld bc, 6 * 2
call CopyData
ld bc, $28
ld bc, SCREEN_WIDTH * 2
call ClearBytes
ld bc, $c
ld bc, 6 * 2
call CopyData
pop bc
dec b
jr nz, .loop
ld bc, $140
ld bc, (6 + SCREEN_WIDTH + 6) * 5 * 2
call CopyData
ld bc, $100
call ClearBytes
@ -1195,6 +1195,7 @@ SGBBorderMap:
INCBIN "gfx/sgb/sgb_border.bin"
SGBBorderPalettes:
; assumed to come after SGBBorderMap
INCLUDE "gfx/sgb/sgb_border.pal"
SGBBorder:

2
engine/items/tmhm.asm
View File

@ -371,7 +371,7 @@ TMHM_DisplayPocketItems:
ld [hl], "H"
inc hl
ld de, wTempTMHM
lb bc, PRINTNUM_RIGHTALIGN | 1, 2
lb bc, PRINTNUM_LEFTALIGN | 1, 2
call PrintNum
pop af
ld [wTempTMHM], a

8
engine/link/link.asm
View File

@ -371,13 +371,13 @@ Gen2ToGen2LinkComms:
jr z, .next
sub $3
jr nc, .skip
farcall DeutenEnglischenPost
farcall ConvertEnglishMailToFrenchGerman
jr .next
.skip
cp $2
jr nc, .next
farcall HandleSpanishItalianMail
farcall ConvertEnglishMailToSpanishItalian
.next
pop de
@ -875,13 +875,13 @@ Link_PrepPartyData_Gen2:
jr z, .next
sub $3
jr nc, .italian_spanish
farcall HandleFrenchGermanMail
farcall ConvertFrenchGermanMailToEnglish
jr .next
.italian_spanish
cp $2
jr nc, .next
farcall HandleSpanishItalianMail
farcall ConvertSpanishItalianMailToEnglish
.next
pop de

2
engine/math/print_num.asm
View File

@ -6,7 +6,7 @@ _PrintNum::
; digits will be in front of the decimal point.
; Some extra flags can be given in bits 5-7 of b.
; Bit 5: money if set (unless left-aligned without leading zeros)
; Bit 6: right-aligned if set
; Bit 6: left-aligned if set
; Bit 7: print leading zeros if set
push bc

4
engine/menus/menu_2.asm
View File

@ -161,7 +161,7 @@ StartMenu_PrintBugContestStatus:
call PlaceString
hlcoord 8, 5
ld de, wParkBallsRemaining
lb bc, PRINTNUM_RIGHTALIGN | 1, 2
lb bc, PRINTNUM_LEFTALIGN | 1, 2
call PrintNum
hlcoord 1, 1
ld de, .CAUGHT
@ -187,7 +187,7 @@ StartMenu_PrintBugContestStatus:
ld l, c
inc hl
ld c, 3
call Print8BitNumRightAlign
call Print8BitNumLeftAlign
.skip_level
pop af

164
engine/movie/crystal_intro.asm
View File

@ -445,7 +445,7 @@ IntroScene1:
ldh [hBGMapMode], a
ld a, $1
ldh [rVBK], a
ld hl, IntroTilemap001
ld hl, IntroUnownAAttrmap
debgcoord 0, 0
call Intro_DecompressRequest2bpp_64Tiles
ld a, $0
@ -456,18 +456,18 @@ IntroScene1:
ld hl, IntroPulseGFX
ld de, vTiles0 tile $00
call Intro_DecompressRequest2bpp_128Tiles
ld hl, IntroTilemap002
ld hl, IntroUnownATilemap
debgcoord 0, 0
call Intro_DecompressRequest2bpp_64Tiles
ldh a, [rSVBK]
push af
ld a, BANK(wBGPals1)
ldh [rSVBK], a
ld hl, IntroPalette2
ld hl, IntroUnownsPalette
ld de, wBGPals1
ld bc, 16 palettes
call CopyBytes
ld hl, IntroPalette2
ld hl, IntroUnownsPalette
ld de, wBGPals2
ld bc, 16 palettes
call CopyBytes
@ -521,7 +521,7 @@ IntroScene3:
ldh [hBGMapMode], a
ld a, $1
ldh [rVBK], a
ld hl, IntroTilemap003
ld hl, IntroBackgroundAttrmap
debgcoord 0, 0
call Intro_DecompressRequest2bpp_64Tiles
ld a, $0
@ -529,18 +529,18 @@ IntroScene3:
ld hl, IntroBackgroundGFX
ld de, vTiles2 tile $00
call Intro_DecompressRequest2bpp_128Tiles
ld hl, IntroTilemap004
ld hl, IntroBackgroundTilemap
debgcoord 0, 0
call Intro_DecompressRequest2bpp_64Tiles
ldh a, [rSVBK]
push af
ld a, BANK(wBGPals1)
ldh [rSVBK], a
ld hl, IntroPalette1
ld hl, IntroBackgroundPalette
ld de, wBGPals1
ld bc, 16 palettes
call CopyBytes
ld hl, IntroPalette1
ld hl, IntroBackgroundPalette
ld de, wBGPals2
ld bc, 16 palettes
call CopyBytes
@ -584,7 +584,7 @@ IntroScene5:
ldh [hLCDCPointer], a
ld a, $1
ldh [rVBK], a
ld hl, IntroTilemap005
ld hl, IntroUnownHIAttrmap
debgcoord 0, 0
call Intro_DecompressRequest2bpp_64Tiles
ld a, $0
@ -595,18 +595,18 @@ IntroScene5:
ld hl, IntroPulseGFX
ld de, vTiles0 tile $00
call Intro_DecompressRequest2bpp_128Tiles
ld hl, IntroTilemap006
ld hl, IntroUnownHITilemap
debgcoord 0, 0
call Intro_DecompressRequest2bpp_64Tiles
ldh a, [rSVBK]
push af
ld a, BANK(wBGPals1)
ldh [rSVBK], a
ld hl, IntroPalette2
ld hl, IntroUnownsPalette
ld de, wBGPals1
ld bc, 16 palettes
call CopyBytes
ld hl, IntroPalette2
ld hl, IntroUnownsPalette
ld de, wBGPals2
ld bc, 16 palettes
call CopyBytes
@ -682,7 +682,7 @@ IntroScene7:
ld a, $1
ldh [rVBK], a
ld hl, IntroTilemap003
ld hl, IntroBackgroundAttrmap
debgcoord 0, 0
call Intro_DecompressRequest2bpp_64Tiles
@ -700,7 +700,7 @@ IntroScene7:
ld de, vTiles2 tile $00
call Intro_DecompressRequest2bpp_128Tiles
ld hl, IntroTilemap004
ld hl, IntroBackgroundTilemap
debgcoord 0, 0
call Intro_DecompressRequest2bpp_64Tiles
@ -709,12 +709,12 @@ IntroScene7:
ld a, BANK(wBGPals1)
ldh [rSVBK], a
ld hl, IntroPalette1
ld hl, IntroBackgroundPalette
ld de, wBGPals1
ld bc, 16 palettes
call CopyBytes
ld hl, IntroPalette1
ld hl, IntroBackgroundPalette
ld de, wBGPals2
ld bc, 16 palettes
call CopyBytes
@ -852,7 +852,7 @@ IntroScene11:
ldh [hLCDCPointer], a
ld a, $1
ldh [rVBK], a
ld hl, IntroTilemap007
ld hl, IntroUnownsAttrmap
debgcoord 0, 0
call Intro_DecompressRequest2bpp_64Tiles
ld a, $0
@ -860,18 +860,18 @@ IntroScene11:
ld hl, IntroUnownsGFX
ld de, vTiles2 tile $00
call Intro_DecompressRequest2bpp_128Tiles
ld hl, IntroTilemap008
ld hl, IntroUnownsTilemap
debgcoord 0, 0
call Intro_DecompressRequest2bpp_64Tiles
ldh a, [rSVBK]
push af
ld a, BANK(wBGPals1)
ldh [rSVBK], a
ld hl, IntroPalette2
ld hl, IntroUnownsPalette
ld de, wBGPals1
ld bc, 16 palettes
call CopyBytes
ld hl, IntroPalette2
ld hl, IntroUnownsPalette
ld de, wBGPals2
ld bc, 16 palettes
call CopyBytes
@ -975,7 +975,7 @@ IntroScene13:
ldh [hBGMapMode], a
ld a, $1
ldh [rVBK], a
ld hl, IntroTilemap003
ld hl, IntroBackgroundAttrmap
debgcoord 0, 0
call Intro_DecompressRequest2bpp_64Tiles
ld a, $0
@ -986,18 +986,18 @@ IntroScene13:
ld hl, IntroBackgroundGFX
ld de, vTiles2 tile $00
call Intro_DecompressRequest2bpp_128Tiles
ld hl, IntroTilemap004
ld hl, IntroBackgroundTilemap
debgcoord 0, 0
call Intro_DecompressRequest2bpp_64Tiles
ldh a, [rSVBK]
push af
ld a, BANK(wBGPals1)
ldh [rSVBK], a
ld hl, IntroPalette1
ld hl, IntroBackgroundPalette
ld de, wBGPals1
ld bc, 16 palettes
call CopyBytes
ld hl, IntroPalette1
ld hl, IntroBackgroundPalette
ld de, wBGPals2
ld bc, 16 palettes
call CopyBytes
@ -1079,7 +1079,7 @@ IntroScene15:
ldh [hBGMapMode], a
ld a, $1
ldh [rVBK], a
ld hl, IntroTilemap009
ld hl, IntroSuicuneJumpAttrmap
debgcoord 0, 0
call Intro_DecompressRequest2bpp_64Tiles
ld a, $0
@ -1094,7 +1094,7 @@ IntroScene15:
ld hl, vTiles1 tile $00
lb bc, BANK(IntroGrass4GFX), 1
call Request2bpp
ld hl, IntroTilemap010
ld hl, IntroSuicuneJumpTilemap
debgcoord 0, 0
call Intro_DecompressRequest2bpp_64Tiles
call Intro_LoadTilemap
@ -1102,11 +1102,11 @@ IntroScene15:
push af
ld a, BANK(wBGPals1)
ldh [rSVBK], a
ld hl, IntroPalette5
ld hl, IntroSuicunePalette
ld de, wBGPals1
ld bc, 16 palettes
call CopyBytes
ld hl, IntroPalette5
ld hl, IntroSuicunePalette
ld de, wBGPals2
ld bc, 16 palettes
call CopyBytes
@ -1161,7 +1161,7 @@ IntroScene17:
ldh [hBGMapMode], a
ld a, $1
ldh [rVBK], a
ld hl, IntroTilemap011
ld hl, IntroSuicuneCloseAttrmap
debgcoord 0, 0
call Intro_DecompressRequest2bpp_64Tiles
ld a, $0
@ -1169,18 +1169,18 @@ IntroScene17:
ld hl, IntroSuicuneCloseGFX
ld de, vTiles1 tile $00
call Intro_DecompressRequest2bpp_255Tiles
ld hl, IntroTilemap012
ld hl, IntroSuicuneCloseTilemap
debgcoord 0, 0
call Intro_DecompressRequest2bpp_64Tiles
ldh a, [rSVBK]
push af
ld a, BANK(wBGPals1)
ldh [rSVBK], a
ld hl, IntroPalette4
ld hl, IntroSuicuneClosePalette
ld de, wBGPals1
ld bc, 16 palettes
call CopyBytes
ld hl, IntroPalette4
ld hl, IntroSuicuneClosePalette
ld de, wBGPals2
ld bc, 16 palettes
call CopyBytes
@ -1227,7 +1227,7 @@ IntroScene19:
ldh [hBGMapMode], a
ld a, $1
ldh [rVBK], a
ld hl, IntroTilemap013
ld hl, IntroSuicuneBackAttrmap
debgcoord 0, 0
call Intro_DecompressRequest2bpp_64Tiles
ld a, $0
@ -1242,7 +1242,7 @@ IntroScene19:
ld hl, vTiles1 tile $7f
lb bc, BANK(IntroGrass4GFX), 1
call Request2bpp
ld hl, IntroTilemap014
ld hl, IntroSuicuneBackTilemap
debgcoord 0, 0
call Intro_DecompressRequest2bpp_64Tiles
call Intro_LoadTilemap
@ -1250,11 +1250,11 @@ IntroScene19:
push af
ld a, BANK(wBGPals1)
ldh [rSVBK], a
ld hl, IntroPalette5
ld hl, IntroSuicunePalette
ld de, wBGPals1
ld bc, 16 palettes
call CopyBytes
ld hl, IntroPalette5
ld hl, IntroSuicunePalette
ld de, wBGPals2
ld bc, 16 palettes
call CopyBytes
@ -1404,7 +1404,7 @@ IntroScene26:
ldh [hBGMapMode], a
ld a, $1
ldh [rVBK], a
ld hl, IntroTilemap015
ld hl, IntroCrystalUnownsAttrmap
debgcoord 0, 0
call Intro_DecompressRequest2bpp_64Tiles
ld a, $0
@ -1412,18 +1412,18 @@ IntroScene26:
ld hl, IntroCrystalUnownsGFX
ld de, vTiles2 tile $00
call Intro_DecompressRequest2bpp_128Tiles
ld hl, IntroTilemap017
ld hl, IntroCrystalUnownsTilemap
debgcoord 0, 0
call Intro_DecompressRequest2bpp_64Tiles
ldh a, [rSVBK]
push af
ld a, BANK(wBGPals1)
ldh [rSVBK], a
ld hl, IntroPalette3
ld hl, IntroCrystalUnownsPalette
ld de, wBGPals1
ld bc, 16 palettes
call CopyBytes
ld hl, IntroPalette3
ld hl, IntroCrystalUnownsPalette
ld de, wBGPals2
ld bc, 16 palettes
call CopyBytes
@ -2038,14 +2038,14 @@ INCBIN "gfx/intro/pichu_wooper.2bpp.lz"
IntroBackgroundGFX:
INCBIN "gfx/intro/background.2bpp.lz"
IntroTilemap004:
INCBIN "gfx/intro/004.tilemap.lz"
IntroBackgroundTilemap:
INCBIN "gfx/intro/background.tilemap.lz"
IntroTilemap003:
INCBIN "gfx/intro/003.tilemap.lz"
IntroBackgroundAttrmap:
INCBIN "gfx/intro/background.attrmap.lz"
IntroPalette1:
INCLUDE "gfx/intro/intro_1.pal"
IntroBackgroundPalette:
INCLUDE "gfx/intro/background.pal"
IntroUnownsGFX:
INCBIN "gfx/intro/unowns.2bpp.lz"
@ -2053,50 +2053,50 @@ INCBIN "gfx/intro/unowns.2bpp.lz"
IntroPulseGFX:
INCBIN "gfx/intro/pulse.2bpp.lz"
IntroTilemap002:
INCBIN "gfx/intro/002.tilemap.lz"
IntroUnownATilemap:
INCBIN "gfx/intro/unown_a.tilemap.lz"
IntroTilemap001:
INCBIN "gfx/intro/001.tilemap.lz"
IntroUnownAAttrmap:
INCBIN "gfx/intro/unown_a.attrmap.lz"
IntroTilemap006:
INCBIN "gfx/intro/006.tilemap.lz"
IntroUnownHITilemap:
INCBIN "gfx/intro/unown_hi.tilemap.lz"
IntroTilemap005:
INCBIN "gfx/intro/005.tilemap.lz"
IntroUnownHIAttrmap:
INCBIN "gfx/intro/unown_hi.attrmap.lz"
IntroTilemap008:
INCBIN "gfx/intro/008.tilemap.lz"
IntroUnownsTilemap:
INCBIN "gfx/intro/unowns.tilemap.lz"
IntroTilemap007:
INCBIN "gfx/intro/007.tilemap.lz"
IntroUnownsAttrmap:
INCBIN "gfx/intro/unowns.attrmap.lz"
IntroPalette2:
INCLUDE "gfx/intro/intro_2.pal"
IntroUnownsPalette:
INCLUDE "gfx/intro/unowns.pal"
IntroCrystalUnownsGFX:
INCBIN "gfx/intro/crystal_unowns.2bpp.lz"
IntroTilemap017:
INCBIN "gfx/intro/017.tilemap.lz"
IntroCrystalUnownsTilemap:
INCBIN "gfx/intro/crystal_unowns.tilemap.lz"
IntroTilemap015:
INCBIN "gfx/intro/015.tilemap.lz"
IntroCrystalUnownsAttrmap:
INCBIN "gfx/intro/crystal_unowns.attrmap.lz"
IntroPalette3:
INCLUDE "gfx/intro/intro_3.pal"
IntroCrystalUnownsPalette:
INCLUDE "gfx/intro/crystal_unowns.pal"
IntroSuicuneCloseGFX:
INCBIN "gfx/intro/suicune_close.2bpp.lz"
IntroTilemap012:
INCBIN "gfx/intro/012.tilemap.lz"
IntroSuicuneCloseTilemap:
INCBIN "gfx/intro/suicune_close.tilemap.lz"
IntroTilemap011:
INCBIN "gfx/intro/011.tilemap.lz"
IntroSuicuneCloseAttrmap:
INCBIN "gfx/intro/suicune_close.attrmap.lz"
IntroPalette4:
INCLUDE "gfx/intro/intro_4.pal"
IntroSuicuneClosePalette:
INCLUDE "gfx/intro/suicune_close.pal"
IntroSuicuneJumpGFX:
INCBIN "gfx/intro/suicune_jump.2bpp.lz"
@ -2104,20 +2104,20 @@ INCBIN "gfx/intro/suicune_jump.2bpp.lz"
IntroSuicuneBackGFX:
INCBIN "gfx/intro/suicune_back.2bpp.lz"
IntroTilemap010:
INCBIN "gfx/intro/010.tilemap.lz"
IntroSuicuneJumpTilemap:
INCBIN "gfx/intro/suicune_jump.tilemap.lz"
IntroTilemap009:
INCBIN "gfx/intro/009.tilemap.lz"
IntroSuicuneJumpAttrmap:
INCBIN "gfx/intro/suicune_jump.attrmap.lz"
IntroTilemap014:
INCBIN "gfx/intro/014.tilemap.lz"
IntroSuicuneBackTilemap:
INCBIN "gfx/intro/suicune_back.tilemap.lz"
IntroTilemap013:
INCBIN "gfx/intro/013.tilemap.lz"
IntroSuicuneBackAttrmap:
INCBIN "gfx/intro/suicune_back.attrmap.lz"
IntroPalette5:
INCLUDE "gfx/intro/intro_5.pal"
IntroSuicunePalette:
INCLUDE "gfx/intro/suicune.pal"
IntroUnownBackGFX:
INCBIN "gfx/intro/unown_back.2bpp.lz"

43
engine/overworld/events.asm
View File

@ -759,40 +759,41 @@ PlayerMovement:
ret
.pointers
dw .zero
dw .one
dw .two
dw .three
dw .four
dw .five
dw .six
dw .seven
; entries correspond to PLAYERMOVEMENT_* constants
dw .normal
dw .warp
dw .turn
dw .force_turn
dw .finish
dw .continue
dw .exit_water
dw .jump
.zero
.four
.normal:
.finish:
xor a
ld c, a
ret
.seven
.jump:
call ret_968d7 ; mobile
xor a
ld c, a
ret
.one
ld a, 5
.warp:
ld a, PLAYEREVENT_WARP
ld c, a
scf
ret
.two
ld a, 9
.turn:
ld a, PLAYEREVENT_JOYCHANGEFACING
ld c, a
scf
ret
.three
.force_turn:
; force the player to move in some direction
ld a, BANK(Script_ForcedMovement)
ld hl, Script_ForcedMovement
@ -802,8 +803,8 @@ PlayerMovement:
scf
ret
.five
.six
.continue:
.exit_water:
ld a, -1
ld c, a
and a
@ -923,13 +924,13 @@ CountStep:
ret
.hatch
ld a, 8
ld a, PLAYEREVENT_HATCH
scf
ret
; unused
.unreferenced
ld a, 7
ld a, PLAYEREVENT_WHITEOUT
scf
ret
@ -1626,7 +1627,7 @@ CmdQueue_StoneTable:
jr c, .fall_down_hole
.next
ld hl, OBJECT_STRUCT_LENGTH
ld hl, OBJECT_LENGTH
add hl, de
ld d, h
ld e, l

22
engine/overworld/map_objects.asm
View File

@ -10,7 +10,7 @@ DeleteMapObject::
push af
ld h, b
ld l, c
ld bc, OBJECT_STRUCT_LENGTH
ld bc, OBJECT_LENGTH
xor a
call ByteFill
pop af
@ -2082,11 +2082,11 @@ DespawnEmote:
jr z, .next
push bc
xor a
ld bc, OBJECT_STRUCT_LENGTH
ld bc, OBJECT_LENGTH
call ByteFill
pop bc
.next
ld hl, OBJECT_STRUCT_LENGTH
ld hl, OBJECT_LENGTH
add hl, de
ld d, h
ld e, l
@ -2149,7 +2149,7 @@ Function55e0::
jr z, .ok
call Function565c
.ok
ld hl, OBJECT_STRUCT_LENGTH
ld hl, OBJECT_LENGTH
add hl, bc
ld b, h
ld c, l
@ -2205,7 +2205,7 @@ Function5645:
.loop
ldh [hMapObjectIndexBuffer], a
call SetFacing_Standing
ld hl, OBJECT_STRUCT_LENGTH
ld hl, OBJECT_LENGTH
add hl, bc
ld b, h
ld c, l
@ -2421,7 +2421,7 @@ HandleNPCStep::
jr z, .next
call Function437b
.next
ld hl, OBJECT_STRUCT_LENGTH
ld hl, OBJECT_LENGTH
add hl, bc
ld b, h
ld c, l
@ -2582,7 +2582,7 @@ Function587a:
add hl, bc
set OBJ_FLAGS2_5, [hl]
.next
ld hl, OBJECT_STRUCT_LENGTH
ld hl, OBJECT_LENGTH
add hl, bc
ld b, h
ld c, l
@ -2625,7 +2625,7 @@ Function58b9::
add hl, bc
res OBJ_FLAGS2_5, [hl]
.next
ld hl, OBJECT_STRUCT_LENGTH
ld hl, OBJECT_LENGTH
add hl, bc
ld b, h
ld c, l
@ -2750,7 +2750,7 @@ ApplyBGMapAnchorToObjects:
add e
ld [hl], a
.skip
ld hl, OBJECT_STRUCT_LENGTH
ld hl, OBJECT_LENGTH
add hl, bc
ld b, h
ld c, l
@ -2809,7 +2809,7 @@ InitSprites:
jr .add
.skip
ld hl, OBJECT_STRUCT_LENGTH
ld hl, OBJECT_LENGTH
add hl, bc
ld b, h
ld c, l
@ -2817,7 +2817,7 @@ InitSprites:
jr .next
.add
ld hl, OBJECT_STRUCT_LENGTH
ld hl, OBJECT_LENGTH
add hl, bc
ld b, h
ld c, l

2
engine/overworld/map_objects_2.asm
View File

@ -19,7 +19,7 @@ LoadObjectMasks:
ld [de], a
inc de
pop bc
ld hl, OBJECT_LENGTH
ld hl, MAPOBJECT_LENGTH
add hl, bc
ld b, h
ld c, l

4
engine/overworld/npc_movement.asm
View File

@ -369,7 +369,7 @@ IsNPCAtCoord:
jr nz, .setcarry
.next
ld hl, OBJECT_STRUCT_LENGTH
ld hl, OBJECT_LENGTH
add hl, bc
ld b, h
ld c, l
@ -523,7 +523,7 @@ Unreferenced_Function7113:
jr .yes
.next
ld hl, OBJECT_STRUCT_LENGTH
ld hl, OBJECT_LENGTH
add hl, bc
ld b, h
ld c, l

2
engine/overworld/overworld.asm
View File

@ -109,7 +109,7 @@ AddIndoorSprites:
push af
ld a, [hl]
call AddSpriteGFX
ld de, OBJECT_LENGTH
ld de, MAPOBJECT_LENGTH
add hl, de
pop af
inc a

16
engine/overworld/player_movement.asm
View File

@ -120,7 +120,7 @@ DoPlayerMovement::
ld c, a
call CheckWhirlpoolTile
jr c, .not_whirlpool
ld a, 3
ld a, PLAYERMOVEMENT_FORCE_TURN
scf
ret
@ -222,7 +222,7 @@ DoPlayerMovement::
.continue_walk
ld a, STEP_WALK
call .DoStep
ld a, 5
ld a, PLAYERMOVEMENT_CONTINUE
scf
ret
@ -247,7 +247,7 @@ DoPlayerMovement::
ld a, STEP_TURN
call .DoStep
ld a, 2
ld a, PLAYERMOVEMENT_TURN
scf
ret
@ -345,7 +345,7 @@ DoPlayerMovement::
call PlayMapMusic
ld a, STEP_WALK
call .DoStep
ld a, 6
ld a, PLAYERMOVEMENT_EXIT_WATER
scf
ret
@ -374,7 +374,7 @@ DoPlayerMovement::
call PlaySFX
ld a, STEP_LEDGE
call .DoStep
ld a, 7
ld a, PLAYERMOVEMENT_JUMP
scf
ret
@ -428,11 +428,11 @@ DoPlayerMovement::
call .StandInPlace
scf
ld a, 1
ld a, PLAYERMOVEMENT_WARP
ret
.not_warp
xor a
xor a ; PLAYERMOVEMENT_NORMAL
ret
.EdgeWarps:
@ -465,7 +465,7 @@ DoPlayerMovement::
ld a, [hl]
ld [wPlayerTurningDirection], a
ld a, 4
ld a, PLAYERMOVEMENT_FINISH
ret
.Steps:

16
engine/overworld/player_object.asm
View File

@ -132,9 +132,9 @@ CopyObjectStruct::
and a
ret nz ; masked
ld hl, wObjectStructs + OBJECT_STRUCT_LENGTH * 1
ld hl, wObjectStructs + OBJECT_LENGTH * 1
ld a, 1
ld de, OBJECT_STRUCT_LENGTH
ld de, OBJECT_LENGTH
.loop
ldh [hObjectStructIndexBuffer], a
ld a, [hl]
@ -224,7 +224,7 @@ CopyMapObjectToObjectStruct:
ret
InitializeVisibleSprites:
ld bc, wMapObjects + OBJECT_LENGTH
ld bc, wMapObjects + MAPOBJECT_LENGTH
ld a, 1
.loop
ldh [hMapObjectIndexBuffer], a
@ -271,7 +271,7 @@ InitializeVisibleSprites:
jp c, .ret
.next
ld hl, OBJECT_LENGTH
ld hl, MAPOBJECT_LENGTH
add hl, bc
ld b, h
ld c, l
@ -311,7 +311,7 @@ CheckObjectEnteringVisibleRange::
ld d, a
ld a, [wXCoord]
ld e, a
ld bc, wMapObjects + OBJECT_LENGTH
ld bc, wMapObjects + MAPOBJECT_LENGTH
ld a, 1
.loop_v
ldh [hMapObjectIndexBuffer], a
@ -345,7 +345,7 @@ CheckObjectEnteringVisibleRange::
pop de
.next_v
ld hl, OBJECT_LENGTH
ld hl, MAPOBJECT_LENGTH
add hl, bc
ld b, h
ld c, l
@ -367,7 +367,7 @@ CheckObjectEnteringVisibleRange::
ld e, a
ld a, [wYCoord]
ld d, a
ld bc, wMapObjects + OBJECT_LENGTH
ld bc, wMapObjects + MAPOBJECT_LENGTH
ld a, 1
.loop_h
ldh [hMapObjectIndexBuffer], a
@ -401,7 +401,7 @@ CheckObjectEnteringVisibleRange::
pop de
.next_h
ld hl, OBJECT_LENGTH
ld hl, MAPOBJECT_LENGTH
add hl, bc
ld b, h
ld c, l

14
engine/overworld/scripting.asm
View File

@ -148,7 +148,7 @@ ScriptCommandTable:
dw Script_farjumptext ; 52
dw Script_jumptext ; 53
dw Script_waitbutton ; 54
dw Script_buttonsound ; 55
dw Script_promptbutton ; 55
dw Script_pokepic ; 56
dw Script_closepokepic ; 57
dw Script__2dmenu ; 58
@ -398,7 +398,7 @@ Script_waitbutton:
jp WaitButton
Script_buttonsound:
Script_promptbutton:
; script command 0x55
ldh a, [hOAMUpdate]
@ -406,7 +406,7 @@ Script_buttonsound:
ld a, $1
ldh [hOAMUpdate], a
call WaitBGMap
call ButtonSound
call PromptButton
pop af
ldh [hOAMUpdate], a
ret
@ -525,7 +525,7 @@ GiveItemScript:
end
.Full:
buttonsound
promptbutton
pocketisfull
end
@ -1952,7 +1952,7 @@ Script_getmoney:
call ResetStringBuffer1
call GetMoneyAccount
ld hl, wStringBuffer1
lb bc, PRINTNUM_RIGHTALIGN | 3, 6
lb bc, PRINTNUM_LEFTALIGN | 3, 6
call PrintNum
ld de, wStringBuffer1
jp GetStringBuffer
@ -1964,7 +1964,7 @@ Script_getcoins:
call ResetStringBuffer1
ld hl, wStringBuffer1
ld de, wCoins
lb bc, PRINTNUM_RIGHTALIGN | 2, 6
lb bc, PRINTNUM_LEFTALIGN | 2, 6
call PrintNum
ld de, wStringBuffer1
jp GetStringBuffer
@ -1976,7 +1976,7 @@ Script_getnum:
call ResetStringBuffer1
ld de, wScriptVar
ld hl, wStringBuffer1
lb bc, PRINTNUM_RIGHTALIGN | 1, 3
lb bc, PRINTNUM_LEFTALIGN | 1, 3
call PrintNum
ld de, wStringBuffer1
jp GetStringBuffer

8
engine/phone/scripts/bill.asm
View File

@ -4,22 +4,22 @@ BillPhoneCalleeScript:
checktime NITE
iftrue .nitegreet
farwritetext BillPhoneMornGreetingText
buttonsound
promptbutton
sjump .main
.daygreet
farwritetext BillPhoneDayGreetingText
buttonsound
promptbutton
sjump .main
.nitegreet
farwritetext BillPhoneNiteGreetingText
buttonsound
promptbutton
sjump .main
.main
farwritetext BillPhoneGenericText
buttonsound
promptbutton
readvar VAR_BOXSPACE
getnum STRING_BUFFER_3
ifequal 0, .full

20
engine/phone/scripts/brent_gossip.asm
View File

@ -13,50 +13,50 @@ BrentBillTriviaScript:
.Father:
farwritetext BrentFatherGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.Grandpa:
farwritetext BrentGrandpaGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.Goldenrod:
farwritetext BrentGoldenrodGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.Route25:
farwritetext BrentRoute25GossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.Abra:
farwritetext BrentAbraGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.Sister:
farwritetext BrentSisterGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.Milk:
farwritetext BrentMilkGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.Battling:
farwritetext BrentBattlingGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.FlowerShop:
farwritetext BrentFlowerShopGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.KimonoGirl:
farwritetext BrentKimonoGirlGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male

14
engine/phone/scripts/buena.asm
View File

@ -18,17 +18,17 @@ BuenaPhoneScript_CheckTimeOfDayCallee:
checktime DAY
iftrue .day
writetext BuenaPhoneNiteAnswerText
buttonsound
promptbutton
end
.morn
writetext BuenaPhoneMorningAnswerText
buttonsound
promptbutton
end
.day
writetext BuenaPhoneDayAnswerText
buttonsound
promptbutton
end
BuenaPhoneScript_AfterMidnightCallee:
@ -43,22 +43,22 @@ BuenaPhoneScript_CheckTimeOfDayCaller:
checktime DAY
iftrue .day
writetext BuenaPhoneNiteText
buttonsound
promptbutton
end
.morn
writetext BuenaPhoneMorningText
buttonsound
promptbutton
end
.day
writetext BuenaPhoneDayText
buttonsound
promptbutton
end
BuenaPhoneScript_AfterMidnightCaller:
writetext BuenaPhoneMidnightText
buttonsound
promptbutton
end
BuenaPhoneScript_Rocket:

20
engine/phone/scripts/chad_gossip.asm
View File

@ -13,50 +13,50 @@ ChadOakGossipScript:
.Blue:
farwritetext ChadBlueGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.Daisy:
farwritetext ChadDaisyGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.ProfElm:
farwritetext ChadProfElmGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.Dream:
farwritetext ChadProfOaksDreamGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.Kurt:
farwritetext ChadKurtGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.League:
farwritetext ChadLeagueGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.RadioShow:
farwritetext ChadPokemonTalkGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.Battling:
farwritetext ChadProfOakTrainerGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.DaisyTea:
farwritetext ChadDaisyTeaGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.Traveled:
farwritetext ChadProfOakTravelingGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male

392
engine/phone/scripts/generic_callee.asm
View File

File diff suppressed because it is too large Load Diff

216
engine/phone/scripts/generic_caller.asm
View File

@ -76,87 +76,87 @@ Phone_WhosBragging_Male:
.Jack:
farwritetext JackIntelligenceKeepsRisingText
buttonsound
promptbutton
end
.Gaven:
farwritetext GavenMonGreaterThanImaginedText
buttonsound
promptbutton
end
.Jose:
farwritetext JoseMonsStickHasADeliciousAromaText
buttonsound
promptbutton
end
.Joey:
farwritetext JoeyMonLookingSharperText
buttonsound
promptbutton
end
.Wade:
farwritetext WadeAreYourMonGrowingText
buttonsound
promptbutton
end
.Ralph:
farwritetext RalphNeglectingKidsText
buttonsound
promptbutton
end
.Anthony:
farwritetext AnthonyMonAteSomeBerriesText
buttonsound
promptbutton
end
.Todd:
farwritetext ToddLooksCuteLikeMeText
buttonsound
promptbutton
end
.Arnie:
farwritetext ArnieMonIsSoCuteText
buttonsound
promptbutton
end
.Alan:
farwritetext AlanGettingStrongerText
buttonsound
promptbutton
end
.Chad:
farwritetext ChadObservingWildText
buttonsound
promptbutton
end
.Derek:
farwritetext DerekCheekPinchingText
buttonsound
promptbutton
end
.Tully:
farwritetext TullyMonHasGrownText
buttonsound
promptbutton
end
.Brent:
farwritetext BrentRareTradeText
buttonsound
promptbutton
end
.Vance:
farwritetext VanceMonHasBecomeTougherText
buttonsound
promptbutton
end
.Wilton:
farwritetext WiltonMonHasGrownText
buttonsound
promptbutton
end
.Parry:
farwritetext ParryNothingCanMatchText
buttonsound
promptbutton
end
Phone_WhosBragging_Female:
@ -172,42 +172,42 @@ Phone_WhosBragging_Female:
.Beverly:
farwritetext BeverlyMadeMonEvenCuterText
buttonsound
promptbutton
end
.Beth:
farwritetext BethExhilaratingRideText
buttonsound
promptbutton
end
.Reena:
farwritetext ReenaMonsIsAPerfectMatchText
buttonsound
promptbutton
end
.Liz:
farwritetext LizMonAlwaysWantsToNuzzleText
buttonsound
promptbutton
end
.Gina:
farwritetext GinaGettingInSyncWithMonText
buttonsound
promptbutton
end
.Dana:
farwritetext DanaTakingPhotosText
buttonsound
promptbutton
end
.Tiffany:
farwritetext TiffanyMonIsAdorableText
buttonsound
promptbutton
end
.Erin:
farwritetext ErinMonIsMuchStrongerText
buttonsound
promptbutton
end
Phone_WhoDefeatedMon_Male:
@ -232,87 +232,87 @@ Phone_WhoDefeatedMon_Male:
.Jack:
farwritetext JackDefeatedMonText
buttonsound
promptbutton
end
.Gaven:
farwritetext GavenDefeatedMonText
buttonsound
promptbutton
end
.Jose:
farwritetext JoseDefeatedMonText
buttonsound
promptbutton
end
.Joey:
farwritetext JoeyDefeatedMonText
buttonsound
promptbutton
end
.Wade:
farwritetext WadeDefeatedMonText
buttonsound
promptbutton
end
.Ralph:
farwritetext RalphDefeatedMonText
buttonsound
promptbutton
end
.Anthony:
farwritetext AnthonyDefeatedMonText
buttonsound
promptbutton
end
.Todd:
farwritetext ToddDefeatedMonText
buttonsound
promptbutton
end
.Arnie:
farwritetext ArnieDefeatedMonText
buttonsound
promptbutton
end
.Alan:
farwritetext AlanDefeatedMonText
buttonsound
promptbutton
end
.Chad:
farwritetext ChadDefeatedMonText
buttonsound
promptbutton
end
.Derek:
farwritetext DerekDefeatedMonText
buttonsound
promptbutton
end
.Tully:
farwritetext TullyDefeatedMonText
buttonsound
promptbutton
end
.Brent:
farwritetext BrentDefeatedMonText
buttonsound
promptbutton
end
.Vance:
farwritetext VanceDefeatedMonText
buttonsound
promptbutton
end
.Wilton:
farwritetext WiltonDefeatedMonText
buttonsound
promptbutton
end
.Parry:
farwritetext ParryDefeatedMonText
buttonsound
promptbutton
end
Phone_WhoDefeatedMon_Female:
@ -328,42 +328,42 @@ Phone_WhoDefeatedMon_Female:
.Beverly:
farwritetext BeverlyDefeatedMonText
buttonsound
promptbutton
end
.Beth:
farwritetext BethDefeatedMonText
buttonsound
promptbutton
end
.Reena:
farwritetext ReenaDefeatedMonText
buttonsound
promptbutton
end
.Liz:
farwritetext LizDefeatedMonText
buttonsound
promptbutton
end
.Gina:
farwritetext GinaDefeatedMonText
buttonsound
promptbutton
end
.Dana:
farwritetext DanaDefeatedMonText
buttonsound
promptbutton
end
.Tiffany:
farwritetext TiffanyDefeatedMonText
buttonsound
promptbutton
end
.Erin:
farwritetext ErinDefeatedMonText
buttonsound
promptbutton
end
Phone_WhoLostAMon_Male:
@ -388,87 +388,87 @@ Phone_WhoLostAMon_Male:
.Jack:
farwritetext JackLostAMonText
buttonsound
promptbutton
end
.Gaven:
farwritetext GavenLostAMonText
buttonsound
promptbutton
end
.Jose:
farwritetext JoseLostAMonText
buttonsound
promptbutton
end
.Joey:
farwritetext JoeyLostAMonText
buttonsound
promptbutton
end
.Wade:
farwritetext WadeLostAMonText
buttonsound
promptbutton
end
.Ralph:
farwritetext RalphLostAMonText
buttonsound
promptbutton
end
.Anthony:
farwritetext AnthonyLostAMonText
buttonsound
promptbutton
end
.Todd:
farwritetext ToddLostAMonText
buttonsound
promptbutton
end
.Arnie:
farwritetext ArnieLostAMonText
buttonsound
promptbutton
end
.Alan:
farwritetext AlanLostAMonText
buttonsound
promptbutton
end
.Chad:
farwritetext ChadLostAMonText
buttonsound
promptbutton
end
.Derek:
farwritetext DerekLostAMonText
buttonsound
promptbutton
end
.Tully:
farwritetext TullyLostAMonText
buttonsound
promptbutton
end
.Brent:
farwritetext BrentLostAMonText
buttonsound
promptbutton
end
.Vance:
farwritetext VanceLostAMonText
buttonsound
promptbutton
end
.Wilton:
farwritetext WiltonLostAMonText
buttonsound
promptbutton
end
.Parry:
farwritetext ParryLostAMonText
buttonsound
promptbutton
end
Phone_WhoLostAMon_Female:
@ -484,42 +484,42 @@ Phone_WhoLostAMon_Female:
.Beverly:
farwritetext BeverlyLostAMonText
buttonsound
promptbutton
end
.Beth:
farwritetext BethLostAMonText
buttonsound
promptbutton
end
.Reena:
farwritetext ReenaLostAMonText
buttonsound
promptbutton
end
.Liz:
farwritetext LizLostAMonText
buttonsound
promptbutton
end
.Gina:
farwritetext GinaLostAMonText
buttonsound
promptbutton
end
.Dana:
farwritetext DanaLostAMonText
buttonsound
promptbutton
end
.Tiffany:
farwritetext TiffanyLostAMonText
buttonsound
promptbutton
end
.Erin:
farwritetext ErinLostAMonText
buttonsound
promptbutton
end
PhoneScript_WantsToBattle_Male:
@ -552,87 +552,87 @@ PhoneScript_RematchText_Male:
.Jack:
farwritetext JackBattleRematchText
buttonsound
promptbutton
end
.Huey:
farwritetext HueyBattleRematchText
buttonsound
promptbutton
end
.Gaven:
farwritetext GavenBattleRematchText
buttonsound
promptbutton
end
.Jose:
farwritetext JoseBattleRematchText
buttonsound
promptbutton
end
.Joey:
farwritetext JoeyBattleRematchText
buttonsound
promptbutton
end
.Wade:
farwritetext WadeBattleRematchText
buttonsound
promptbutton
end
.Ralph:
farwritetext RalphBattleRematchText
buttonsound
promptbutton
end
.Anthony:
farwritetext AnthonyBattleRematchText
buttonsound
promptbutton
end
.Todd:
farwritetext ToddBattleRematchText
buttonsound
promptbutton
end
.Arnie:
farwritetext ArnieBattleRematchText
buttonsound
promptbutton
end
.Alan:
farwritetext AlanBattleRematchText
buttonsound
promptbutton
end
.Chad:
farwritetext ChadBattleRematchText
buttonsound
promptbutton
end
.Tully:
farwritetext TullyBattleRematchText
buttonsound
promptbutton
end
.Brent:
farwritetext BrentBattleRematchText
buttonsound
promptbutton
end
.Vance:
farwritetext VanceBattleRematchText
buttonsound
promptbutton
end
.Wilton:
farwritetext WiltonBattleRematchText
buttonsound
promptbutton
end
.Parry:
farwritetext ParryBattleRematchText
buttonsound
promptbutton
end
PhoneScript_RematchText_Female:
@ -647,37 +647,37 @@ PhoneScript_RematchText_Female:
.Beth:
farwritetext BethBattleRematchText
buttonsound
promptbutton
end
.Reena:
farwritetext ReenaBattleRematchText
buttonsound
promptbutton
end
.Liz:
farwritetext LizBattleRematchText
buttonsound
promptbutton
end
.Gina:
farwritetext GinaBattleRematchText
buttonsound
promptbutton
end
.Dana:
farwritetext DanaBattleRematchText
buttonsound
promptbutton
end
.Tiffany:
farwritetext TiffanyBattleRematchText
buttonsound
promptbutton
end
.Erin:
farwritetext ErinBattleRematchText
buttonsound
promptbutton
end
LizWrongNumberScript:
@ -861,37 +861,37 @@ PhoneScript_BugCatchingContest:
.Wade:
farwritetext WadeBugCatchingContestText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.Derek:
farwritetext DerekBugCatchingContestText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
IrwinRocketRumorScript:
farwritetext IrwinRocketTakeoverRumorText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
GinaRocketRumorScript:
farwritetext GinaRocketTakeoverRumorText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Female
ArnieSwarmScript:
farwritetext ArnieSwarmText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
RalphItemScript:
farwritetext RalphItemText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
AnthonySwarmScript:
farwritetext AnthonySwarmText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
PhoneScript_FoundItem_Male:
@ -952,10 +952,10 @@ PhoneScript_FoundItem_Female:
ToddItemScript:
farwritetext ToddDepartmentStoreBargainSaleText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
KenjiCallingPhoneScript:
farwritetext KenjiRemainDedicatedText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male

68
engine/phone/scripts/hangups.asm
View File

@ -1,131 +1,131 @@
JackPhoneTipsScript:
farwritetext JackHeardSomeGreatTipsText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
BeverlyHangUpScript:
farwritetext BeverlyLetsChatAboutMonAgainText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Female
HueyHangUpScript:
farwritetext HueyWeHaveToBattleAgainSometimeText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
GavenHangUpNotThursdayScript:
farwritetext GavenHangUpNotThursdayText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
BethHangUpScript:
farwritetext BethLetsBattleAgainSometimeText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Female
JoseHangUpScript:
farwritetext JoseHaventGottenItemYetText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
ReenaForwardScript:
farwritetext ReenaForwardText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Female
JoeyHangUpScript:
farwritetext JoeyDevisingStrategiesText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
WadeNoBerriesScript:
farwritetext WadeNoBerriesText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
RalphNoItemScript:
farwritetext RalphNoItemText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
LizHangUpScript:
farwritetext LizFawningOverMonText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Female
AnthonyHangUpScript:
farwritetext AnthonyWasntPayingAttentionText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
ToddNoItemScript:
farwritetext ToddSavingUpForBargainSaleText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
GinaHangUpScript:
farwritetext GinaHaventFoundAnythingYetText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Female
ArnieHangUpScript:
farwritetext ArnieHaventSeenRareMonText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
AlanHangUpScript:
farwritetext AlanHaventPickedUpAnythingText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
DanaHangUpScript:
farwritetext DanaCanYouWaitABitLongerText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Female
ChadHangUpScript:
farwritetext ChadGoingToStudyHardText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
DerekHangUpScript:
farwritetext DerekLetsGetTogetherText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
TullyNoItemScript:
farwritetext TullyNoItemText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
BrentHangUpScript:
farwritetext BrentSorryImTooBusyText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
TiffanyNoItemScript:
farwritetext TiffanyNoItemText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Female
VanceLookingForwardScript:
farwritetext VanceLookingForwardText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
WiltonHaventFoundAnythingScript:
farwritetext WiltonHaventFoundAnythingText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
ParryBattleWithMeScript:
farwritetext ParryBattleWithMeText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
ErinWorkingHardScript:
farwritetext ErinWorkingHardText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Female
IrwinRandomTextScript:
@ -136,17 +136,17 @@ IrwinRandomTextScript:
IrwinEscapadeScript:
farwritetext IrwinYourEscapadesRockText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
IrwinGoodMatchScript:
farwritetext IrwinGoodMatchText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
IrwinSoMuchToChatAboutScript:
farwritetext IrwinSoMuchToChatAboutText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
KenjiAnswerPhoneScript:
@ -154,12 +154,12 @@ KenjiAnswerPhoneScript:
ifequal 2, .Training
ifequal 1, .OnBreak
farwritetext KenjiCallMeBackAnotherTimeText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.Training:
farwritetext KenjiIllHaveTimeToChatTomorrowText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.OnBreak:
@ -169,15 +169,15 @@ KenjiAnswerPhoneScript:
iftrue .Night
setevent EVENT_KENJI_ON_BREAK
farwritetext KenjiTakingABreakText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.Morning:
farwritetext KenjiHangUpMorningText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.Night:
farwritetext KenjiHangUpNightText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male

20
engine/phone/scripts/hangups_2.asm
View File

@ -1,49 +1,49 @@
BeverlyComePickUpScript:
farwritetext BeverlyComePickUpText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Female
JoseComePickUpScript:
farwritetext JoseComePickUpText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
WadeComeQuickScript:
farwritetext WadeComeQuickText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
GinaComePickUpScript:
farwritetext GinaComePickUpText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Female
AlanComePickUpScript:
farwritetext AlanComePickUpGiftText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
DanaComePickUpScript:
farwritetext DanaComePickUpText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Female
DerekComePickUpScript:
farwritetext DerekComePickUpText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
TullyHurryScript:
farwritetext TullyHurryText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
TiffanyHurryScript:
farwritetext TiffanyHurryText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Female
WiltonWantThisScript:
farwritetext WiltonWantThisText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male

26
engine/phone/scripts/irwin_gossip.asm
View File

@ -24,65 +24,65 @@ IrwinRumorScript:
checkflag ENGINE_PLAINBADGE
iftrue .PlainBadge
farwritetext IrwinCalledRightAwayText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.PlainBadge:
farwritetext IrwinPlainBadgeGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.JasmineReturned:
farwritetext IrwinJasmineReturnedGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.RocketHideout:
farwritetext IrwinRocketHideoutGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.RadioTower:
farwritetext IrwinRadioTowerGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.RisingBadge:
farwritetext IrwinRisingBadgeGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.EliteFour:
farwritetext IrwinEliteFourGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.VermilionCity:
farwritetext IrwinVermilionCityGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.TrainPass:
farwritetext IrwinTrainPassGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.Snorlax:
farwritetext IrwinSnorlaxGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.MtSilver:
farwritetext IrwinMtSilverGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.FogBadge:
farwritetext IrwinFogBadgeGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.MarshBadge:
farwritetext IrwinMarshBadgeGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male

22
engine/phone/scripts/jack_gossip.asm
View File

@ -14,55 +14,55 @@ JackTriviaScript:
.Thunder:
farwritetext JackThunderTriviaText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.Rollout:
farwritetext JackRolloutTriviaText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.Solarbeam:
farwritetext JackSolarbeamTriviaText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.Stomp:
farwritetext JackStompTriviaText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.Gust:
farwritetext JackGustTriviaText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.Twister:
farwritetext JackTwisterTriviaText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.Earthquake:
farwritetext JackEarthquakeTriviaText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.Magnitude:
farwritetext JackMagnitudeTriviaText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.Sandstorm:
farwritetext JackSandstormTriviaText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.SunnyDay:
farwritetext JackSunnyDayTriviaText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male
.RainDance:
farwritetext JackRainDanceTriviaText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Male

20
engine/phone/scripts/liz_gossip.asm
View File

@ -13,50 +13,50 @@ LizGossipRandomScript:
.RuinsOfAlph:
farwritetext LizRuinsOfAlphGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Female
.Falkner:
farwritetext LizFalknerGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Female
.Earl:
farwritetext LizEarlGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Female
.SurfPikachu:
farwritetext LizSurfPikachuGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Female
.MooMooMilk:
farwritetext LizMooMooMilkGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Female
.Salon:
farwritetext LizSalonGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Female
.Whitney:
farwritetext LizWhitneyGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Female
.BugCatchingContest:
farwritetext LizBugCatchingContestGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Female
.BeautifulMon:
farwritetext LizBeautifulMonGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Female
.Forgot:
farwritetext LizForgotGossipText
buttonsound
promptbutton
sjump PhoneScript_HangUpText_Female

18
engine/phone/scripts/mom.asm
View File

@ -13,7 +13,7 @@ MomPhoneCalleeScript:
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8
iftrue MomPhoneHangUpScript
farwritetext MomPhoneGreetingText
buttonsound
promptbutton
getcurlandmarkname STRING_BUFFER_3
readvar VAR_ROOFPALETTE
ifequal 1, MomPhonePalette1
@ -22,7 +22,7 @@ MomPhoneCalleeScript:
MomPhoneLandmark:
farwritetext MomPhoneLandmarkText
buttonsound
promptbutton
sjump MomSavingMoney
MomPhonePalette1:
@ -33,17 +33,17 @@ MomPhonePalette1:
ifequal GROUP_AZALEA_TOWN, .azalea
ifequal GROUP_GOLDENROD_CITY, .goldenrod
farwritetext MomPhoneGenericAreaText
buttonsound
promptbutton
sjump MomSavingMoney
.newbark
farwritetext MomPhoneNewBarkText
buttonsound
promptbutton
sjump MomSavingMoney
.cherrygrove
farwritetext MomPhoneCherrygroveText
buttonsound
promptbutton
sjump MomSavingMoney
.violet
@ -58,12 +58,12 @@ MomPhonePalette1:
MomPhonePalette2:
farwritetext MomOtherAreaText
buttonsound
promptbutton
sjump MomSavingMoney
MomPhoneOther:
farwritetext MomDeterminedText
buttonsound
promptbutton
sjump MomSavingMoney
MomSavingMoney:
@ -107,13 +107,13 @@ MomSavingMoney:
MomPhoneSaveMoneyScript:
setflag ENGINE_MOM_SAVING_MONEY
farwritetext MomOKIllSaveText
buttonsound
promptbutton
sjump MomPhoneHangUpScript
MomPhoneWontSaveMoneyScript:
clearflag ENGINE_MOM_SAVING_MONEY
farwritetext MomPhoneWontSaveMoneyText
buttonsound
promptbutton
sjump MomPhoneHangUpScript
MomPhoneHangUpScript:

4
engine/pokemon/breeding.asm
View File

@ -869,7 +869,7 @@ DayCareMon1:
ld a, [wDayCareLady]
bit DAYCARELADY_HAS_MON_F, a
jr z, DayCareMonCursor
call ButtonSound
call PromptButton
ld hl, wBreedMon2Nick
call DayCareMonCompatibilityText
jp PrintText
@ -882,7 +882,7 @@ DayCareMon2:
ld a, [wDayCareMan]
bit DAYCAREMAN_HAS_MON_F, a
jr z, DayCareMonCursor
call ButtonSound
call PromptButton
ld hl, wBreedMon1Nick
call DayCareMonCompatibilityText
jp PrintText

34
engine/pokemon/european_mail.asm
View File

@ -38,15 +38,15 @@ INCBIN "gfx/font/french_german.1bpp"
SpanishItalianFont:
INCBIN "gfx/font/spanish_italian.1bpp"
HandleFrenchGermanMail:
; called if mail is french or german
; fix 's 't 'v
ConvertFrenchGermanMailToEnglish:
; Called if mail is French or German
; Converts 's 't 'v from French/German character set to English
ld b, sPartyMon1MailAuthor - sPartyMon1Mail
ld h, d
ld l, e
.loop
ld a, [hl]
cp $dc ; 's in french/german font
cp $dc ; 's in French/German font
jr nz, .check_intermediate_chars
ld a, "'s"
jr .replace
@ -67,12 +67,9 @@ HandleFrenchGermanMail:
jr nz, .loop
ret
LireLeCourrierAnglais:
DeutenEnglischenPost:
; Cette fonction convertit certains des caractères anglais pour
; leur équivalent dans le jeu de caractères français.
; Diese Funktion wandelt bestimmte englische Zeichen, um ihre
; Entsprechung in der Deutschen-Zeichensatz.
ConvertEnglishMailToFrenchGerman:
; Called if mail is English and game is French or German
; Converts 's 't 'v from English character set to French/German
ld b, sPartyMon1MailAuthor - sPartyMon1Mail
ld h, d
ld l, e
@ -80,7 +77,7 @@ DeutenEnglischenPost:
ld a, [hl]
cp "'s"
jr nz, .check_intermediate_chars
ld a, $dc
ld a, $dc ; 's in French/German font
jr .replace
.check_intermediate_chars
@ -99,15 +96,12 @@ DeutenEnglischenPost:
jr nz, .loop
ret
HandleSpanishItalianMail:
LeerCorreosIngleses:
LeggiPostaInglese:
; This function converts certain characters between
; the English and Spanish/Italian character sets.
; Esta función convierte ciertos caracteres entre
; el juego de caracteres Inglés y Español.
; Questa funzione converte alcuni caratteri tra
; l'inglese e il set di caratteri italiani.
ConvertSpanishItalianMailToEnglish:
; Called if mail is Spanish or Italian
; Converts 'd 'l 'm 'r 's 't 'v from Spanish/Italian character set to English
ConvertEnglishMailToSpanishItalian:
; Called if mail is English and game is Spanish or Italian
; Converts 'd 'l 'm 'r 's 't 'v from English character set to Spanish/Italian
ld b, sPartyMon1MailAuthor - sPartyMon1Mail
ld h, d
ld l, e

12
engine/pokemon/mon_menu.asm
View File

@ -877,7 +877,7 @@ MoveScreenLoop:
inc a
ld [wPartyMenuCursor], a
call SetUpMoveScreenBG
call Function132d3
call PlaceMoveScreenArrows
ld de, MoveScreenAttributes
call SetMenuAttributes
.loop
@ -1228,12 +1228,12 @@ String_MoveAtk:
String_MoveNoPower:
db "---@"
Function132d3:
call Function132da
call Function132fe
PlaceMoveScreenArrows:
call PlaceMoveScreenLeftArrow
call PlaceMoveScreenRightArrow
ret
Function132da:
PlaceMoveScreenLeftArrow:
ld a, [wCurPartyMon]
and a
ret z
@ -1262,7 +1262,7 @@ Function132da:
ld [hl], "◀"
ret
Function132fe:
PlaceMoveScreenRightArrow:
ld a, [wCurPartyMon]
inc a
ld c, a

2
engine/pokemon/move_mon.asm
View File

@ -132,7 +132,7 @@ rept NUM_MOVES + -1
ld [hli], a
endr
ld [hl], a
ld [wBuffer1], a
ld [wEvolutionOldSpecies], a
predef FillMoves
.next

4
engine/pokemon/party_menu.asm
View File

@ -246,10 +246,10 @@ PlacePartyMonLevel:
jr nc, .ThreeDigits
ld a, "<LV>"
ld [hli], a
lb bc, PRINTNUM_RIGHTALIGN | 1, 2
lb bc, PRINTNUM_LEFTALIGN | 1, 2
; jr .okay
.ThreeDigits:
lb bc, PRINTNUM_RIGHTALIGN | 1, 3
lb bc, PRINTNUM_LEFTALIGN | 1, 3
; .okay
call PrintNum

8
engine/rtc/timeset.asm
View File

@ -273,19 +273,19 @@ SetMinutes:
DisplayMinutesWithMinString:
ld de, wInitMinuteBuffer
call PrintTwoDigitNumberRightAlign
call PrintTwoDigitNumberLeftAlign
inc hl
ld de, String_min
call PlaceString
ret
PrintTwoDigitNumberRightAlign:
PrintTwoDigitNumberLeftAlign:
push hl
ld a, " "
ld [hli], a
ld [hl], a
pop hl
lb bc, PRINTNUM_RIGHTALIGN | 1, 2
lb bc, PRINTNUM_LEFTALIGN | 1, 2
call PrintNum
ret
@ -684,7 +684,7 @@ PrintHour:
call AdjustHourForAMorPM
ld [wDeciramBuffer], a
ld de, wDeciramBuffer
call PrintTwoDigitNumberRightAlign
call PrintTwoDigitNumberLeftAlign
ret
GetTimeOfDayString:

2
engine/tilesets/tileset_anims.asm
View File

@ -259,7 +259,7 @@ TilesetChampionsRoomAnim:
TilesetLighthouseAnim:
TilesetPlayersRoomAnim:
TilesetPokeComCenterAnim:
TilesetBattleTowerAnim:
TilesetBattleTowerInsideAnim:
TilesetRuinsOfAlphAnim:
TilesetRadioTowerAnim:
TilesetUndergroundAnim:

16
engine/tilesets/tileset_palettes.asm
View File

@ -2,8 +2,8 @@ LoadSpecialMapPalette:
ld a, [wMapTileset]
cp TILESET_POKECOM_CENTER
jr z, .pokecom_2f
cp TILESET_BATTLE_TOWER
jr z, .battle_tower
cp TILESET_BATTLE_TOWER_INSIDE
jr z, .battle_tower_inside
cp TILESET_ICE_PATH
jr z, .ice_path
cp TILESET_HOUSE
@ -19,8 +19,8 @@ LoadSpecialMapPalette:
scf
ret
.battle_tower
call LoadBattleTowerPalette
.battle_tower_inside
call LoadBattleTowerInsidePalette
scf
ret
@ -63,16 +63,16 @@ LoadPokeComPalette:
PokeComPalette:
INCLUDE "gfx/tilesets/pokecom_center.pal"
LoadBattleTowerPalette:
LoadBattleTowerInsidePalette:
ld a, BANK(wBGPals1)
ld de, wBGPals1
ld hl, BattleTowerPalette
ld hl, BattleTowerInsidePalette
ld bc, 8 palettes
call FarCopyWRAM
ret
BattleTowerPalette:
INCLUDE "gfx/tilesets/battle_tower.pal"
BattleTowerInsidePalette:
INCLUDE "gfx/tilesets/battle_tower_inside.pal"
LoadIcePathPalette:
ld a, BANK(wBGPals1)

BIN
gfx/diploma/page2.tilemap
View File

Binary file not shown.

0
gfx/intro/003.tilemap → gfx/intro/background.attrmap
View File

0
gfx/intro/003.tilemap.lz.9f90366a → gfx/intro/background.attrmap.lz.9f90366a
View File

0
gfx/intro/intro_1.pal → gfx/intro/background.pal
View File

BIN
gfx/intro/background.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 563 B

After

Width:  |  Height:  |  Size: 562 B

0
gfx/intro/004.tilemap → gfx/intro/background.tilemap
View File

0
gfx/intro/004.tilemap.lz.4c7562ee → gfx/intro/background.tilemap.lz.4c7562ee
View File

0
gfx/intro/015.tilemap → gfx/intro/crystal_unowns.attrmap
View File

0
gfx/intro/015.tilemap.lz.1bfc5a89 → gfx/intro/crystal_unowns.attrmap.lz.1bfc5a89
View File

0
gfx/intro/intro_3.pal → gfx/intro/crystal_unowns.pal
View File

0
gfx/intro/017.tilemap → gfx/intro/crystal_unowns.tilemap
View File

0
gfx/intro/017.tilemap.lz.e4772015 → gfx/intro/crystal_unowns.tilemap.lz.e4772015
View File

0
gfx/intro/intro_5.pal → gfx/intro/suicune.pal
View File

0
gfx/intro/013.tilemap → gfx/intro/suicune_back.attrmap
View File

0
gfx/intro/013.tilemap.lz.18e3115f → gfx/intro/suicune_back.attrmap.lz.18e3115f
View File

0
gfx/intro/014.tilemap → gfx/intro/suicune_back.tilemap
View File

0
gfx/intro/014.tilemap.lz.7b59259d → gfx/intro/suicune_back.tilemap.lz.7b59259d
View File

0
gfx/intro/011.tilemap → gfx/intro/suicune_close.attrmap
View File

0
gfx/intro/011.tilemap.lz.bb066632 → gfx/intro/suicune_close.attrmap.lz.bb066632
View File

0
gfx/intro/intro_4.pal → gfx/intro/suicune_close.pal
View File

0
gfx/intro/012.tilemap → gfx/intro/suicune_close.tilemap
View File

0
gfx/intro/012.tilemap.lz.bc182264 → gfx/intro/suicune_close.tilemap.lz.bc182264
View File

0
gfx/intro/009.tilemap → gfx/intro/suicune_jump.attrmap
View File

0
gfx/intro/009.tilemap.lz.911a1ace → gfx/intro/suicune_jump.attrmap.lz.911a1ace
View File

0
gfx/intro/010.tilemap → gfx/intro/suicune_jump.tilemap
View File

0
gfx/intro/010.tilemap.lz.2717d106 → gfx/intro/suicune_jump.tilemap.lz.2717d106
View File

0
gfx/intro/001.tilemap → gfx/intro/unown_a.attrmap
View File

0
gfx/intro/001.tilemap.lz.c2341875 → gfx/intro/unown_a.attrmap.lz.c2341875
View File

0
gfx/intro/002.tilemap → gfx/intro/unown_a.tilemap
View File

0
gfx/intro/002.tilemap.lz.54d5b74b → gfx/intro/unown_a.tilemap.lz.54d5b74b
View File

0
gfx/intro/005.tilemap → gfx/intro/unown_hi.attrmap
View File

0
gfx/intro/005.tilemap.lz.bed1ff6d → gfx/intro/unown_hi.attrmap.lz.bed1ff6d
View File

0
gfx/intro/006.tilemap → gfx/intro/unown_hi.tilemap
View File

0
gfx/intro/006.tilemap.lz.c8756972 → gfx/intro/unown_hi.tilemap.lz.c8756972
View File

0
gfx/intro/007.tilemap → gfx/intro/unowns.attrmap
View File

0
gfx/intro/007.tilemap.lz.a9cbcbca → gfx/intro/unowns.attrmap.lz.a9cbcbca
View File

0
gfx/intro/intro_2.pal → gfx/intro/unowns.pal
View File

0
gfx/intro/008.tilemap → gfx/intro/unowns.tilemap
View File

0
gfx/intro/008.tilemap.lz.f12ed6d9 → gfx/intro/unowns.tilemap.lz.f12ed6d9
View File

0
gfx/unknown/17eb8e.attrmap → gfx/mobile/pokemon_news.bin
View File

0
gfx/pokedex/question_mark.2bpp.lz.14c284f5 → gfx/pokedex/question_mark.2bpp.lz.6e639380
View File

BIN
gfx/sgb/sgb_border_nonmatching.bin Normal file
View File

Binary file not shown.

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