Comment, remove, or revise many unreferenced labels

This commit is contained in:
Rangi 2020-10-26 15:45:57 -04:00
parent a2b6befd7d
commit 9dcdad5e60
180 changed files with 810 additions and 1032 deletions

View File

@ -464,7 +464,7 @@ Cry_Sentret_Ch6:
square_note 8, 15, 1, 1824 square_note 8, 15, 1, 1824
sound_ret sound_ret
Cry_Sentret_Ch8: Cry_Sentret_Ch8: ; unreferenced
noise_note 8, 3, -3, 0 noise_note 8, 3, -3, 0
noise_note 8, 9, 2, 0 noise_note 8, 9, 2, 0
sound_ret sound_ret
@ -1082,7 +1082,7 @@ Cry_Weepinbell:
channel 6, Cry_Weepinbell_Ch6 channel 6, Cry_Weepinbell_Ch6
channel 8, Cry_Weepinbell_Ch8 channel 8, Cry_Weepinbell_Ch8
Cry_Unused_Ch5: Cry_Unused_Ch5: ; unreferenced
duty_cycle_pattern 3, 3, 0, 0 duty_cycle_pattern 3, 3, 0, 0
square_note 15, 14, 0, 1920 square_note 15, 14, 0, 1920
square_note 15, 15, 0, 1924 square_note 15, 15, 0, 1924
@ -1092,7 +1092,7 @@ Cry_Unused_Ch5:
square_note 8, 7, 1, 1924 square_note 8, 7, 1, 1924
sound_ret sound_ret
Cry_Unused_Ch6: Cry_Unused_Ch6: ; unreferenced
duty_cycle_pattern 0, 0, 1, 1 duty_cycle_pattern 0, 0, 1, 1
square_note 15, 10, 0, 1857 square_note 15, 10, 0, 1857
square_note 15, 11, 0, 1859 square_note 15, 11, 0, 1859
@ -1102,7 +1102,7 @@ Cry_Unused_Ch6:
square_note 8, 3, 1, 1862 square_note 8, 3, 1, 1862
sound_ret sound_ret
Cry_Unused_Ch8: Cry_Unused_Ch8: ; unreferenced
noise_note 2, 15, 2, 76 noise_note 2, 15, 2, 76
noise_note 6, 14, 0, 58 noise_note 6, 14, 0, 58
noise_note 15, 13, 0, 58 noise_note 15, 13, 0, 58

View File

@ -38,15 +38,16 @@ _InitSound::
dec e dec e
jr nz, .clearsound jr nz, .clearsound
ld hl, wChannels ; start of channel data ld hl, wAudio
ld de, wChannelsEnd - wChannels ; length of area to clear (entire sound wram area) ld de, wAudioEnd - wAudio
.clearchannels .clearaudio
xor a xor a
ld [hli], a ld [hli], a
dec de dec de
ld a, e ld a, e
or d or d
jr nz, .clearchannels jr nz, .clearaudio
ld a, MAX_VOLUME ld a, MAX_VOLUME
ld [wVolume], a ld [wVolume], a
call MusicOn call MusicOn

View File

@ -246,7 +246,7 @@ Music_MagnetTrain_Ch4:
drum_note 12, 16 drum_note 12, 16
sound_ret sound_ret
.sub1: ; unused .sub1: ; unreferenced
drum_note 9, 1 drum_note 9, 1
drum_note 8, 1 drum_note 8, 1
drum_note 8, 1 drum_note 8, 1

View File

@ -21,7 +21,7 @@ Sfx_Menu:
Sfx_ReadText: Sfx_ReadText:
Sfx_ReadText2: Sfx_ReadText2:
channel_count 1 channel_count 1
channel 5, Sfx_ReadText2_Ch5 channel 5, Sfx_ReadText_Ch5 ; aka Sfx_ReadText2_Ch5
Sfx_Poison: Sfx_Poison:
channel_count 1 channel_count 1
@ -486,10 +486,10 @@ Sfx_Elevator:
Sfx_LevelUp: Sfx_LevelUp:
Sfx_DexFanfare5079: Sfx_DexFanfare5079:
channel_count 4 channel_count 4
channel 5, Sfx_LevelUp_Ch5 channel 5, Sfx_LevelUp_Ch5 ; aka Sfx_DexFanfare5079_Ch5
channel 6, Sfx_LevelUp_Ch6 channel 6, Sfx_LevelUp_Ch6 ; aka Sfx_DexFanfare5079_Ch6
channel 7, Sfx_LevelUp_Ch7 channel 7, Sfx_LevelUp_Ch7 ; aka Sfx_DexFanfare5079_Ch7
channel 8, Sfx_LevelUp_Ch8 channel 8, Sfx_LevelUp_Ch8 ; aka Sfx_DexFanfare5079_Ch8
Sfx_LevelUp_Ch5: Sfx_LevelUp_Ch5:
Sfx_DexFanfare5079_Ch5: Sfx_DexFanfare5079_Ch5:
@ -942,7 +942,7 @@ Sfx_Fanfare2:
channel 6, Sfx_Fanfare2_Ch6 channel 6, Sfx_Fanfare2_Ch6
channel 8, Sfx_Fanfare2_Ch8 channel 8, Sfx_Fanfare2_Ch8
Sfx_Unused: Sfx_Unused: ; unreferenced
channel_count 4 channel_count 4
channel 5, Sfx_Unused_Ch5 channel 5, Sfx_Unused_Ch5
channel 6, Sfx_Unused_Ch6 channel 6, Sfx_Unused_Ch6

View File

@ -144,7 +144,7 @@ SFX:
dba Sfx_MilkDrink dba Sfx_MilkDrink
dba Sfx_Present dba Sfx_Present
dba Sfx_MorningSun dba Sfx_MorningSun
dba Sfx_LevelUp dba Sfx_LevelUp ; aka Sfx_DexFanfare5079
dba Sfx_KeyItem dba Sfx_KeyItem
dba Sfx_Fanfare2 dba Sfx_Fanfare2
dba Sfx_RegisterPhoneNumber dba Sfx_RegisterPhoneNumber

View File

@ -1,5 +1,5 @@
newgroup: MACRO newgroup: MACRO
const_value = const_value + 1 const_skip
__map_value__ = 1 __map_value__ = 1
ENDM ENDM

View File

@ -66,7 +66,7 @@ NUM_MAP_PALETTES EQU const_value
shift_const NORTH shift_const NORTH
; SpawnPoints indexes (see data/maps/spawn_points.asm) ; SpawnPoints indexes (see data/maps/spawn_points.asm)
const_value = -1 const_def -1
const SPAWN_N_A const SPAWN_N_A
const SPAWN_HOME const SPAWN_HOME
const SPAWN_DEBUG const SPAWN_DEBUG

View File

@ -179,7 +179,7 @@ NUM_TREEMON_SETS EQU const_value
const TREEMON_SCORE_RARE ; 2 const TREEMON_SCORE_RARE ; 2
; ChangeHappiness arguments (see data/happiness_changes.asm) ; ChangeHappiness arguments (see data/happiness_changes.asm)
const_value = 1 const_def 1
const HAPPINESS_GAINLEVEL ; 01 const HAPPINESS_GAINLEVEL ; 01
const HAPPINESS_USEDITEM ; 02 const HAPPINESS_USEDITEM ; 02
const HAPPINESS_USEDXITEM ; 03 const HAPPINESS_USEDXITEM ; 03

View File

@ -3,7 +3,7 @@ __trainer_class__ = 0
trainerclass: MACRO trainerclass: MACRO
\1 EQU __trainer_class__ \1 EQU __trainer_class__
__trainer_class__ = __trainer_class__ + 1 __trainer_class__ = __trainer_class__ + 1
const_value = 1 const_def 1
ENDM ENDM
; trainer class ids ; trainer class ids

View File

@ -1,7 +1,7 @@
BattleTowerMons: BattleTowerMons:
; 10 groups of 21 mons. ; 10 groups (one per floor level) of 21 mons (BATTLETOWER_NUM_UNIQUE_MON).
BattleTowerMons1: ; BattleTowerMons group 1
db JOLTEON db JOLTEON
db MIRACLEBERRY db MIRACLEBERRY
@ -550,7 +550,7 @@ BattleTowerMons1:
db "BARIYA-DO@@" db "BARIYA-DO@@"
BattleTowerMons2: ; BattleTowerMons group 2
db UMBREON db UMBREON
db LEFTOVERS db LEFTOVERS
@ -1099,7 +1099,7 @@ BattleTowerMons2:
db "NUO-@@@@@@@" db "NUO-@@@@@@@"
BattleTowerMons3: ; BattleTowerMons group 3
db JOLTEON db JOLTEON
db MIRACLEBERRY db MIRACLEBERRY
@ -1648,7 +1648,7 @@ BattleTowerMons3:
db "OKORIZARU@@" db "OKORIZARU@@"
BattleTowerMons4: ; BattleTowerMons group 4
db TAUROS db TAUROS
db GOLD_BERRY db GOLD_BERRY
@ -2197,7 +2197,7 @@ BattleTowerMons4:
db "EREBU-@@@@@" db "EREBU-@@@@@"
BattleTowerMons5: ; BattleTowerMons group 5
db KINGDRA db KINGDRA
db GOLD_BERRY db GOLD_BERRY
@ -2746,7 +2746,7 @@ BattleTowerMons5:
db "HURI-ZA-@@@" db "HURI-ZA-@@@"
BattleTowerMons6: ; BattleTowerMons group 6
db KINGDRA db KINGDRA
db LEFTOVERS db LEFTOVERS
@ -3295,7 +3295,7 @@ BattleTowerMons6:
db "GORO-NIya@@" db "GORO-NIya@@"
BattleTowerMons7: ; BattleTowerMons group 7
db JOLTEON db JOLTEON
db MIRACLEBERRY db MIRACLEBERRY
@ -3844,7 +3844,7 @@ BattleTowerMons7:
db "KAMEtuKUSU@" db "KAMEtuKUSU@"
BattleTowerMons8: ; BattleTowerMons group 8
db JOLTEON db JOLTEON
db MIRACLEBERRY db MIRACLEBERRY
@ -4393,7 +4393,7 @@ BattleTowerMons8:
db "GURANBURU@@" db "GURANBURU@@"
BattleTowerMons9: ; BattleTowerMons group 9
db UMBREON db UMBREON
db KINGS_ROCK db KINGS_ROCK
@ -4942,7 +4942,7 @@ BattleTowerMons9:
db "BETOBETON@@" db "BETOBETON@@"
BattleTowerMons10: ; BattleTowerMons group 10
db HOUNDOOM db HOUNDOOM
db MINT_BERRY db MINT_BERRY

View File

@ -1,8 +1,8 @@
BattleTowerTrainerData:: ; What exactly it is, I don't know BattleTowerTrainerData:: ; ???
; Size is 70 (Nr of Trainers in BattleTower) * 0x24 (Nr of Bytes that are copied) ; 70 tables (BATTLETOWER_NUM_UNIQUE_TRAINERS) of 18 two-argument entries (total size BATTLETOWER_TRAINERDATALENGTH).
; Second argument points to an entry in Unknown_170470, to which the first argument is compared. ; Second argument points to an entry in Unknown_170470, to which the first argument is compared.
BattleTowerTrainer1DataTable: ; BattleTowerTrainerData table 1:
db $37, 3 db $37, 3
db $0e, 9 db $0e, 9
db $25, 11 db $25, 11
@ -22,7 +22,7 @@ BattleTowerTrainer1DataTable:
db $34, 3 db $34, 3
db $06, 5 db $06, 5
BattleTowerTrainer2DataTable: ; BattleTowerTrainerData table 2:
db $36, 3 db $36, 3
db $ca, 0 db $ca, 0
db $22, 8 db $22, 8
@ -42,7 +42,7 @@ BattleTowerTrainer2DataTable:
db $28, 11 db $28, 11
db $0c, 13 db $0c, 13
BattleTowerTrainer3DataTable: ; BattleTowerTrainerData table 3:
db $32, 6 db $32, 6
db $31, 4 db $31, 4
db $02, 2 db $02, 2
@ -62,7 +62,7 @@ BattleTowerTrainer3DataTable:
db $22, 2 db $22, 2
db $13, 13 db $13, 13
BattleTowerTrainer4DataTable: ; BattleTowerTrainerData table 4:
db $22, 12 db $22, 12
db $22, 12 db $22, 12
db $0a, 9 db $0a, 9
@ -82,7 +82,7 @@ BattleTowerTrainer4DataTable:
db $1c, 11 db $1c, 11
db $41, 11 db $41, 11
BattleTowerTrainer5DataTable: ; BattleTowerTrainerData table 5:
db $a3, 0 db $a3, 0
db $41, 3 db $41, 3
db $1f, 4 db $1f, 4
@ -102,7 +102,7 @@ BattleTowerTrainer5DataTable:
db $d1, 0 db $d1, 0
db $0a, 6 db $0a, 6
BattleTowerTrainer6DataTable: ; BattleTowerTrainerData table 6:
db $13, 2 db $13, 2
db $31, 6 db $31, 6
db $04, 2 db $04, 2
@ -122,7 +122,7 @@ BattleTowerTrainer6DataTable:
db $08, 5 db $08, 5
db $1a, 13 db $1a, 13
BattleTowerTrainer7DataTable: ; BattleTowerTrainerData table 7:
db $0d, 2 db $0d, 2
db $07, 2 db $07, 2
db $00, 5 db $00, 5
@ -142,7 +142,7 @@ BattleTowerTrainer7DataTable:
db $20, 4 db $20, 4
db $23, 13 db $23, 13
BattleTowerTrainer8DataTable: ; BattleTowerTrainerData table 8:
db $1e, 2 db $1e, 2
db $22, 2 db $22, 2
db $00, 5 db $00, 5
@ -162,7 +162,7 @@ BattleTowerTrainer8DataTable:
db $14, 8 db $14, 8
db $00, 5 db $00, 5
BattleTowerTrainer9DataTable: ; BattleTowerTrainerData table 9:
db $06, 12 db $06, 12
db $09, 6 db $09, 6
db $00, 0 db $00, 0
@ -182,7 +182,7 @@ BattleTowerTrainer9DataTable:
db $31, 13 db $31, 13
db $01, 5 db $01, 5
BattleTowerTrainer10DataTable: ; BattleTowerTrainerData table 10:
db $22, 12 db $22, 12
db $30, 4 db $30, 4
db $01, 5 db $01, 5
@ -202,7 +202,7 @@ BattleTowerTrainer10DataTable:
db $30, 13 db $30, 13
db $06, 5 db $06, 5
BattleTowerTrainer11DataTable: ; BattleTowerTrainerData table 11:
db $0e, 6 db $0e, 6
db $04, 5 db $04, 5
db $2c, 4 db $2c, 4
@ -222,7 +222,7 @@ BattleTowerTrainer11DataTable:
db $26, 13 db $26, 13
db $04, 5 db $04, 5
BattleTowerTrainer12DataTable: ; BattleTowerTrainerData table 12:
db $18, 2 db $18, 2
db $33, 3 db $33, 3
db $28, 4 db $28, 4
@ -242,7 +242,7 @@ BattleTowerTrainer12DataTable:
db $0f, 2 db $0f, 2
db $00, 5 db $00, 5
BattleTowerTrainer13DataTable: ; BattleTowerTrainerData table 13:
db $3a, 11 db $3a, 11
db $3a, 11 db $3a, 11
db $00, 5 db $00, 5
@ -262,7 +262,7 @@ BattleTowerTrainer13DataTable:
db $3a, 8 db $3a, 8
db $2a, 13 db $2a, 13
BattleTowerTrainer14DataTable: ; BattleTowerTrainerData table 14:
db $31, 5 db $31, 5
db $11, 14 db $11, 14
db $30, 4 db $30, 4
@ -282,7 +282,7 @@ BattleTowerTrainer14DataTable:
db $3b, 7 db $3b, 7
db $0e, 13 db $0e, 13
BattleTowerTrainer15DataTable: ; BattleTowerTrainerData table 15:
db $1b, 2 db $1b, 2
db $2c, 4 db $2c, 4
db $0d, 13 db $0d, 13
@ -302,7 +302,7 @@ BattleTowerTrainer15DataTable:
db $06, 5 db $06, 5
db $00, 0 db $00, 0
BattleTowerTrainer16DataTable: ; BattleTowerTrainerData table 16:
db $42, 3 db $42, 3
db $30, 4 db $30, 4
db $1f, 11 db $1f, 11
@ -322,7 +322,7 @@ BattleTowerTrainer16DataTable:
db $36, 8 db $36, 8
db $41, 13 db $41, 13
BattleTowerTrainer17DataTable: ; BattleTowerTrainerData table 17:
db $18, 3 db $18, 3
db $42, 3 db $42, 3
db $43, 4 db $43, 4
@ -342,7 +342,7 @@ BattleTowerTrainer17DataTable:
db $3f, 4 db $3f, 4
db $20, 14 db $20, 14
BattleTowerTrainer18DataTable: ; BattleTowerTrainerData table 18:
db $0c, 5 db $0c, 5
db $36, 7 db $36, 7
db $30, 4 db $30, 4
@ -362,7 +362,7 @@ BattleTowerTrainer18DataTable:
db $30, 7 db $30, 7
db $06, 5 db $06, 5
BattleTowerTrainer19DataTable: ; BattleTowerTrainerData table 19:
db $36, 3 db $36, 3
db $06, 6 db $06, 6
db $44, 4 db $44, 4
@ -382,7 +382,7 @@ BattleTowerTrainer19DataTable:
db $05, 13 db $05, 13
db $00, 0 db $00, 0
BattleTowerTrainer20DataTable: ; BattleTowerTrainerData table 20:
db $3f, 6 db $3f, 6
db $2c, 4 db $2c, 4
db $34, 13 db $34, 13
@ -402,7 +402,7 @@ BattleTowerTrainer20DataTable:
db $34, 7 db $34, 7
db $04, 13 db $04, 13
BattleTowerTrainer21DataTable: ; BattleTowerTrainerData table 21:
db $12, 3 db $12, 3
db $02, 4 db $02, 4
db $07, 7 db $07, 7
@ -422,7 +422,7 @@ BattleTowerTrainer21DataTable:
db $28, 11 db $28, 11
db $02, 5 db $02, 5
BattleTowerTrainer22DataTable: ; BattleTowerTrainerData table 22:
db $41, 4 db $41, 4
db $3c, 11 db $3c, 11
db $34, 13 db $34, 13
@ -442,7 +442,7 @@ BattleTowerTrainer22DataTable:
db $0c, 4 db $0c, 4
db $3b, 13 db $3b, 13
BattleTowerTrainer23DataTable: ; BattleTowerTrainerData table 23:
db $03, 10 db $03, 10
db $3a, 13 db $3a, 13
db $2c, 4 db $2c, 4
@ -462,7 +462,7 @@ BattleTowerTrainer23DataTable:
db $13, 4 db $13, 4
db $04, 5 db $04, 5
BattleTowerTrainer24DataTable: ; BattleTowerTrainerData table 24:
db $06, 5 db $06, 5
db $06, 5 db $06, 5
db $06, 5 db $06, 5
@ -482,7 +482,7 @@ BattleTowerTrainer24DataTable:
db $33, 4 db $33, 4
db $03, 5 db $03, 5
BattleTowerTrainer25DataTable: ; BattleTowerTrainerData table 25:
db $27, 5 db $27, 5
db $01, 5 db $01, 5
db $00, 0 db $00, 0
@ -502,7 +502,7 @@ BattleTowerTrainer25DataTable:
db $0c, 4 db $0c, 4
db $19, 13 db $19, 13
BattleTowerTrainer26DataTable: ; BattleTowerTrainerData table 26:
db $03, 2 db $03, 2
db $43, 3 db $43, 3
db $27, 4 db $27, 4
@ -522,7 +522,7 @@ BattleTowerTrainer26DataTable:
db $20, 4 db $20, 4
db $41, 13 db $41, 13
BattleTowerTrainer27DataTable: ; BattleTowerTrainerData table 27:
db $34, 3 db $34, 3
db $00, 3 db $00, 3
db $11, 13 db $11, 13
@ -542,7 +542,7 @@ BattleTowerTrainer27DataTable:
db $0d, 6 db $0d, 6
db $20, 6 db $20, 6
BattleTowerTrainer28DataTable: ; BattleTowerTrainerData table 28:
db $19, 3 db $19, 3
db $17, 11 db $17, 11
db $20, 6 db $20, 6
@ -562,7 +562,7 @@ BattleTowerTrainer28DataTable:
db $06, 12 db $06, 12
db $1a, 11 db $1a, 11
BattleTowerTrainer29DataTable: ; BattleTowerTrainerData table 29:
db $0a, 3 db $0a, 3
db $0c, 12 db $0c, 12
db $25, 10 db $25, 10
@ -582,7 +582,7 @@ BattleTowerTrainer29DataTable:
db $0a, 9 db $0a, 9
db $2f, 13 db $2f, 13
BattleTowerTrainer30DataTable: ; BattleTowerTrainerData table 30:
db $15, 2 db $15, 2
db $2c, 4 db $2c, 4
db $03, 2 db $03, 2
@ -602,7 +602,7 @@ BattleTowerTrainer30DataTable:
db $0c, 4 db $0c, 4
db $3b, 13 db $3b, 13
BattleTowerTrainer31DataTable: ; BattleTowerTrainerData table 31:
db $10, 11 db $10, 11
db $04, 4 db $04, 4
db $00, 5 db $00, 5
@ -622,7 +622,7 @@ BattleTowerTrainer31DataTable:
db $13, 7 db $13, 7
db $16, 13 db $16, 13
BattleTowerTrainer32DataTable: ; BattleTowerTrainerData table 32:
db $0f, 14 db $0f, 14
db $19, 13 db $19, 13
db $00, 5 db $00, 5
@ -642,7 +642,7 @@ BattleTowerTrainer32DataTable:
db $19, 13 db $19, 13
db $01, 5 db $01, 5
BattleTowerTrainer33DataTable: ; BattleTowerTrainerData table 33:
db $35, 3 db $35, 3
db $06, 4 db $06, 4
db $0d, 6 db $0d, 6
@ -662,7 +662,7 @@ BattleTowerTrainer33DataTable:
db $29, 8 db $29, 8
db $03, 5 db $03, 5
BattleTowerTrainer34DataTable: ; BattleTowerTrainerData table 34:
db $18, 4 db $18, 4
db $03, 5 db $03, 5
db $0b, 13 db $0b, 13
@ -682,7 +682,7 @@ BattleTowerTrainer34DataTable:
db $0c, 6 db $0c, 6
db $1a, 13 db $1a, 13
BattleTowerTrainer35DataTable: ; BattleTowerTrainerData table 35:
db $0c, 12 db $0c, 12
db $37, 3 db $37, 3
db $1a, 3 db $1a, 3
@ -702,7 +702,7 @@ BattleTowerTrainer35DataTable:
db $3b, 8 db $3b, 8
db $1b, 7 db $1b, 7
BattleTowerTrainer36DataTable: ; BattleTowerTrainerData table 36:
db $18, 3 db $18, 3
db $1b, 8 db $1b, 8
db $29, 11 db $29, 11
@ -722,7 +722,7 @@ BattleTowerTrainer36DataTable:
db $2f, 8 db $2f, 8
db $27, 6 db $27, 6
BattleTowerTrainer37DataTable: ; BattleTowerTrainerData table 37:
db $1c, 3 db $1c, 3
db $02, 14 db $02, 14
db $31, 3 db $31, 3
@ -742,7 +742,7 @@ BattleTowerTrainer37DataTable:
db $27, 4 db $27, 4
db $34, 13 db $34, 13
BattleTowerTrainer38DataTable: ; BattleTowerTrainerData table 38:
db $33, 3 db $33, 3
db $30, 4 db $30, 4
db $2c, 4 db $2c, 4
@ -762,7 +762,7 @@ BattleTowerTrainer38DataTable:
db $40, 6 db $40, 6
db $22, 7 db $22, 7
BattleTowerTrainer39DataTable: ; BattleTowerTrainerData table 39:
db $22, 12 db $22, 12
db $22, 12 db $22, 12
db $16, 10 db $16, 10
@ -782,7 +782,7 @@ BattleTowerTrainer39DataTable:
db $2c, 4 db $2c, 4
db $26, 7 db $26, 7
BattleTowerTrainer40DataTable: ; BattleTowerTrainerData table 40:
db $0e, 6 db $0e, 6
db $05, 8 db $05, 8
db $04, 13 db $04, 13
@ -802,7 +802,7 @@ BattleTowerTrainer40DataTable:
db $00, 0 db $00, 0
db $00, 0 db $00, 0
BattleTowerTrainer41DataTable: ; BattleTowerTrainerData table 41:
db $18, 3 db $18, 3
db $27, 3 db $27, 3
db $03, 5 db $03, 5
@ -822,7 +822,7 @@ BattleTowerTrainer41DataTable:
db $2f, 8 db $2f, 8
db $06, 5 db $06, 5
BattleTowerTrainer42DataTable: ; BattleTowerTrainerData table 42:
db $36, 3 db $36, 3
db $30, 4 db $30, 4
db $17, 4 db $17, 4
@ -842,7 +842,7 @@ BattleTowerTrainer42DataTable:
db $07, 13 db $07, 13
db $3b, 13 db $3b, 13
BattleTowerTrainer43DataTable: ; BattleTowerTrainerData table 43:
db $0b, 5 db $0b, 5
db $14, 6 db $14, 6
db $24, 4 db $24, 4
@ -862,7 +862,7 @@ BattleTowerTrainer43DataTable:
db $00, 2 db $00, 2
db $07, 5 db $07, 5
BattleTowerTrainer44DataTable: ; BattleTowerTrainerData table 44:
db $0a, 3 db $0a, 3
db $32, 7 db $32, 7
db $0b, 14 db $0b, 14
@ -882,7 +882,7 @@ BattleTowerTrainer44DataTable:
db $1e, 6 db $1e, 6
db $14, 7 db $14, 7
BattleTowerTrainer45DataTable: ; BattleTowerTrainerData table 45:
db $0e, 6 db $0e, 6
db $2c, 4 db $2c, 4
db $00, 13 db $00, 13
@ -902,7 +902,7 @@ BattleTowerTrainer45DataTable:
db $31, 4 db $31, 4
db $21, 13 db $21, 13
BattleTowerTrainer46DataTable: ; BattleTowerTrainerData table 46:
db $22, 5 db $22, 5
db $07, 14 db $07, 14
db $30, 4 db $30, 4
@ -922,7 +922,7 @@ BattleTowerTrainer46DataTable:
db $3f, 4 db $3f, 4
db $06, 5 db $06, 5
BattleTowerTrainer47DataTable: ; BattleTowerTrainerData table 47:
db $3a, 7 db $3a, 7
db $3b, 7 db $3b, 7
db $36, 3 db $36, 3
@ -942,7 +942,7 @@ BattleTowerTrainer47DataTable:
db $3f, 4 db $3f, 4
db $0c, 13 db $0c, 13
BattleTowerTrainer48DataTable: ; BattleTowerTrainerData table 48:
db $43, 3 db $43, 3
db $20, 4 db $20, 4
db $41, 13 db $41, 13
@ -962,7 +962,7 @@ BattleTowerTrainer48DataTable:
db $39, 4 db $39, 4
db $41, 13 db $41, 13
BattleTowerTrainer49DataTable: ; BattleTowerTrainerData table 49:
db $36, 3 db $36, 3
db $16, 4 db $16, 4
db $08, 6 db $08, 6
@ -982,7 +982,7 @@ BattleTowerTrainer49DataTable:
db $2c, 13 db $2c, 13
db $00, 5 db $00, 5
BattleTowerTrainer50DataTable: ; BattleTowerTrainerData table 50:
db $11, 5 db $11, 5
db $25, 3 db $25, 3
db $33, 4 db $33, 4
@ -1002,7 +1002,7 @@ BattleTowerTrainer50DataTable:
db $19, 13 db $19, 13
db $06, 5 db $06, 5
BattleTowerTrainer51DataTable: ; BattleTowerTrainerData table 51:
db $2c, 4 db $2c, 4
db $0a, 13 db $0a, 13
db $04, 5 db $04, 5
@ -1022,7 +1022,7 @@ BattleTowerTrainer51DataTable:
db $29, 8 db $29, 8
db $05, 13 db $05, 13
BattleTowerTrainer52DataTable: ; BattleTowerTrainerData table 52:
db $05, 3 db $05, 3
db $1b, 4 db $1b, 4
db $41, 3 db $41, 3
@ -1042,7 +1042,7 @@ BattleTowerTrainer52DataTable:
db $1d, 11 db $1d, 11
db $03, 5 db $03, 5
BattleTowerTrainer53DataTable: ; BattleTowerTrainerData table 53:
db $1c, 12 db $1c, 12
db $20, 6 db $20, 6
db $05, 8 db $05, 8
@ -1062,7 +1062,7 @@ BattleTowerTrainer53DataTable:
db $06, 5 db $06, 5
db $1f, 8 db $1f, 8
BattleTowerTrainer54DataTable: ; BattleTowerTrainerData table 54:
db $37, 3 db $37, 3
db $0e, 1 db $0e, 1
db $08, 1 db $08, 1
@ -1082,7 +1082,7 @@ BattleTowerTrainer54DataTable:
db $41, 8 db $41, 8
db $3b, 13 db $3b, 13
BattleTowerTrainer55DataTable: ; BattleTowerTrainerData table 55:
db $06, 2 db $06, 2
db $00, 5 db $00, 5
db $34, 3 db $34, 3
@ -1102,7 +1102,7 @@ BattleTowerTrainer55DataTable:
db $1b, 4 db $1b, 4
db $0c, 13 db $0c, 13
BattleTowerTrainer56DataTable: ; BattleTowerTrainerData table 56:
db $2c, 4 db $2c, 4
db $13, 9 db $13, 9
db $20, 6 db $20, 6
@ -1122,7 +1122,7 @@ BattleTowerTrainer56DataTable:
db $06, 13 db $06, 13
db $3b, 13 db $3b, 13
BattleTowerTrainer57DataTable: ; BattleTowerTrainerData table 57:
db $06, 3 db $06, 3
db $20, 4 db $20, 4
db $24, 13 db $24, 13
@ -1142,7 +1142,7 @@ BattleTowerTrainer57DataTable:
db $09, 6 db $09, 6
db $06, 5 db $06, 5
BattleTowerTrainer58DataTable: ; BattleTowerTrainerData table 58:
db $44, 7 db $44, 7
db $23, 11 db $23, 11
db $33, 13 db $33, 13
@ -1162,7 +1162,7 @@ BattleTowerTrainer58DataTable:
db $11, 8 db $11, 8
db $41, 13 db $41, 13
BattleTowerTrainer59DataTable: ; BattleTowerTrainerData table 59:
db $36, 3 db $36, 3
db $06, 6 db $06, 6
db $30, 4 db $30, 4
@ -1182,7 +1182,7 @@ BattleTowerTrainer59DataTable:
db $0b, 6 db $0b, 6
db $27, 6 db $27, 6
BattleTowerTrainer60DataTable: ; BattleTowerTrainerData table 60:
db $14, 5 db $14, 5
db $04, 2 db $04, 2
db $09, 14 db $09, 14
@ -1202,7 +1202,7 @@ BattleTowerTrainer60DataTable:
db $39, 4 db $39, 4
db $00, 5 db $00, 5
BattleTowerTrainer61DataTable: ; BattleTowerTrainerData table 61:
db $34, 3 db $34, 3
db $00, 3 db $00, 3
db $11, 13 db $11, 13
@ -1222,7 +1222,7 @@ BattleTowerTrainer61DataTable:
db $1e, 6 db $1e, 6
db $14, 13 db $14, 13
BattleTowerTrainer62DataTable: ; BattleTowerTrainerData table 62:
db $37, 5 db $37, 5
db $37, 5 db $37, 5
db $00, 5 db $00, 5
@ -1242,7 +1242,7 @@ BattleTowerTrainer62DataTable:
db $16, 5 db $16, 5
db $01, 5 db $01, 5
BattleTowerTrainer63DataTable: ; BattleTowerTrainerData table 63:
db $1f, 14 db $1f, 14
db $36, 4 db $36, 4
db $40, 13 db $40, 13
@ -1262,7 +1262,7 @@ BattleTowerTrainer63DataTable:
db $27, 13 db $27, 13
db $00, 0 db $00, 0
BattleTowerTrainer64DataTable: ; BattleTowerTrainerData table 64:
db $41, 8 db $41, 8
db $0b, 6 db $0b, 6
db $37, 3 db $37, 3
@ -1282,7 +1282,7 @@ BattleTowerTrainer64DataTable:
db $28, 6 db $28, 6
db $06, 5 db $06, 5
BattleTowerTrainer65DataTable: ; BattleTowerTrainerData table 65:
db $0c, 8 db $0c, 8
db $2c, 4 db $2c, 4
db $1c, 11 db $1c, 11
@ -1302,7 +1302,7 @@ BattleTowerTrainer65DataTable:
db $20, 6 db $20, 6
db $22, 7 db $22, 7
BattleTowerTrainer66DataTable: ; BattleTowerTrainerData table 66:
db $22, 12 db $22, 12
db $22, 12 db $22, 12
db $0a, 9 db $0a, 9
@ -1322,7 +1322,7 @@ BattleTowerTrainer66DataTable:
db $02, 7 db $02, 7
db $04, 5 db $04, 5
BattleTowerTrainer67DataTable: ; BattleTowerTrainerData table 67:
db $2d, 11 db $2d, 11
db $02, 8 db $02, 8
db $37, 13 db $37, 13
@ -1342,7 +1342,7 @@ BattleTowerTrainer67DataTable:
db $10, 5 db $10, 5
db $04, 5 db $04, 5
BattleTowerTrainer68DataTable: ; BattleTowerTrainerData table 68:
db $3f, 3 db $3f, 3
db $16, 14 db $16, 14
db $3f, 8 db $3f, 8
@ -1362,7 +1362,7 @@ BattleTowerTrainer68DataTable:
db $26, 7 db $26, 7
db $03, 5 db $03, 5
BattleTowerTrainer69DataTable: ; BattleTowerTrainerData table 69:
db $3a, 6 db $3a, 6
db $2c, 3 db $2c, 3
db $12, 3 db $12, 3
@ -1382,7 +1382,7 @@ BattleTowerTrainer69DataTable:
db $1b, 7 db $1b, 7
db $00, 5 db $00, 5
BattleTowerTrainer70DataTable: ; BattleTowerTrainerData table 70:
db $1b, 2 db $1b, 2
db $00, 5 db $00, 5
db $0c, 8 db $0c, 8
@ -1401,4 +1401,3 @@ BattleTowerTrainer70DataTable:
db $22, 7 db $22, 7
db $d1, 0 db $d1, 0
db $32, 13 db $32, 13
BattleTowerTrainerDataEnd:

View File

@ -48,7 +48,8 @@ DecorationIDs:
db DECO_BIG_SNORLAX_DOLL ; 1a db DECO_BIG_SNORLAX_DOLL ; 1a
db DECO_BIG_ONIX_DOLL ; 1b db DECO_BIG_ONIX_DOLL ; 1b
db DECO_BIG_LAPRAS_DOLL ; 1c db DECO_BIG_LAPRAS_DOLL ; 1c
TrophyIDs:
db DECO_GOLD_TROPHY_DOLL ; 33 db DECO_GOLD_TROPHY_DOLL ; 33
db DECO_SILVER_TROPHY_DOLL ; 34 db DECO_SILVER_TROPHY_DOLL ; 34
db -1
db -1 ; end

View File

@ -15,7 +15,7 @@ Route44_Blocks:
Route28_Blocks: Route28_Blocks:
INCBIN "maps/Route28.blk" INCBIN "maps/Route28.blk"
BetaPlayersHouse2F_Blocks: BetaPlayersHouse2F_Blocks: ; unreferenced
INCBIN "maps/unused/BetaPlayersHouse2F.blk" INCBIN "maps/unused/BetaPlayersHouse2F.blk"
CeladonCity_Blocks: CeladonCity_Blocks:
@ -30,25 +30,25 @@ Route2_Blocks:
ElmsHouse_Blocks: ElmsHouse_Blocks:
INCBIN "maps/ElmsHouse.blk" INCBIN "maps/ElmsHouse.blk"
BetaSproutTower1_Blocks: BetaSproutTower1_Blocks: ; unreferenced
INCBIN "maps/unused/BetaSproutTower1.blk" INCBIN "maps/unused/BetaSproutTower1.blk"
Route11_Blocks: Route11_Blocks:
INCBIN "maps/Route11.blk" INCBIN "maps/Route11.blk"
BetaSproutTower5_Blocks: BetaSproutTower5_Blocks: ; unreferenced
INCBIN "maps/unused/BetaSproutTower5.blk" INCBIN "maps/unused/BetaSproutTower5.blk"
Route15_Blocks: Route15_Blocks:
INCBIN "maps/Route15.blk" INCBIN "maps/Route15.blk"
BetaSproutTower9_Blocks: BetaSproutTower9_Blocks: ; unreferenced
INCBIN "maps/unused/BetaSproutTower9.blk" INCBIN "maps/unused/BetaSproutTower9.blk"
Route19_Blocks: Route19_Blocks:
INCBIN "maps/Route19.blk" INCBIN "maps/Route19.blk"
BetaBlackthornCity_Blocks: BetaBlackthornCity_Blocks: ; unreferenced
INCBIN "maps/unused/BetaBlackthornCity.blk" INCBIN "maps/unused/BetaBlackthornCity.blk"
Route10South_Blocks: Route10South_Blocks:
@ -94,7 +94,7 @@ Route25_Blocks:
Route24_Blocks: Route24_Blocks:
INCBIN "maps/Route24.blk" INCBIN "maps/Route24.blk"
BetaVioletCity_Blocks: BetaVioletCity_Blocks: ; unreferenced
INCBIN "maps/unused/BetaVioletCity.blk" INCBIN "maps/unused/BetaVioletCity.blk"
Route3_Blocks: Route3_Blocks:
@ -103,25 +103,25 @@ Route3_Blocks:
PewterCity_Blocks: PewterCity_Blocks:
INCBIN "maps/PewterCity.blk" INCBIN "maps/PewterCity.blk"
BetaSilverCaveOutside_Blocks: BetaSilverCaveOutside_Blocks: ; unreferenced
INCBIN "maps/unused/BetaSilverCaveOutside.blk" INCBIN "maps/unused/BetaSilverCaveOutside.blk"
BetaSproutTower2_Blocks: BetaSproutTower2_Blocks: ; unreferenced
INCBIN "maps/unused/BetaSproutTower2.blk" INCBIN "maps/unused/BetaSproutTower2.blk"
Route12_Blocks: Route12_Blocks:
INCBIN "maps/Route12.blk" INCBIN "maps/Route12.blk"
BetaGoldenrodCity_Blocks: BetaGoldenrodCity_Blocks: ; unreferenced
INCBIN "maps/unused/BetaGoldenrodCity.blk" INCBIN "maps/unused/BetaGoldenrodCity.blk"
Route20_Blocks: Route20_Blocks:
INCBIN "maps/Route20.blk" INCBIN "maps/Route20.blk"
BetaSproutTower6_Blocks: BetaSproutTower6_Blocks: ; unreferenced
INCBIN "maps/unused/BetaSproutTower6.blk" INCBIN "maps/unused/BetaSproutTower6.blk"
BetaPokecenter_Blocks: BetaPokecenter_Blocks: ; unreferenced
INCBIN "maps/unused/BetaPokecenter.blk" INCBIN "maps/unused/BetaPokecenter.blk"
Route30_Blocks: Route30_Blocks:
@ -145,7 +145,7 @@ FuchsiaCity_Blocks:
Route38_Blocks: Route38_Blocks:
INCBIN "maps/Route38.blk" INCBIN "maps/Route38.blk"
BetaCianwoodCity_Blocks: BetaCianwoodCity_Blocks: ; unreferenced
INCBIN "maps/unused/BetaCianwoodCity.blk" INCBIN "maps/unused/BetaCianwoodCity.blk"
OlivineTimsHouse_Blocks: OlivineTimsHouse_Blocks:
@ -214,10 +214,10 @@ Route29Route46Gate_Blocks:
Route5SaffronGate_Blocks: Route5SaffronGate_Blocks:
INCBIN "maps/NorthSouthGate.blk" INCBIN "maps/NorthSouthGate.blk"
BetaEcruteakCity_Blocks: BetaEcruteakCity_Blocks: ; unreferenced
INCBIN "maps/unused/BetaEcruteakCity.blk" INCBIN "maps/unused/BetaEcruteakCity.blk"
BetaCherrygroveCity_Blocks: BetaCherrygroveCity_Blocks: ; unreferenced
INCBIN "maps/unused/BetaCherrygroveCity.blk" INCBIN "maps/unused/BetaCherrygroveCity.blk"
CinnabarIsland_Blocks: CinnabarIsland_Blocks:
@ -229,7 +229,7 @@ Route4_Blocks:
Route8_Blocks: Route8_Blocks:
INCBIN "maps/Route8.blk" INCBIN "maps/Route8.blk"
BetaSproutTower3_Blocks: BetaSproutTower3_Blocks: ; unreferenced
INCBIN "maps/unused/BetaSproutTower3.blk" INCBIN "maps/unused/BetaSproutTower3.blk"
ViridianCity_Blocks: ViridianCity_Blocks:
@ -241,13 +241,13 @@ Route13_Blocks:
Route21_Blocks: Route21_Blocks:
INCBIN "maps/Route21.blk" INCBIN "maps/Route21.blk"
BetaSproutTower7_Blocks: BetaSproutTower7_Blocks: ; unreferenced
INCBIN "maps/unused/BetaSproutTower7.blk" INCBIN "maps/unused/BetaSproutTower7.blk"
Route17_Blocks: Route17_Blocks:
INCBIN "maps/Route17.blk" INCBIN "maps/Route17.blk"
BetaMahoganyTown_Blocks: BetaMahoganyTown_Blocks: ; unreferenced
INCBIN "maps/unused/BetaMahoganyTown.blk" INCBIN "maps/unused/BetaMahoganyTown.blk"
Route31_Blocks: Route31_Blocks:
@ -280,16 +280,16 @@ Route17Route18Gate_Blocks:
Route31VioletGate_Blocks: Route31VioletGate_Blocks:
INCBIN "maps/EastWestGate.blk" INCBIN "maps/EastWestGate.blk"
BetaAzaleaTown_Blocks: BetaAzaleaTown_Blocks: ; unreferenced
INCBIN "maps/unused/BetaAzaleaTown.blk" INCBIN "maps/unused/BetaAzaleaTown.blk"
VermilionCity_Blocks: VermilionCity_Blocks:
INCBIN "maps/VermilionCity.blk" INCBIN "maps/VermilionCity.blk"
BetaOlivineCity_Blocks: BetaOlivineCity_Blocks: ; unreferenced
INCBIN "maps/unused/BetaOlivineCity.blk" INCBIN "maps/unused/BetaOlivineCity.blk"
BetaNewBarkTown_Blocks: BetaNewBarkTown_Blocks: ; unreferenced
INCBIN "maps/unused/BetaNewBarkTown.blk" INCBIN "maps/unused/BetaNewBarkTown.blk"
ElmsLab_Blocks: ElmsLab_Blocks:
@ -316,7 +316,7 @@ SECTION "Map Blocks 2", ROMX
Route14_Blocks: Route14_Blocks:
INCBIN "maps/Route14.blk" INCBIN "maps/Route14.blk"
BetaSproutTower8_Blocks: BetaSproutTower8_Blocks: ; unreferenced
INCBIN "maps/unused/BetaSproutTower8.blk" INCBIN "maps/unused/BetaSproutTower8.blk"
OlivineMart_Blocks: OlivineMart_Blocks:
@ -337,7 +337,7 @@ CherrygroveMart_Blocks:
Route10North_Blocks: Route10North_Blocks:
INCBIN "maps/Route10North.blk" INCBIN "maps/Route10North.blk"
BetaLakeOfRage_Blocks: BetaLakeOfRage_Blocks: ; unreferenced
INCBIN "maps/unused/BetaLakeOfRage.blk" INCBIN "maps/unused/BetaLakeOfRage.blk"
OlivinePokecenter1F_Blocks: OlivinePokecenter1F_Blocks:
@ -363,25 +363,25 @@ SaffronPokecenter1F_Blocks:
CherrygrovePokecenter1F_Blocks: CherrygrovePokecenter1F_Blocks:
INCBIN "maps/Pokecenter1F.blk" INCBIN "maps/Pokecenter1F.blk"
BetaPewterMuseumOfScience1F_Blocks: BetaPewterMuseumOfScience1F_Blocks: ; unreferenced
INCBIN "maps/unused/BetaPewterMuseumOfScience1F.blk" INCBIN "maps/unused/BetaPewterMuseumOfScience1F.blk"
BetaPewterMuseumOfScience2F_Blocks: BetaPewterMuseumOfScience2F_Blocks: ; unreferenced
INCBIN "maps/unused/BetaPewterMuseumOfScience2F.blk" INCBIN "maps/unused/BetaPewterMuseumOfScience2F.blk"
EarlsPokemonAcademy_Blocks: EarlsPokemonAcademy_Blocks:
INCBIN "maps/EarlsPokemonAcademy.blk" INCBIN "maps/EarlsPokemonAcademy.blk"
BetaCinnabarPokemonLabHallway_Blocks: BetaCinnabarPokemonLabHallway_Blocks: ; unreferenced
INCBIN "maps/unused/BetaCinnabarPokemonLabHallway.blk" INCBIN "maps/unused/BetaCinnabarPokemonLabHallway.blk"
BetaCinnabarPokemonLabRoom1_Blocks: BetaCinnabarPokemonLabRoom1_Blocks: ; unreferenced
INCBIN "maps/unused/BetaCinnabarPokemonLabRoom1.blk" INCBIN "maps/unused/BetaCinnabarPokemonLabRoom1.blk"
BetaCinnabarPokemonLabRoom2_Blocks: BetaCinnabarPokemonLabRoom2_Blocks: ; unreferenced
INCBIN "maps/unused/BetaCinnabarPokemonLabRoom2.blk" INCBIN "maps/unused/BetaCinnabarPokemonLabRoom2.blk"
BetaCinnabarPokemonLabRoom3_Blocks: BetaCinnabarPokemonLabRoom3_Blocks: ; unreferenced
INCBIN "maps/unused/BetaCinnabarPokemonLabRoom3.blk" INCBIN "maps/unused/BetaCinnabarPokemonLabRoom3.blk"
GoldenrodDeptStore1F_Blocks: GoldenrodDeptStore1F_Blocks:
@ -424,7 +424,7 @@ CeladonMansion3F_Blocks:
CeladonMansionRoof_Blocks: CeladonMansionRoof_Blocks:
INCBIN "maps/CeladonMansionRoof.blk" INCBIN "maps/CeladonMansionRoof.blk"
BetaHouse_Blocks: BetaHouse_Blocks: ; unreferenced
INCBIN "maps/unused/BetaHouse.blk" INCBIN "maps/unused/BetaHouse.blk"
CeladonGameCorner_Blocks: CeladonGameCorner_Blocks:
@ -446,7 +446,7 @@ VioletNicknameSpeechHouse_Blocks:
VioletKylesHouse_Blocks: VioletKylesHouse_Blocks:
INCBIN "maps/House2.blk" INCBIN "maps/House2.blk"
BetaUnionCave_Blocks: BetaUnionCave_Blocks: ; unreferenced
INCBIN "maps/unused/BetaUnionCave.blk" INCBIN "maps/unused/BetaUnionCave.blk"
UnionCaveB1F_Blocks: UnionCaveB1F_Blocks:
@ -466,7 +466,7 @@ Route5UndergroundPathEntrance_Blocks:
Route6UndergroundPathEntrance_Blocks: Route6UndergroundPathEntrance_Blocks:
INCBIN "maps/UndergroundPathEntrance.blk" INCBIN "maps/UndergroundPathEntrance.blk"
BetaCapsuleHouse_Blocks: BetaCapsuleHouse_Blocks: ; unreferenced
INCBIN "maps/unused/BetaCapsuleHouse.blk" INCBIN "maps/unused/BetaCapsuleHouse.blk"
KurtsHouse_Blocks: KurtsHouse_Blocks:
@ -478,7 +478,7 @@ GoldenrodMagnetTrainStation_Blocks:
RuinsOfAlphOutside_Blocks: RuinsOfAlphOutside_Blocks:
INCBIN "maps/RuinsOfAlphOutside.blk" INCBIN "maps/RuinsOfAlphOutside.blk"
BetaRuinsOfAlphUnsolvedPuzzleRoom_Blocks: BetaRuinsOfAlphUnsolvedPuzzleRoom_Blocks: ; unreferenced
INCBIN "maps/unused/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk" INCBIN "maps/unused/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk"
RuinsOfAlphInnerChamber_Blocks: RuinsOfAlphInnerChamber_Blocks:
@ -493,19 +493,19 @@ RuinsOfAlphAerodactylChamber_Blocks:
SproutTower1F_Blocks: SproutTower1F_Blocks:
INCBIN "maps/SproutTower1F.blk" INCBIN "maps/SproutTower1F.blk"
BetaSproutTowerCutOut1_Blocks: BetaSproutTowerCutOut1_Blocks: ; unreferenced
INCBIN "maps/unused/BetaSproutTowerCutOut1.blk" INCBIN "maps/unused/BetaSproutTowerCutOut1.blk"
SproutTower2F_Blocks: SproutTower2F_Blocks:
INCBIN "maps/SproutTower2F.blk" INCBIN "maps/SproutTower2F.blk"
BetaSproutTowerCutOut2_Blocks: BetaSproutTowerCutOut2_Blocks: ; unreferenced
INCBIN "maps/unused/BetaSproutTowerCutOut2.blk" INCBIN "maps/unused/BetaSproutTowerCutOut2.blk"
SproutTower3F_Blocks: SproutTower3F_Blocks:
INCBIN "maps/SproutTower3F.blk" INCBIN "maps/SproutTower3F.blk"
BetaSproutTowerCutOut3_Blocks: BetaSproutTowerCutOut3_Blocks: ; unreferenced
INCBIN "maps/unused/BetaSproutTowerCutOut3.blk" INCBIN "maps/unused/BetaSproutTowerCutOut3.blk"
RadioTower1F_Blocks: RadioTower1F_Blocks:
@ -583,7 +583,7 @@ GoldenrodDeptStoreB1F_Blocks:
GoldenrodUndergroundWarehouse_Blocks: GoldenrodUndergroundWarehouse_Blocks:
INCBIN "maps/GoldenrodUndergroundWarehouse.blk" INCBIN "maps/GoldenrodUndergroundWarehouse.blk"
BetaElevator_Blocks: BetaElevator_Blocks: ; unreferenced
INCBIN "maps/unused/BetaElevator.blk" INCBIN "maps/unused/BetaElevator.blk"
TinTower1F_Blocks: TinTower1F_Blocks:
@ -622,7 +622,7 @@ BurnedTower1F_Blocks:
BurnedTowerB1F_Blocks: BurnedTowerB1F_Blocks:
INCBIN "maps/BurnedTowerB1F.blk" INCBIN "maps/BurnedTowerB1F.blk"
BetaCaveTestMap_Blocks: BetaCaveTestMap_Blocks: ; unreferenced
INCBIN "maps/unused/BetaCaveTestMap.blk" INCBIN "maps/unused/BetaCaveTestMap.blk"
MountMortar1FOutside_Blocks: MountMortar1FOutside_Blocks:
@ -685,16 +685,16 @@ SilverCaveRoom2_Blocks:
SilverCaveRoom3_Blocks: SilverCaveRoom3_Blocks:
INCBIN "maps/SilverCaveRoom3.blk" INCBIN "maps/SilverCaveRoom3.blk"
BetaRocketHideoutB2F_Blocks: BetaRocketHideoutB2F_Blocks: ; unreferenced
INCBIN "maps/unused/BetaRocketHideoutB2F.blk" INCBIN "maps/unused/BetaRocketHideoutB2F.blk"
BetaRocketHideoutB1F_Blocks: BetaRocketHideoutB1F_Blocks: ; unreferenced
INCBIN "maps/unused/BetaRocketHideoutB1F.blk" INCBIN "maps/unused/BetaRocketHideoutB1F.blk"
BetaRocketHideout1F_Blocks: BetaRocketHideout1F_Blocks: ; unreferenced
INCBIN "maps/unused/BetaRocketHideout1F.blk" INCBIN "maps/unused/BetaRocketHideout1F.blk"
BetaRocketHideoutB3F_Blocks: BetaRocketHideoutB3F_Blocks: ; unreferenced
INCBIN "maps/unused/BetaRocketHideoutB3F.blk" INCBIN "maps/unused/BetaRocketHideoutB3F.blk"
MahoganyMart1F_Blocks: MahoganyMart1F_Blocks:
@ -710,7 +710,7 @@ TeamRocketBaseB2F_Blocks:
TeamRocketBaseB3F_Blocks: TeamRocketBaseB3F_Blocks:
INCBIN "maps/TeamRocketBaseB3F.blk" INCBIN "maps/TeamRocketBaseB3F.blk"
BetaRoute23_Blocks: BetaRoute23_Blocks: ; unreferenced
INCBIN "maps/unused/BetaRoute23.blk" INCBIN "maps/unused/BetaRoute23.blk"
IndigoPlateauPokecenter1F_Blocks: IndigoPlateauPokecenter1F_Blocks:
@ -746,7 +746,7 @@ MahoganyGym_Blocks:
OlivineGym_Blocks: OlivineGym_Blocks:
INCBIN "maps/OlivineGym.blk" INCBIN "maps/OlivineGym.blk"
BetaUnknownGym_Blocks: BetaUnknownGym_Blocks: ; unreferenced
INCBIN "maps/unused/BetaUnknownGym.blk" INCBIN "maps/unused/BetaUnknownGym.blk"
CianwoodGym_Blocks: CianwoodGym_Blocks:
@ -779,7 +779,7 @@ OlivineLighthouse6F_Blocks:
SECTION "Map Blocks 3", ROMX SECTION "Map Blocks 3", ROMX
BetaSlowpokeWell1F_Blocks: BetaSlowpokeWell1F_Blocks: ; unreferenced
INCBIN "maps/unused/BetaSlowpokeWell1F.blk" INCBIN "maps/unused/BetaSlowpokeWell1F.blk"
SlowpokeWellB1F_Blocks: SlowpokeWellB1F_Blocks:
@ -824,7 +824,7 @@ FastShip1F_Blocks:
FastShipB1F_Blocks: FastShipB1F_Blocks:
INCBIN "maps/FastShipB1F.blk" INCBIN "maps/FastShipB1F.blk"
BetaFastShipInsideCutOut_Blocks: BetaFastShipInsideCutOut_Blocks: ; unreferenced
INCBIN "maps/unused/BetaFastShipInsideCutOut.blk" INCBIN "maps/unused/BetaFastShipInsideCutOut.blk"
FastShipCabins_NNW_NNE_NE_Blocks: FastShipCabins_NNW_NNE_NE_Blocks:
@ -913,13 +913,13 @@ PewterGym_Blocks:
CeladonGym_Blocks: CeladonGym_Blocks:
INCBIN "maps/CeladonGym.blk" INCBIN "maps/CeladonGym.blk"
BetaCeladonMansion1F_Blocks: BetaCeladonMansion1F_Blocks: ; unreferenced
INCBIN "maps/unused/BetaCeladonMansion1F.blk" INCBIN "maps/unused/BetaCeladonMansion1F.blk"
CeladonCafe_Blocks: CeladonCafe_Blocks:
INCBIN "maps/CeladonCafe.blk" INCBIN "maps/CeladonCafe.blk"
BetaCeladonMansion2F_Blocks: BetaCeladonMansion2F_Blocks: ; unreferenced
INCBIN "maps/unused/BetaCeladonMansion2F.blk" INCBIN "maps/unused/BetaCeladonMansion2F.blk"
RockTunnel1F_Blocks: RockTunnel1F_Blocks:
@ -1040,7 +1040,7 @@ BattleTowerElevator_Blocks:
BattleTowerOutside_Blocks: BattleTowerOutside_Blocks:
INCBIN "maps/BattleTowerOutside.blk" INCBIN "maps/BattleTowerOutside.blk"
BetaBlank_Blocks: BetaBlank_Blocks: ; unreferenced
INCBIN "maps/unused/BetaBlank.blk" INCBIN "maps/unused/BetaBlank.blk"
GoldenrodDeptStoreRoof_Blocks: GoldenrodDeptStoreRoof_Blocks:

View File

@ -128,7 +128,7 @@ WhirlIslandsName: db "WHIRL¯ISLANDS@"
MtMortarName: db "MT.MORTAR@" MtMortarName: db "MT.MORTAR@"
DragonsDenName: db "DRAGON'S¯DEN@" DragonsDenName: db "DRAGON'S¯DEN@"
IcePathName: db "ICE PATH@" IcePathName: db "ICE PATH@"
NotApplicableName: db "N/A@" ; "オバケやしき" ("HAUNTED HOUSE") in Japanese NotApplicableName: db "N/A@" ; unreferenced ; "オバケやしき" ("HAUNTED HOUSE") in Japanese
PalletTownName: db "PALLET TOWN@" PalletTownName: db "PALLET TOWN@"
ViridianCityName: db "VIRIDIAN¯CITY@" ViridianCityName: db "VIRIDIAN¯CITY@"
PewterCityName: db "PEWTER CITY@" PewterCityName: db "PEWTER CITY@"
@ -144,11 +144,11 @@ VictoryRoadName: db "VICTORY¯ROAD@"
MtMoonName: db "MT.MOON@" MtMoonName: db "MT.MOON@"
RockTunnelName: db "ROCK TUNNEL@" RockTunnelName: db "ROCK TUNNEL@"
LavRadioTowerName: db "LAV¯RADIO TOWER@" LavRadioTowerName: db "LAV¯RADIO TOWER@"
SilphCoName: db "SILPH CO.@" SilphCoName: db "SILPH CO.@" ; unreferenced
SafariZoneName: db "SAFARI ZONE@" SafariZoneName: db "SAFARI ZONE@" ; unreferenced
SeafoamIslandsName: db "SEAFOAM¯ISLANDS@" SeafoamIslandsName: db "SEAFOAM¯ISLANDS@"
PokemonMansionName: db "#MON¯MANSION@" PokemonMansionName: db "#MON¯MANSION@" ; unreferenced
CeruleanCaveName: db "CERULEAN¯CAVE@" CeruleanCaveName: db "CERULEAN¯CAVE@" ; unreferenced
Route1Name: db "ROUTE 1@" Route1Name: db "ROUTE 1@"
Route2Name: db "ROUTE 2@" Route2Name: db "ROUTE 2@"
Route3Name: db "ROUTE 3@" Route3Name: db "ROUTE 3@"
@ -199,7 +199,7 @@ DarkCaveName: db "DARK CAVE@"
IlexForestName: db "ILEX¯FOREST@" IlexForestName: db "ILEX¯FOREST@"
BurnedTowerName: db "BURNED¯TOWER@" BurnedTowerName: db "BURNED¯TOWER@"
FastShipName: db "FAST SHIP@" FastShipName: db "FAST SHIP@"
ViridianForestName: db "VIRIDIAN¯FOREST@" ViridianForestName: db "VIRIDIAN¯FOREST@" ; unreferenced
DiglettsCaveName: db "DIGLETT'S¯CAVE@" DiglettsCaveName: db "DIGLETT'S¯CAVE@"
TohjoFallsName: db "TOHJO FALLS@" TohjoFallsName: db "TOHJO FALLS@"
UndergroundName: db "UNDERGROUND@" UndergroundName: db "UNDERGROUND@"

View File

@ -481,7 +481,7 @@ BattleAnim_SendOutMon:
BattleAnim_ReturnMon: BattleAnim_ReturnMon:
anim_sound 0, 0, SFX_BALL_POOF anim_sound 0, 0, SFX_BALL_POOF
.anim: BattleAnimSub_Return:
anim_bgeffect ANIM_BG_RETURN_MON, $0, BG_EFFECT_USER, $0 anim_bgeffect ANIM_BG_RETURN_MON, $0, BG_EFFECT_USER, $0
anim_wait 32 anim_wait 32
anim_ret anim_ret
@ -1314,7 +1314,7 @@ BattleAnim_RazorWind:
anim_wait 24 anim_wait 24
anim_ret anim_ret
BattleAnim_Sonicboom_JP: BattleAnim_Sonicboom_JP: ; unreferenced
anim_2gfx ANIM_GFX_WHIP, ANIM_GFX_HIT anim_2gfx ANIM_GFX_WHIP, ANIM_GFX_HIT
.loop .loop
anim_sound 3, 0, SFX_RAZOR_WIND anim_sound 3, 0, SFX_RAZOR_WIND
@ -4106,7 +4106,7 @@ BattleAnim_BatonPass:
anim_1gfx ANIM_GFX_MISC anim_1gfx ANIM_GFX_MISC
anim_obj ANIM_OBJ_BATON_PASS, 44, 104, $20 anim_obj ANIM_OBJ_BATON_PASS, 44, 104, $20
anim_sound 0, 0, SFX_BATON_PASS anim_sound 0, 0, SFX_BATON_PASS
anim_call BattleAnim_ReturnMon.anim anim_call BattleAnimSub_Return
anim_wait 64 anim_wait 64
anim_ret anim_ret

View File

@ -197,7 +197,6 @@ ElmPhoneGiftText:
para "See you later!" para "See you later!"
done done
; unused
ElmPhoneGotAholdOfSomethingNeatText: ElmPhoneGotAholdOfSomethingNeatText:
text "Hello, <PLAY_G>?" text "Hello, <PLAY_G>?"
line "How's it going?" line "How's it going?"

View File

@ -57,9 +57,8 @@ ToddRematchText:
line "my #MON better!" line "my #MON better!"
done done
UnusedText_0xa43ca: ToddSaleText: ; unreferenced
; This is unused; Todd says this during the department store sale, ; This is a duplicate of CamperToddSaleText in maps/Route34.asm.
; but this is a duplicate of the actual string in the Route 34 scripts.
text "Shopping under the" text "Shopping under the"
line "sky!" line "sky!"

View File

@ -1102,7 +1102,7 @@ BattleText_LinkErrorBattleCanceled:
line "been canceled…" line "been canceled…"
prompt prompt
BattleText_0x8188e: BattleText_NoTimeLeftToday: ; unreferenced
text "There is no time" text "There is no time"
line "left today!" line "left today!"
done done

View File

@ -463,7 +463,6 @@ _MobileForPartnersMonText::
text "." text "."
done done
; unreferenced
_MobilePlayersMonTradeText:: _MobilePlayersMonTradeText::
text_ram wPlayerTrademonSenderName text_ram wPlayerTrademonSenderName
text "'s" text "'s"

View File

@ -263,12 +263,12 @@ _MysteryGiftSentHomeText::
_MysteryGiftReceivedCardText:: _MysteryGiftReceivedCardText::
text "Received" text "Received"
line "@" line "@"
text_ram wc850 text_ram wMysteryGiftCardHolderName
text "'s CARD." text "'s CARD."
prompt prompt
_MysteryGiftListedCardText:: _MysteryGiftListedCardText::
text_ram wc850 text_ram wMysteryGiftCardHolderName
text "'s CARD was" text "'s CARD was"
line "listed as no.@" line "listed as no.@"
text_decimal wDeciramBuffer, 1, 2 text_decimal wDeciramBuffer, 1, 2
@ -487,7 +487,6 @@ _RodNothingText::
text "Not even a nibble!" text "Not even a nibble!"
prompt prompt
; unreferenced
_UnusedNothingHereText:: _UnusedNothingHereText::
text "Looks like there's" text "Looks like there's"
line "nothing here." line "nothing here."

View File

@ -620,7 +620,6 @@ _PharmacyComeAgainText::
line "See you around." line "See you around."
done done
; unreferenced
_NothingToSellText:: _NothingToSellText::
text "You don't have" text "You don't have"
line "anything to sell." line "anything to sell."
@ -744,25 +743,21 @@ _MainMenuTimeUnknownText::
text "Clock time unknown" text "Clock time unknown"
done done
; unreferenced mobile
_DeleteSavedLoginPasswordText:: _DeleteSavedLoginPasswordText::
text "Delete the saved" text "Delete the saved"
line "LOG-IN PASSWORD?" line "LOG-IN PASSWORD?"
done done
; unreferenced mobile
_DeletedTheLoginPasswordText:: _DeletedTheLoginPasswordText::
text "Deleted the LOG-IN" text "Deleted the LOG-IN"
line "PASSWORD." line "PASSWORD."
done done
; unreferenced mobile
_MobilePickThreeMonForBattle:: _MobilePickThreeMonForBattle::
text "Pick three #MON" text "Pick three #MON"
line "for battle." line "for battle."
prompt prompt
; unreferenced mobile
_MobileUseTheseThreeMonText:: _MobileUseTheseThreeMonText::
text_ram wMobileParticipant1Nickname text_ram wMobileParticipant1Nickname
text "," text ","
@ -776,13 +771,11 @@ _MobileUseTheseThreeMonText::
para "Use these three?" para "Use these three?"
done done
; unreferenced mobile
_MobileOnlyThreeMonMayEnterText:: _MobileOnlyThreeMonMayEnterText::
text "Only three #MON" text "Only three #MON"
line "may enter." line "may enter."
prompt prompt
; unreferenced mobile
_MobileCardFolderIntro1Text:: _MobileCardFolderIntro1Text::
text "The CARD FOLDER" text "The CARD FOLDER"
line "stores your and" line "stores your and"
@ -800,7 +793,6 @@ _MobileCardFolderIntro1Text::
para "" para ""
done done
; unreferenced mobile
_MobileCardFolderIntro2Text:: _MobileCardFolderIntro2Text::
text "This is your CARD." text "This is your CARD."
@ -814,7 +806,6 @@ _MobileCardFolderIntro2Text::
para "" para ""
done done
; unreferenced mobile
_MobileCardFolderIntro3Text:: _MobileCardFolderIntro3Text::
text "If you have your" text "If you have your"
line "friend's CARD, you" line "friend's CARD, you"
@ -829,7 +820,6 @@ _MobileCardFolderIntro3Text::
para "" para ""
done done
; unreferenced mobile
_MobileCardFolderIntro4Text:: _MobileCardFolderIntro4Text::
text "To safely store" text "To safely store"
line "your collection of" line "your collection of"
@ -841,7 +831,6 @@ _MobileCardFolderIntro4Text::
para "" para ""
done done
; unreferenced mobile
_MobileCardFolderAskDeleteText:: _MobileCardFolderAskDeleteText::
text "If the CARD FOLDER" text "If the CARD FOLDER"
line "is deleted, all" line "is deleted, all"
@ -858,13 +847,11 @@ _MobileCardFolderAskDeleteText::
line "your CARD FOLDER?" line "your CARD FOLDER?"
done done
; unreferenced mobile
_MobileCardFolderDeleteAreYouSureText:: _MobileCardFolderDeleteAreYouSureText::
text "Are you sure you" text "Are you sure you"
line "want to delete it?" line "want to delete it?"
done done
; unreferenced mobile
_MobileCardFolderDeletedText:: _MobileCardFolderDeletedText::
text "The CARD FOLDER" text "The CARD FOLDER"
line "has been deleted." line "has been deleted."
@ -872,7 +859,6 @@ _MobileCardFolderDeletedText::
para "" para ""
done done
; unreferenced mobile
_MobileCardFolderAskOpenOldText:: _MobileCardFolderAskOpenOldText::
text "There is an older" text "There is an older"
line "CARD FOLDER from a" line "CARD FOLDER from a"
@ -882,13 +868,11 @@ _MobileCardFolderAskOpenOldText::
line "open it?" line "open it?"
done done
; unreferenced mobile
_MobileCardFolderAskDeleteOldText:: _MobileCardFolderAskDeleteOldText::
text "Delete the old" text "Delete the old"
line "CARD FOLDER?" line "CARD FOLDER?"
done done
; unreferenced mobile
_MobileCardFolderFinishRegisteringCardsText:: _MobileCardFolderFinishRegisteringCardsText::
text "Finish registering" text "Finish registering"
line "CARDS?" line "CARDS?"

View File

@ -8,7 +8,7 @@
; Most of these texts seem to be associated with a single NPC. ; Most of these texts seem to be associated with a single NPC.
; The last text is associated with a second NPC, probably a Butterfree. ; The last text is associated with a second NPC, probably a Butterfree.
UnusedSweetHoneyText: UnusedSweetHoneyText: ; unreferenced
text "My #MON is an" text "My #MON is an"
line "expert at collect-" line "expert at collect-"
cont "ing SWEET HONEY." cont "ing SWEET HONEY."
@ -17,7 +17,7 @@ UnusedSweetHoneyText:
line "with you." line "with you."
done done
UnusedSweetHoneyBagFullText: UnusedSweetHoneyBagFullText: ; unreferenced
text "I want to give you" text "I want to give you"
line "some SWEET HONEY," line "some SWEET HONEY,"
@ -25,17 +25,17 @@ UnusedSweetHoneyBagFullText:
line "room for it." line "room for it."
done done
UnusedSweetHoneyGiveText: UnusedSweetHoneyGiveText: ; unreferenced
text "Here you go! Have" text "Here you go! Have"
line "some SWEET HONEY!" line "some SWEET HONEY!"
done done
UnusedGotSweetHoneyText: UnusedGotSweetHoneyText: ; unreferenced
text "<PLAYER> received" text "<PLAYER> received"
line "SWEET HONEY." line "SWEET HONEY."
done done
UnusedSweetHoneyAfterText1: UnusedSweetHoneyAfterText1: ; unreferenced
text "My little brother" text "My little brother"
line "takes SWEET HONEY" line "takes SWEET HONEY"
@ -46,7 +46,7 @@ UnusedSweetHoneyAfterText1:
line "up to?" line "up to?"
done done
UnusedSweetHoneyAfterText2: UnusedSweetHoneyAfterText2: ; unreferenced
text "Did you put SWEET" text "Did you put SWEET"
line "HONEY on a tree?" line "HONEY on a tree?"
@ -54,7 +54,7 @@ UnusedSweetHoneyAfterText2:
line "it?" line "it?"
done done
UnusedSweetHoneyAfterText3: UnusedSweetHoneyAfterText3: ; unreferenced
text "Did you put SWEET" text "Did you put SWEET"
line "HONEY on a tree?" line "HONEY on a tree?"
@ -63,6 +63,6 @@ UnusedSweetHoneyAfterText3:
cont "be drawn to it." cont "be drawn to it."
done done
UnusedSweetHoneyButterfreeText: UnusedSweetHoneyButterfreeText: ; unreferenced
text "BUTTERFREE: Freeh!" text "BUTTERFREE: Freeh!"
done done

View File

@ -20,8 +20,9 @@ AI_SwitchOrTryItem:
and a and a
jr nz, DontSwitch jr nz, DontSwitch
; always load the first trainer class in wTrainerClass for Battle Tower trainers
ld hl, TrainerClassAttributes + TRNATTR_AI_ITEM_SWITCH ld hl, TrainerClassAttributes + TRNATTR_AI_ITEM_SWITCH
ld a, [wInBattleTowerBattle] ; always load the first trainer class in wTrainerClass for BattleTower-Trainers ld a, [wInBattleTowerBattle]
and a and a
jr nz, .ok jr nz, .ok
@ -29,6 +30,7 @@ AI_SwitchOrTryItem:
dec a dec a
ld bc, NUM_TRAINER_ATTRIBUTES ld bc, NUM_TRAINER_ATTRIBUTES
call AddNTimes call AddNTimes
.ok .ok
bit SWITCH_OFTEN_F, [hl] bit SWITCH_OFTEN_F, [hl]
jp nz, SwitchOften jp nz, SwitchOften
@ -145,13 +147,13 @@ SwitchSometimes:
ld [wEnemySwitchMonIndex], a ld [wEnemySwitchMonIndex], a
jp AI_TrySwitch jp AI_TrySwitch
CheckSubstatusCantRun: CheckSubstatusCantRun: ; unreferenced
ld a, [wEnemySubStatus5] ld a, [wEnemySubStatus5]
bit SUBSTATUS_CANT_RUN, a bit SUBSTATUS_CANT_RUN, a
ret ret
AI_TryItem: AI_TryItem:
; items are not allowed in the BattleTower ; items are not allowed in the Battle Tower
ld a, [wInBattleTowerBattle] ld a, [wInBattleTowerBattle]
and a and a
ret nz ret nz
@ -213,7 +215,7 @@ AI_TryItem:
inc hl inc hl
jr c, .loop jr c, .loop
.used_item ; used item
xor a xor a
ld [de], a ld [de], a
inc a inc a
@ -259,7 +261,7 @@ AI_TryItem:
cp e cp e
jr nc, .yes jr nc, .yes
.no .no ; unreferenced
and a and a
ret ret

View File

@ -449,7 +449,7 @@ ENDM
spin_quadrant LOWER_LEFT, .wedge1, 1, 11 spin_quadrant LOWER_LEFT, .wedge1, 1, 11
db -1 db -1
.load .load:
ld a, [hli] ld a, [hli]
ld e, a ld e, a
ld a, [hli] ld a, [hli]

View File

@ -1697,7 +1697,7 @@ HandleWeather:
cp USING_EXTERNAL_CLOCK cp USING_EXTERNAL_CLOCK
jr z, .enemy_first jr z, .enemy_first
.player_first ; player first
call SetPlayerTurn call SetPlayerTurn
call .SandstormDamage call .SandstormDamage
call SetEnemyTurn call SetEnemyTurn
@ -2711,7 +2711,7 @@ AskUseNextPokemon:
ForcePlayerMonChoice: ForcePlayerMonChoice:
call EmptyBattleTextbox call EmptyBattleTextbox
call LoadStandardMenuHeader call LoadStandardMenuHeader
call SetUpBattlePartyMenu_NoLoop call SetUpBattlePartyMenu
call ForcePickPartyMonInBattle call ForcePickPartyMonInBattle
ld a, [wLinkMode] ld a, [wLinkMode]
and a and a
@ -2810,9 +2810,9 @@ IsMobileBattle:
cp LINK_MOBILE cp LINK_MOBILE
ret ret
SetUpBattlePartyMenu_NoLoop: SetUpBattlePartyMenu:
call ClearBGPalettes call ClearBGPalettes
SetUpBattlePartyMenu: ; switch to fullscreen menu? SetUpBattlePartyMenu_Loop: ; switch to fullscreen menu?
farcall LoadPartyMenuGFX farcall LoadPartyMenuGFX
farcall InitPartyMenuWithCancel farcall InitPartyMenuWithCancel
farcall InitPartyMenuBGPal7 farcall InitPartyMenuBGPal7
@ -3486,7 +3486,7 @@ OfferSwitch:
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
dec a dec a
jr nz, .said_no jr nz, .said_no
call SetUpBattlePartyMenu_NoLoop call SetUpBattlePartyMenu
call PickSwitchMonInBattle call PickSwitchMonInBattle
jr c, .canceled_switch jr c, .canceled_switch
ld a, [wCurBattleMon] ld a, [wCurBattleMon]
@ -5043,7 +5043,7 @@ BattleMenuPKMN_ReturnFromStats:
call LoadStandardMenuHeader call LoadStandardMenuHeader
call ClearBGPalettes call ClearBGPalettes
BattleMenuPKMN_Loop: BattleMenuPKMN_Loop:
call SetUpBattlePartyMenu call SetUpBattlePartyMenu_Loop
xor a xor a
ld [wPartyMenuActionText], a ld [wPartyMenuActionText], a
call JumpToPartyMenuAndPrintText call JumpToPartyMenuAndPrintText
@ -8952,13 +8952,13 @@ InitBattleDisplay:
ldh [rSVBK], a ldh [rSVBK], a
ld hl, wDecompressScratch ld hl, wDecompressScratch
ld bc, wScratchAttrmap - wDecompressScratch ld bc, BG_MAP_WIDTH * BG_MAP_HEIGHT
ld a, " " ld a, " "
call ByteFill call ByteFill
ld de, wDecompressScratch ld de, wDecompressScratch
hlbgcoord 0, 0 hlbgcoord 0, 0
lb bc, BANK(.BlankBGMap), $40 lb bc, BANK(@), (BG_MAP_WIDTH * BG_MAP_HEIGHT) / LEN_2BPP_TILE
call Request2bpp call Request2bpp
pop af pop af

View File

@ -134,7 +134,7 @@ BattleCommand_CheckTurn:
and a and a
jp nz, CheckEnemyTurn jp nz, CheckEnemyTurn
CheckPlayerTurn: ; check player turn
ld hl, wPlayerSubStatus4 ld hl, wPlayerSubStatus4
bit SUBSTATUS_RECHARGE, [hl] bit SUBSTATUS_RECHARGE, [hl]
jr z, .no_recharge jr z, .no_recharge
@ -2586,7 +2586,7 @@ PlayerAttackDamage:
cp SPECIAL cp SPECIAL
jr nc, .special jr nc, .special
.physical ; physical
ld hl, wEnemyMonDefense ld hl, wEnemyMonDefense
ld a, [hli] ld a, [hli]
ld b, a ld b, a
@ -2826,9 +2826,9 @@ EnemyAttackDamage:
ld a, [hl] ld a, [hl]
cp SPECIAL cp SPECIAL
jr nc, .Special jr nc, .special
.physical ; physical
ld hl, wBattleMonDefense ld hl, wBattleMonDefense
ld a, [hli] ld a, [hli]
ld b, a ld b, a
@ -2852,7 +2852,7 @@ EnemyAttackDamage:
ld hl, wEnemyAttack ld hl, wEnemyAttack
jr .thickclub jr .thickclub
.Special: .special
ld hl, wBattleMonSpclDef ld hl, wBattleMonSpclDef
ld a, [hli] ld a, [hli]
ld b, a ld b, a
@ -6124,7 +6124,7 @@ INCLUDE "engine/battle/move_effects/conversion.asm"
BattleCommand_ResetStats: BattleCommand_ResetStats:
; resetstats ; resetstats
ld a, 7 ; neutral ld a, BASE_STAT_LEVEL
ld hl, wPlayerStatLevels ld hl, wPlayerStatLevels
call .Fill call .Fill
ld hl, wEnemyStatLevels ld hl, wEnemyStatLevels
@ -6147,7 +6147,7 @@ BattleCommand_ResetStats:
jp StdBattleTextbox jp StdBattleTextbox
.Fill: .Fill:
ld b, wPlayerStatLevelsEnd - wPlayerStatLevels ld b, NUM_LEVEL_STATS
.next .next
ld [hli], a ld [hli], a
dec b dec b

View File

@ -9,8 +9,7 @@ LoadBattleMenu:
call ExitMenu call ExitMenu
ret ret
SafariBattleMenu: SafariBattleMenu: ; unreferenced
; untranslated
ld hl, SafariBattleMenuHeader ld hl, SafariBattleMenuHeader
call LoadMenuHeader call LoadMenuHeader
jr CommonBattleMenu jr CommonBattleMenu
@ -18,7 +17,8 @@ SafariBattleMenu:
ContestBattleMenu: ContestBattleMenu:
ld hl, ContestBattleMenuHeader ld hl, ContestBattleMenuHeader
call LoadMenuHeader call LoadMenuHeader
; fallthrough ; fallthrough
CommonBattleMenu: CommonBattleMenu:
ld a, [wBattleMenuCursorBuffer] ld a, [wBattleMenuCursorBuffer]
ld [wMenuCursorBuffer], a ld [wMenuCursorBuffer], a

View File

@ -17,7 +17,7 @@ BattleCommand_BatonPass:
; Transition into switchmon menu ; Transition into switchmon menu
call LoadStandardMenuHeader call LoadStandardMenuHeader
farcall SetUpBattlePartyMenu_NoLoop farcall SetUpBattlePartyMenu
farcall ForcePickSwitchMonInBattle farcall ForcePickSwitchMonInBattle

View File

@ -1050,7 +1050,7 @@ GetMinimizePic:
and a and a
jr z, .player jr z, .player
ld de, sScratch + $1a tiles ld de, sScratch + (3 * 7 + 5) tiles
call CopyMinimizePic call CopyMinimizePic
ld hl, vTiles2 tile $00 ld hl, vTiles2 tile $00
ld de, sScratch ld de, sScratch
@ -1058,7 +1058,7 @@ GetMinimizePic:
ret ret
.player .player
ld de, sScratch + $160 ld de, sScratch + (3 * 6 + 4) tiles
call CopyMinimizePic call CopyMinimizePic
ld hl, vTiles2 tile $31 ld hl, vTiles2 tile $31
ld de, sScratch ld de, sScratch

View File

@ -263,14 +263,12 @@ InitBattleAnimBuffer:
jr nz, .no_sub jr nz, .no_sub
ld a, [wFXAnimID] ld a, [wFXAnimID]
cp KINESIS cp KINESIS
jr z, .kinesis jr z, .do_sub
cp SOFTBOILED cp SOFTBOILED
jr z, .softboiled jr z, .do_sub
cp MILK_DRINK cp MILK_DRINK
jr nz, .no_sub jr nz, .no_sub
.kinesis .do_sub
.softboiled
.milk_drink
pop af pop af
sub 1 * 8 sub 1 * 8
jr .done jr .done

View File

@ -4299,14 +4299,14 @@ BattleAnim_Cosine_e:
ld e, a ld e, a
ret ret
BattleAnim_AbsSinePrecise: BattleAnim_AbsSinePrecise: ; unreferenced
ld a, e ld a, e
call BattleAnim_Sine call BattleAnim_Sine
ld e, l ld e, l
ld d, h ld d, h
ret ret
BattleAnim_AbsCosinePrecise: BattleAnim_AbsCosinePrecise: ; unreferenced
ld a, e ld a, e
call BattleAnim_Cosine call BattleAnim_Cosine
ld e, l ld e, l

View File

@ -32,7 +32,7 @@
const DEBUGCOLORMAIN_INITTMHM ; 4 const DEBUGCOLORMAIN_INITTMHM ; 4
const DEBUGCOLORMAIN_TMHMJOYPAD ; 5 const DEBUGCOLORMAIN_TMHMJOYPAD ; 5
DebugColorPicker: DebugColorPicker: ; unreferenced
; A debug menu to test monster and trainer palettes at runtime. ; A debug menu to test monster and trainer palettes at runtime.
ldh a, [hCGB] ldh a, [hCGB]
and a and a
@ -1069,7 +1069,7 @@ INCBIN "gfx/debug/up_arrow.2bpp"
DebugColor_GFX: DebugColor_GFX:
INCBIN "gfx/debug/color_test.2bpp" INCBIN "gfx/debug/color_test.2bpp"
TilesetColorPicker: TilesetColorPicker: ; unreferenced
; A debug menu to test tileset palettes at runtime. ; A debug menu to test tileset palettes at runtime.
; dummied out ; dummied out
ret ret

View File

@ -1328,9 +1328,9 @@ DebugRoom_BoxStructStrings:
.Move4: db "MOVE 4@" .Move4: db "MOVE 4@"
.ID0: db "ID[0]@" .ID0: db "ID[0]@"
.ID1: db "ID[1]@" .ID1: db "ID[1]@"
.BaseExp0: db "BASE EXP[0]@" .BaseExp0: db "BASE EXP[0]@" ; unreferenced
.BaseExp1: db "BASE EXP[1]@" .BaseExp1: db "BASE EXP[1]@" ; unreferenced
.BaseExp2: db "BASE EXP[2]@" .BaseExp2: db "BASE EXP[2]@" ; unreferenced
.HPExp0: db "HP EXP[0]@" .HPExp0: db "HP EXP[0]@"
.HPExp1: db "HP EXP[1]@" .HPExp1: db "HP EXP[1]@"
.AttkExp0: db "ATTK EXP[0]@" .AttkExp0: db "ATTK EXP[0]@"

View File

@ -67,7 +67,7 @@ Function170114:
call Function170c8b call Function170c8b
ret ret
Function170139: Function170139: ; unreferenced
; Convert the 4-digit decimal number at s5_aa41 into binary ; Convert the 4-digit decimal number at s5_aa41 into binary
ld a, BANK(s5_aa41) ld a, BANK(s5_aa41)
call OpenSRAM call OpenSRAM
@ -374,7 +374,7 @@ ReadBTTrainerParty:
ld [bc], a ld [bc], a
ret ret
ValidateBTParty: ValidateBTParty: ; unreferenced
; Check for and fix errors in party data ; Check for and fix errors in party data
ld hl, wBT_OTTempMon1Species ld hl, wBT_OTTempMon1Species
ld d, BATTLETOWER_PARTY_LENGTH ld d, BATTLETOWER_PARTY_LENGTH
@ -386,7 +386,7 @@ ValidateBTParty:
ld a, [hl] ld a, [hl]
and a and a
x = $ff x = $ff
rept ($ff - NUM_POKEMON) rept $ff - NUM_POKEMON
jr z, .invalid jr z, .invalid
cp x cp x
x = x - 1 x = x - 1

View File

@ -95,7 +95,7 @@ Function_LoadRandomBattleTowerMon:
ld c, BATTLETOWER_PARTY_LENGTH ld c, BATTLETOWER_PARTY_LENGTH
.loop .loop
push bc push bc
ld a, BANK(sBTMonPrevTrainer1) ld a, BANK(sBTMonOfTrainers)
call OpenSRAM call OpenSRAM
.FindARandomBattleTowerMon: .FindARandomBattleTowerMon:

View File

@ -85,7 +85,7 @@ BuenaPrize:
call Buena_PrizeMenu call Buena_PrizeMenu
jr z, .done jr z, .done
ld [wMenuSelectionQuantity], a ld [wMenuSelectionQuantity], a
call Buena_getprize call Buena_GetPrize
ld a, [hl] ld a, [hl]
ld [wNamedObjectIndexBuffer], a ld [wNamedObjectIndexBuffer], a
call GetItemName call GetItemName
@ -95,7 +95,7 @@ BuenaPrize:
jr c, .loop jr c, .loop
ld a, [wMenuSelectionQuantity] ld a, [wMenuSelectionQuantity]
call Buena_getprize call Buena_GetPrize
inc hl inc hl
ld a, [hld] ld a, [hld]
ld c, a ld c, a
@ -258,11 +258,11 @@ Buena_PrizeMenu:
db SCROLLINGMENU_DISPLAY_ARROWS ; flags db SCROLLINGMENU_DISPLAY_ARROWS ; flags
db 4, 13 ; rows, columns db 4, 13 ; rows, columns
db SCROLLINGMENU_ITEMS_NORMAL ; item format db SCROLLINGMENU_ITEMS_NORMAL ; item format
dba .indices dba .Prizes
dba .prizeitem dba .PrintPrizeItem
dba .prizepoints dba .PrintPrizePoints
.indices: .Prizes:
db NUM_BUENA_PRIZES db NUM_BUENA_PRIZES
x = 1 x = 1
rept NUM_BUENA_PRIZES rept NUM_BUENA_PRIZES
@ -271,9 +271,9 @@ x = x + 1
endr endr
db -1 db -1
.prizeitem: .PrintPrizeItem:
ld a, [wMenuSelection] ld a, [wMenuSelection]
call Buena_getprize call Buena_GetPrize
ld a, [hl] ld a, [hl]
push de push de
ld [wNamedObjectIndexBuffer], a ld [wNamedObjectIndexBuffer], a
@ -282,9 +282,9 @@ endr
call PlaceString call PlaceString
ret ret
.prizepoints: .PrintPrizePoints:
ld a, [wMenuSelection] ld a, [wMenuSelection]
call Buena_getprize call Buena_GetPrize
inc hl inc hl
ld a, [hl] ld a, [hl]
ld c, "0" ld c, "0"
@ -292,7 +292,7 @@ endr
ld [de], a ld [de], a
ret ret
Buena_getprize: Buena_GetPrize:
dec a dec a
ld hl, BuenaPrizeItems ld hl, BuenaPrizeItems
ld b, 0 ld b, 0

View File

@ -1,6 +1,6 @@
SPECIALCELEBIEVENT_CELEBI EQU $84 SPECIALCELEBIEVENT_CELEBI EQU $84
UnusedForestTreeFrames: UnusedForestTreeFrames: ; unreferenced
INCBIN "gfx/tilesets/forest-tree/1.2bpp" INCBIN "gfx/tilesets/forest-tree/1.2bpp"
INCBIN "gfx/tilesets/forest-tree/2.2bpp" INCBIN "gfx/tilesets/forest-tree/2.2bpp"
INCBIN "gfx/tilesets/forest-tree/3.2bpp" INCBIN "gfx/tilesets/forest-tree/3.2bpp"
@ -99,8 +99,7 @@ CelebiEvent_CountDown:
set 7, [hl] set 7, [hl]
ret ret
CelebiEvent_SpawnLeaf: CelebiEvent_SpawnLeaf: ; unreferenced
; unused
ld hl, wcf65 ld hl, wcf65
ld a, [hl] ld a, [hl]
inc [hl] inc [hl]

View File

@ -166,7 +166,7 @@ DayCareAskDepositPokemon:
scf scf
ret ret
.DaycareDummyText: .DaycareDummyText: ; unreferenced
text_far _DaycareDummyText text_far _DaycareDummyText
text_end text_end

View File

@ -57,7 +57,7 @@ EngineFlagAction::
jr z, .set ; b = 1 jr z, .set ; b = 1
; Return the given flag in c. ; Return the given flag in c.
.check ; check
ld a, [de] ld a, [de]
and c and c
ld c, a ld c, a

View File

@ -56,7 +56,7 @@ HealMachineAnim:
.Pointers: .Pointers:
; entries correspond to HEALMACHINE_* constants ; entries correspond to HEALMACHINE_* constants
dw .Pokecenter dw .Pokecenter
dw .ElmLab dw .ElmsLab
dw .HallOfFame dw .HallOfFame
healmachineanimseq: MACRO healmachineanimseq: MACRO
@ -68,7 +68,7 @@ ENDM
.Pokecenter: .Pokecenter:
healmachineanimseq LOADGFX, PCLOADBALLS, PLAYMUSIC, FINISH healmachineanimseq LOADGFX, PCLOADBALLS, PLAYMUSIC, FINISH
.ElmLab: .ElmsLab:
healmachineanimseq LOADGFX, PCLOADBALLS, PLAYMUSIC, FINISH healmachineanimseq LOADGFX, PCLOADBALLS, PLAYMUSIC, FINISH
.HallOfFame: .HallOfFame:
healmachineanimseq LOADGFX, HOFLOADBALLS, HOFPLAYSFX, FINISH healmachineanimseq LOADGFX, HOFLOADBALLS, HOFPLAYSFX, FINISH

View File

@ -69,7 +69,7 @@ MagnetTrain:
ld [wRequested2bppSource + 1], a ld [wRequested2bppSource + 1], a
ld [wRequested2bppDest], a ld [wRequested2bppDest], a
ld [wRequested2bppDest + 1], a ld [wRequested2bppDest + 1], a
ld [wRequested2bpp], a ld [wRequested2bppSize], a
call ClearTilemap call ClearTilemap
pop af pop af

View File

@ -1414,7 +1414,7 @@ HasRockSmash:
ld d, ROCK_SMASH ld d, ROCK_SMASH
call CheckPartyMove call CheckPartyMove
jr nc, .yes jr nc, .yes
.no ; no
ld a, 1 ld a, 1
jr .done jr .done
.yes .yes
@ -1616,7 +1616,7 @@ RodNothingText:
text_far _RodNothingText text_far _RodNothingText
text_end text_end
UnusedNothingHereText: ; unused UnusedNothingHereText: ; unreferenced
text_far _UnusedNothingHereText text_far _UnusedNothingHereText
text_end text_end

View File

@ -149,6 +149,6 @@ DoPoisonStep::
text_far _PoisonFaintText text_far _PoisonFaintText
text_end text_end
.PoisonWhiteoutText: .PoisonWhiteoutText: ; unreferenced
text_far _PoisonWhiteoutText text_far _PoisonWhiteoutText
text_end text_end

View File

@ -30,7 +30,7 @@ RotateUnownFrontpic:
cp 7 * 7 cp 7 * 7
jr c, .loop jr c, .loop
ld hl, wGameboyPrinterRAM ld hl, wGameboyPrinter2bppSource
ld de, sScratch ld de, sScratch
ld bc, 7 * 7 tiles ld bc, 7 * 7 tiles
call CopyBytes call CopyBytes
@ -100,7 +100,7 @@ y = 0
rept \1 rept \1
x = \1 * (\2 - 1) + y x = \1 * (\2 - 1) + y
rept \2 rept \2
dw wGameboyPrinterRAM tile x dw wGameboyPrinter2bppSource tile x
x = x - \2 x = x - \2
endr endr
y = y + 1 y = y + 1

View File

@ -380,17 +380,17 @@ GameboyCheck:
ldh a, [hCGB] ldh a, [hCGB]
and a and a
jr nz, .cgb jr nz, .cgb
ldh a, [hSGB] ldh a, [hSGB]
and a and a
jr nz, .sgb jr nz, .sgb
; gb
.gb
xor a ; GBCHECK_GB xor a ; GBCHECK_GB
jr .done jr .done
.sgb .sgb
ld a, GBCHECK_SGB ld a, GBCHECK_SGB
jr .done jr .done
.cgb .cgb
ld a, GBCHECK_CGB ld a, GBCHECK_CGB
.done .done

View File

@ -210,7 +210,7 @@ GetTreeScore:
cp 5 cp 5
jr c, .good jr c, .good
.bad ; bad
xor a ; TREEMON_SCORE_BAD xor a ; TREEMON_SCORE_BAD
ret ret

View File

@ -1,7 +1,8 @@
CARDFLIP_LIGHT_OFF EQU "♂" ; $ef CARDFLIP_LIGHT_OFF EQU "♂" ; $ef
CARDFLIP_LIGHT_ON EQU "♀" ; $f5 CARDFLIP_LIGHT_ON EQU "♀" ; $f5
CARDFLIP_DECK_SIZE EQU 4 * 6 CARDFLIP_DECK_SIZE EQUS "(wDeckEnd - wDeck)"
assert wDiscardPileEnd - wDiscardPile == wDeckEnd - wDeck
DummyGameGFX: DummyGameGFX:
; Graphics for an unused Game Corner ; Graphics for an unused Game Corner

View File

@ -20,7 +20,7 @@ _DummyGame:
ld a, BANK(DummyGameGFX) ld a, BANK(DummyGameGFX)
call FarCopyBytes call FarCopyBytes
ld a, $8 ld a, $8
ld hl, wc300 ld hl, wSpriteAnimDict
ld [hli], a ld [hli], a
ld [hl], $0 ld [hl], $0
hlcoord 0, 0 hlcoord 0, 0

View File

@ -326,7 +326,7 @@ Function9009: ; unreferenced
call LoadHLPaletteIntoDE call LoadHLPaletteIntoDE
jr .GotPalette jr .GotPalette
.GetMonPalette: .GetMonPalette: ; unreferenced
ld bc, wTempMonDVs ld bc, wTempMonDVs
call GetPlayerOrMonPalettePointer call GetPlayerOrMonPalettePointer
call LoadPalette_White_Col1_Col2_Black call LoadPalette_White_Col1_Col2_Black

View File

@ -15,31 +15,31 @@ CheckShininess:
; Attack ; Attack
ld a, [hl] ld a, [hl]
and 1 << SHINY_ATK_BIT and 1 << SHINY_ATK_BIT
jr z, .NotShiny jr z, .not_shiny
; Defense ; Defense
ld a, [hli] ld a, [hli]
and $f and $f
cp SHINY_DEF_VAL cp SHINY_DEF_VAL
jr nz, .NotShiny jr nz, .not_shiny
; Speed ; Speed
ld a, [hl] ld a, [hl]
and $f0 and $f0
cp SHINY_SPD_VAL << 4 cp SHINY_SPD_VAL << 4
jr nz, .NotShiny jr nz, .not_shiny
; Special ; Special
ld a, [hl] ld a, [hl]
and $f and $f
cp SHINY_SPC_VAL cp SHINY_SPC_VAL
jr nz, .NotShiny jr nz, .not_shiny
.Shiny: ; shiny
scf scf
ret ret
.NotShiny: .not_shiny
and a and a
ret ret
@ -49,30 +49,30 @@ Unused_CheckShininess:
; Attack ; Attack
ld a, [hl] ld a, [hl]
cp 10 << 4 cp 10 << 4
jr c, .NotShiny jr c, .not_shiny
; Defense ; Defense
ld a, [hli] ld a, [hli]
and $f and $f
cp 10 cp 10
jr c, .NotShiny jr c, .not_shiny
; Speed ; Speed
ld a, [hl] ld a, [hl]
cp 10 << 4 cp 10 << 4
jr c, .NotShiny jr c, .not_shiny
; Special ; Special
ld a, [hl] ld a, [hl]
and $f and $f
cp 10 cp 10
jr c, .NotShiny jr c, .not_shiny
.Shiny: ; shiny
scf scf
ret ret
.NotShiny: .not_shiny
and a and a
ret ret
@ -977,7 +977,7 @@ PushSGBBorder:
.LoadSGBBorderPointers: .LoadSGBBorderPointers:
ld hl, SGBBorderGFX ld hl, SGBBorderGFX
ld de, SGBBorderMap ld de, SGBBorderMapAndPalettes
ret ret
SGB_ClearVRAM: SGB_ClearVRAM:
@ -1174,12 +1174,10 @@ INCLUDE "data/sgb_ctrl_packets.asm"
PredefPals: PredefPals:
INCLUDE "gfx/sgb/predef.pal" INCLUDE "gfx/sgb/predef.pal"
SGBBorderMap: SGBBorderMapAndPalettes:
; interleaved tile ids and palette ids, without the center 20x18 screen area ; interleaved tile ids and palette ids, without the center 20x18 screen area
INCBIN "gfx/sgb/sgb_border.sgb.tilemap" INCBIN "gfx/sgb/sgb_border.sgb.tilemap"
; four SGB palettes of 16 colors each; only the first 4 colors are used
SGBBorderPalettes:
; assumed to come after SGBBorderMap
INCLUDE "gfx/sgb/sgb_border.pal" INCLUDE "gfx/sgb/sgb_border.pal"
SGBBorderGFX: SGBBorderGFX:
@ -1317,7 +1315,7 @@ INCLUDE "gfx/diploma/diploma.pal"
PartyMenuOBPals: PartyMenuOBPals:
INCLUDE "gfx/stats/party_menu_ob.pal" INCLUDE "gfx/stats/party_menu_ob.pal"
UnusedBattleObjectPals: UnusedBattleObjectPals: ; unreferenced
INCLUDE "gfx/battle_anims/unused_battle_anims.pal" INCLUDE "gfx/battle_anims/unused_battle_anims.pal"
UnusedGSTitleBGPals: UnusedGSTitleBGPals:

View File

@ -113,10 +113,10 @@ GetCardPic:
ld bc, $23 tiles ld bc, $23 tiles
ld a, BANK(ChrisCardPic) ; aka BANK(KrisCardPic) ld a, BANK(ChrisCardPic) ; aka BANK(KrisCardPic)
call FarCopyBytes call FarCopyBytes
ld hl, CardGFX ld hl, TrainerCardGFX
ld de, vTiles2 tile $23 ld de, vTiles2 tile $23
ld bc, 6 tiles ld bc, 6 tiles
ld a, BANK(CardGFX) ld a, BANK(TrainerCardGFX)
call FarCopyBytes call FarCopyBytes
ret ret
@ -126,7 +126,7 @@ INCBIN "gfx/trainer_card/chris_card.2bpp"
KrisCardPic: KrisCardPic:
INCBIN "gfx/trainer_card/kris_card.2bpp" INCBIN "gfx/trainer_card/kris_card.2bpp"
CardGFX: TrainerCardGFX:
INCBIN "gfx/trainer_card/trainer_card.2bpp" INCBIN "gfx/trainer_card/trainer_card.2bpp"
GetPlayerBackpic: GetPlayerBackpic:

View File

@ -1062,14 +1062,13 @@ LevelBallMultiplier:
ld b, $ff ld b, $ff
ret ret
; These two texts were carried over from gen 1. ; BallDodgedText and BallMissedText were used in Gen 1.
; They are not used in gen 2, and are dummied out.
BallDodgedText: BallDodgedText: ; unreferenced
text_far _BallDodgedText text_far _BallDodgedText
text_end text_end
BallMissedText: BallMissedText: ; unreferenced
text_far _BallMissedText text_far _BallMissedText
text_end text_end
@ -1896,14 +1895,14 @@ LoadCurHPIntoBuffer5:
ld [wBuffer5], a ld [wBuffer5], a
ret ret
LoadHPIntoBuffer5: LoadHPIntoBuffer5: ; unreferenced
ld a, d ld a, d
ld [wBuffer6], a ld [wBuffer6], a
ld a, e ld a, e
ld [wBuffer5], a ld [wBuffer5], a
ret ret
LoadHPFromBuffer5: LoadHPFromBuffer5: ; unreferenced
ld a, [wBuffer6] ld a, [wBuffer6]
ld d, a ld d, a
ld a, [wBuffer5] ld a, [wBuffer5]
@ -2353,7 +2352,6 @@ RestorePPEffect:
jr c, .do_ppup jr c, .do_ppup
.CantUsePPUpOnSketch: .CantUsePPUpOnSketch:
.pp_is_maxed_out
ld hl, PPIsMaxedOutText ld hl, PPIsMaxedOutText
call PrintText call PrintText
jr .loop2 jr .loop2
@ -2650,16 +2648,17 @@ WontHaveAnyEffectMessage:
ld hl, ItemWontHaveEffectText ld hl, ItemWontHaveEffectText
jr CantUseItemMessage jr CantUseItemMessage
BelongsToSomeoneElseMessage: BelongsToSomeoneElseMessage: ; unreferenced
ld hl, ItemBelongsToSomeoneElseText ld hl, ItemBelongsToSomeoneElseText
jr CantUseItemMessage jr CantUseItemMessage
CyclingIsntAllowedMessage: CyclingIsntAllowedMessage: ; unreferenced
ld hl, NoCyclingText ld hl, NoCyclingText
jr CantUseItemMessage jr CantUseItemMessage
CantGetOnYourBikeMessage: CantGetOnYourBikeMessage: ; unreferenced
ld hl, ItemCantGetOnText ld hl, ItemCantGetOnText
; fallthrough
CantUseItemMessage: CantUseItemMessage:
; Item couldn't be used. ; Item couldn't be used.
@ -2711,11 +2710,11 @@ ItemUsedText:
text_far _ItemUsedText text_far _ItemUsedText
text_end text_end
ItemGotOnText: ItemGotOnText: ; unreferenced
text_far _ItemGotOnText text_far _ItemGotOnText
text_end text_end
ItemGotOffText: ItemGotOffText: ; unreferenced
text_far _ItemGotOffText text_far _ItemGotOffText
text_end text_end

View File

@ -481,7 +481,7 @@ GetNumberedTMHM:
jr c, .done jr c, .done
cp ITEM_DC - (TM01 - 1) - 1 cp ITEM_DC - (TM01 - 1) - 1
jr c, .skip_one jr c, .skip_one
.skip_two ; skip two
inc a inc a
.skip_one .skip_one
inc a inc a

View File

@ -1531,7 +1531,7 @@ PC_Mart_BallsPocketMenuHeader:
dba PlaceMenuItemQuantity dba PlaceMenuItemQuantity
dba UpdateItemDescription dba UpdateItemDescription
PackNoItemText: PackNoItemText: ; unreferenced
text_far _PackNoItemText text_far _PackNoItemText
text_end text_end
@ -1571,7 +1571,7 @@ PackEmptyText:
text_far _PackEmptyText text_far _PackEmptyText
text_end text_end
YouCantUseItInABattleText: YouCantUseItInABattleText: ; unreferenced
text_far _YouCantUseItInABattleText text_far _YouCantUseItInABattleText
text_end text_end

View File

@ -159,7 +159,7 @@ TeachTMHM:
and a and a
ret ret
.unused .didnt_use ; unreferenced
ld a, 2 ld a, 2
ld [wItemEffectSucceeded], a ld [wItemEffectSucceeded], a
.learned_move .learned_move

View File

@ -107,8 +107,8 @@ Gen2ToGen1LinkComms:
ld de, wLinkData ld de, wLinkData
ld bc, $1a2 ld bc, $1a2
call Link_CopyOTData call Link_CopyOTData
ld de, wPlayerTrademonSpecies ld de, wPlayerTrademon
ld hl, wTimeCapsulePartyMon1Species ld hl, wTimeCapsulePlayerData
ld c, 2 ld c, 2
.loop .loop
ld a, [de] ld a, [de]
@ -162,7 +162,7 @@ Gen2ToGen1LinkComms:
.done_party .done_party
ld [de], a ld [de], a
ld hl, wTimeCapsulePartyMon1Species ld hl, wTimeCapsulePlayerData
call Function2868a call Function2868a
ld a, LOW(wOTPartyMonOT) ld a, LOW(wOTPartyMonOT)
ld [wUnusedD102], a ld [wUnusedD102], a
@ -253,8 +253,8 @@ Gen2ToGen2LinkComms:
ld de, wLinkData ld de, wLinkData
ld bc, $1b9 ld bc, $1b9
call Link_CopyOTData call Link_CopyOTData
ld de, wPlayerTrademonSpecies ld de, wPlayerTrademon
ld hl, wLinkPlayerPartyMon1Species ld hl, wLinkPlayerData
ld c, 2 ld c, 2
.loop1 .loop1
ld a, [de] ld a, [de]
@ -584,7 +584,7 @@ FixDataForLinkTransfer:
ld [hli], a ld [hli], a
dec b dec b
jr nz, .loop3 jr nz, .loop3
ld hl, wTimeCapsulePartyMon1 - 1 + PARTY_LENGTH ld hl, wTimeCapsulePlayerData - 1 + PARTY_LENGTH
ld de, wc612 ld de, wc612
lb bc, 0, 0 lb bc, 0, 0
.loop4 .loop4

View File

@ -15,7 +15,7 @@ Function16d42e:
call CopyBytes call CopyBytes
ret ret
Function16d43b: Function16d43b: ; unreferenced
call LoadStandardMenuHeader call LoadStandardMenuHeader
call ClearBGPalettes call ClearBGPalettes
call ClearTilemap call ClearTilemap

View File

@ -1148,7 +1148,7 @@ MysteryGift_CopyReceivedDecosToPC:
.skip .skip
inc c inc c
ld a, c ld a, c
cp TrophyIDs - DecorationIDs cp NUM_NON_TROPHY_DECOS
jr c, .loop jr c, .loop
jp CloseSRAM jp CloseSRAM

View File

@ -2,23 +2,23 @@ PrepMysteryGiftDataToSend:
ld de, wMysteryGiftStaging ld de, wMysteryGiftStaging
ld a, $1 + GS_VERSION ld a, $1 + GS_VERSION
ld [de], a ld [de], a
inc de ; wc801 inc de ; wMysteryGiftStaging+1
ld a, BANK(sGameData) ld a, BANK(sGameData)
call OpenSRAM call OpenSRAM
ld hl, sPlayerData + wPlayerID - wPlayerData ld hl, sPlayerData + wPlayerID - wPlayerData
ld a, [hli] ld a, [hli]
ld [de], a ld [de], a
ld b, a ld b, a
inc de ; wc802 inc de ; wMysteryGiftStaging+2
ld a, [hl] ld a, [hl]
ld [de], a ld [de], a
ld c, a ld c, a
inc de ; wc803 inc de ; wMysteryGiftStaging+3
push bc push bc
ld hl, sPlayerData + wPlayerName - wPlayerData ld hl, sPlayerData + wPlayerName - wPlayerData
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call CopyBytes call CopyBytes
push de ; wc80e push de ; wMysteryGiftStaging+14
ld hl, sPokemonData + wPokedexCaught - wPokemonData ld hl, sPokemonData + wPokedexCaught - wPokemonData
ld b, wEndPokedexCaught - wPokedexCaught ld b, wEndPokedexCaught - wPokedexCaught
call CountSetBits call CountSetBits
@ -26,21 +26,21 @@ PrepMysteryGiftDataToSend:
pop bc pop bc
ld a, [wNumSetBits] ld a, [wNumSetBits]
ld [de], a ld [de], a
inc de ; wc80f inc de ; wMysteryGiftStaging+15
call CloseSRAM call CloseSRAM
call Random call Random
and 1 and 1
ld [de], a ld [de], a
inc de ; wc810 inc de ; wMysteryGiftStaging+16
call .RandomSample call .RandomSample
ld [de], a ld [de], a
inc de ; wc811 inc de ; wMysteryGiftStaging+17
ld a, c ld a, c
ld c, b ld c, b
ld b, a ld b, a
call .RandomSample call .RandomSample
ld [de], a ld [de], a
inc de ; wc812 inc de ; wMysteryGiftStaging+18
ld a, BANK(sBackupMysteryGiftItem) ld a, BANK(sBackupMysteryGiftItem)
call OpenSRAM call OpenSRAM
ld a, [sBackupMysteryGiftItem] ld a, [sBackupMysteryGiftItem]

View File

@ -35,7 +35,6 @@ _PrintNum::
cp 2 cp 2
jr z, .word jr z, .word
; maximum 3 bytes ; maximum 3 bytes
.long
ld a, [de] ld a, [de]
ldh [hPrintNumBuffer + 1], a ldh [hPrintNumBuffer + 1], a
inc de inc de
@ -81,7 +80,7 @@ _PrintNum::
cp 6 cp 6
jr z, .six jr z, .six
.seven ; seven
ld a, HIGH(1000000 >> 8) ld a, HIGH(1000000 >> 8)
ldh [hPrintNumBuffer + 4], a ldh [hPrintNumBuffer + 4], a
ld a, HIGH(1000000) ; mid ld a, HIGH(1000000) ; mid

View File

@ -316,20 +316,19 @@ MainMenu_PrintCurrentTimeAndDay:
call PrintNum call PrintNum
ret ret
.min .minString: ; unreferenced
; unused
db "min.@" db "min.@"
.PrintTimeNotSet: .PrintTimeNotSet:
hlcoord 1, 14 hlcoord 1, 14
ld de, .TimeNotSet ld de, .TimeNotSetString
call PlaceString call PlaceString
ret ret
.TimeNotSet: .TimeNotSetString:
db "TIME NOT SET@" db "TIME NOT SET@"
.MainMenuTimeUnknownText: .MainMenuTimeUnknownText: ; unreferenced
text_far _MainMenuTimeUnknownText text_far _MainMenuTimeUnknownText
text_end text_end

View File

@ -156,18 +156,18 @@ StartMenu_PrintBugContestStatus:
set NO_TEXT_SCROLL, [hl] set NO_TEXT_SCROLL, [hl]
call StartMenu_DrawBugContestStatusBox call StartMenu_DrawBugContestStatusBox
hlcoord 1, 5 hlcoord 1, 5
ld de, .Balls_EN ld de, .BallsString
call PlaceString call PlaceString
hlcoord 8, 5 hlcoord 8, 5
ld de, wParkBallsRemaining ld de, wParkBallsRemaining
lb bc, PRINTNUM_LEFTALIGN | 1, 2 lb bc, PRINTNUM_LEFTALIGN | 1, 2
call PrintNum call PrintNum
hlcoord 1, 1 hlcoord 1, 1
ld de, .CAUGHT ld de, .CaughtString
call PlaceString call PlaceString
ld a, [wContestMon] ld a, [wContestMon]
and a and a
ld de, .None ld de, .NoneString
jr z, .no_contest_mon jr z, .no_contest_mon
ld [wNamedObjectIndexBuffer], a ld [wNamedObjectIndexBuffer], a
call GetPokemonName call GetPokemonName
@ -179,7 +179,7 @@ StartMenu_PrintBugContestStatus:
and a and a
jr z, .skip_level jr z, .skip_level
hlcoord 1, 3 hlcoord 1, 3
ld de, .LEVEL ld de, .LevelString
call PlaceString call PlaceString
ld a, [wContestMonLevel] ld a, [wContestMonLevel]
ld h, b ld h, b
@ -193,15 +193,15 @@ StartMenu_PrintBugContestStatus:
ld [wOptions], a ld [wOptions], a
ret ret
.Balls_JP: .BallsJPString: ; unreferenced
db "ボール   こ@" db "ボール   こ@"
.CAUGHT: .CaughtString:
db "CAUGHT@" db "CAUGHT@"
.Balls_EN: .BallsString:
db "BALLS:@" db "BALLS:@"
.None: .NoneString:
db "None@" db "None@"
.LEVEL: .LevelString:
db "LEVEL@" db "LEVEL@"
FindApricornsInBag: FindApricornsInBag:

View File

@ -275,6 +275,7 @@ NamingScreen_InitText:
NamingScreen_ApplyTextInputMode: NamingScreen_ApplyTextInputMode:
call NamingScreen_IsTargetBox call NamingScreen_IsTargetBox
jr nz, .not_box jr nz, .not_box
assert BoxNameInputLower - NameInputLower == BoxNameInputUpper - NameInputUpper
ld hl, BoxNameInputLower - NameInputLower ld hl, BoxNameInputLower - NameInputLower
add hl, de add hl, de
ld d, h ld d, h
@ -880,7 +881,7 @@ INCBIN "gfx/naming_screen/cursor.2bpp"
INCLUDE "data/text/name_input_chars.asm" INCLUDE "data/text/name_input_chars.asm"
NamingScreenGFX_End: ; unused NamingScreenGFX_End: ; unreferenced
INCBIN "gfx/naming_screen/end.1bpp" INCBIN "gfx/naming_screen/end.1bpp"
NamingScreenGFX_MiddleLine: NamingScreenGFX_MiddleLine:

View File

@ -199,7 +199,7 @@ Credits_RequestGFX:
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
ld a, 8 ld a, 8
ld [wRequested2bpp], a ld [wRequested2bppSize], a
jp Credits_Next jp Credits_Next
Credits_LYOverride: Credits_LYOverride:

View File

@ -1,4 +1,4 @@
UnusedTitleScreen: UnusedTitleScreen: ; unreferenced
call ClearBGPalettes call ClearBGPalettes
call ClearTilemap call ClearTilemap
call DisableLCD call DisableLCD
@ -154,7 +154,7 @@ UnusedTitleFG_OAM:
dbsprite 13, 11, 0, 0, $4c, 1 dbsprite 13, 11, 0, 0, $4c, 1
dbsprite 14, 11, 0, 0, $4e, 1 dbsprite 14, 11, 0, 0, $4e, 1
Function10ed51: Function10ed51: ; unreferenced
call _TitleScreen call _TitleScreen
.loop .loop
call JoyTextDelay call JoyTextDelay

View File

@ -549,7 +549,7 @@ GetDecoName:
ld a, e ld a, e
jr .getpokename jr .getpokename
.unused .unused ; unreferenced
push de push de
call .getdeconame call .getdeconame
pop de pop de
@ -939,7 +939,7 @@ GetDecorationID:
pop hl pop hl
ret ret
SetAllDecorationFlags: SetAllDecorationFlags: ; unreferenced
ld hl, DecorationIDs ld hl, DecorationIDs
.loop .loop
ld a, [hli] ld a, [hli]

View File

@ -25,76 +25,76 @@ OverworldLoop::
DisableEvents: DisableEvents:
xor a xor a
ld [wScriptFlags3], a ld [wScriptFlags2], a
ret ret
EnableEvents:: EnableEvents::
ld a, $ff ld a, $ff
ld [wScriptFlags3], a ld [wScriptFlags2], a
ret ret
CheckBit5_ScriptFlags3: CheckBit5_ScriptFlags2:
ld hl, wScriptFlags3 ld hl, wScriptFlags2
bit 5, [hl] bit 5, [hl]
ret ret
DisableWarpsConnxns: DisableWarpsConnxns: ; unreferenced
ld hl, wScriptFlags3 ld hl, wScriptFlags2
res 2, [hl] res 2, [hl]
ret ret
DisableCoordEvents: DisableCoordEvents: ; unreferenced
ld hl, wScriptFlags3 ld hl, wScriptFlags2
res 1, [hl] res 1, [hl]
ret ret
DisableStepCount: DisableStepCount: ; unreferenced
ld hl, wScriptFlags3 ld hl, wScriptFlags2
res 0, [hl] res 0, [hl]
ret ret
DisableWildEncounters: DisableWildEncounters: ; unreferenced
ld hl, wScriptFlags3 ld hl, wScriptFlags2
res 4, [hl] res 4, [hl]
ret ret
EnableWarpsConnxns: EnableWarpsConnxns: ; unreferenced
ld hl, wScriptFlags3 ld hl, wScriptFlags2
set 2, [hl] set 2, [hl]
ret ret
EnableCoordEvents: EnableCoordEvents: ; unreferenced
ld hl, wScriptFlags3 ld hl, wScriptFlags2
set 1, [hl] set 1, [hl]
ret ret
EnableStepCount: EnableStepCount: ; unreferenced
ld hl, wScriptFlags3 ld hl, wScriptFlags2
set 0, [hl] set 0, [hl]
ret ret
EnableWildEncounters: EnableWildEncounters:
ld hl, wScriptFlags3 ld hl, wScriptFlags2
set 4, [hl] set 4, [hl]
ret ret
CheckWarpConnxnScriptFlag: CheckWarpConnxnScriptFlag:
ld hl, wScriptFlags3 ld hl, wScriptFlags2
bit 2, [hl] bit 2, [hl]
ret ret
CheckCoordEventScriptFlag: CheckCoordEventScriptFlag:
ld hl, wScriptFlags3 ld hl, wScriptFlags2
bit 1, [hl] bit 1, [hl]
ret ret
CheckStepCountScriptFlag: CheckStepCountScriptFlag:
ld hl, wScriptFlags3 ld hl, wScriptFlags2
bit 0, [hl] bit 0, [hl]
ret ret
CheckWildEncountersScriptFlag: CheckWildEncountersScriptFlag:
ld hl, wScriptFlags3 ld hl, wScriptFlags2
bit 4, [hl] bit 4, [hl]
ret ret
@ -135,7 +135,7 @@ EnterMap:
ld [wMapStatus], a ld [wMapStatus], a
ret ret
UnusedWait30Frames: UnusedWait30Frames: ; unreferenced
ld c, 30 ld c, 30
call DelayFrames call DelayFrames
ret ret
@ -248,7 +248,7 @@ PlayerEvents:
and a and a
ret nz ret nz
call Dummy_CheckScriptFlags3Bit5 ; This is a waste of time call Dummy_CheckScriptFlags2Bit5 ; This is a waste of time
call CheckTrainerBattle_GetPlayerEvent call CheckTrainerBattle_GetPlayerEvent
jr c, .ok jr c, .ok
@ -395,8 +395,8 @@ SetMinTwoStepWildEncounterCooldown:
ld [wWildEncounterCooldown], a ld [wWildEncounterCooldown], a
ret ret
Dummy_CheckScriptFlags3Bit5: Dummy_CheckScriptFlags2Bit5:
call CheckBit5_ScriptFlags3 call CheckBit5_ScriptFlags2
ret z ret z
call SetXYCompareFlags call SetXYCompareFlags
ret ret
@ -480,8 +480,8 @@ CheckTimeEvents:
scf scf
ret ret
.unused .unused ; unreferenced
ld a, 8 ld a, $8 ; ???
scf scf
ret ret

View File

@ -2894,20 +2894,20 @@ InitSprites:
ldh [hCurSpriteTile], a ldh [hCurSpriteTile], a
xor a xor a
bit 7, [hl] bit 7, [hl]
jr nz, .skip1 jr nz, .not_vram1
or VRAM_BANK_1 or VRAM_BANK_1
.skip1 .not_vram1
ld hl, OBJECT_FLAGS2 ld hl, OBJECT_FLAGS2
add hl, bc add hl, bc
ld e, [hl] ld e, [hl]
bit OBJ_FLAGS2_7, e bit OBJ_FLAGS2_7, e
jr z, .skip2 jr z, .not_priority
or PRIORITY or PRIORITY
.skip2 .not_priority
bit USE_OBP1_F, e bit USE_OBP1_F, e
jr z, .skip3 jr z, .not_obp_num
or OBP_NUM or OBP_NUM
.skip3 .not_obp_num
ld hl, OBJECT_PALETTE ld hl, OBJECT_PALETTE
add hl, bc add hl, bc
ld d, a ld d, a
@ -2917,9 +2917,9 @@ InitSprites:
ld d, a ld d, a
xor a xor a
bit OVERHEAD_F, e bit OVERHEAD_F, e
jr z, .skip4 jr z, .not_overhead
or PRIORITY or PRIORITY
.skip4 .not_overhead
ldh [hCurSpriteOAMFlags], a ldh [hCurSpriteOAMFlags], a
ld hl, OBJECT_SPRITE_X ld hl, OBJECT_SPRITE_X
add hl, bc add hl, bc

View File

@ -2173,8 +2173,7 @@ Script_warpcheck:
farcall EnableEvents farcall EnableEvents
ret ret
Script_enableevents: Script_enableevents: ; unreferenced
; unused
farcall EnableEvents farcall EnableEvents
ret ret

View File

@ -203,7 +203,7 @@ CheckPokerusTick::
xor a xor a
ret ret
SetUnusedTwoDayTimer: SetUnusedTwoDayTimer: ; unreferenced
ld a, 2 ld a, 2
ld hl, wUnusedTwoDayTimer ld hl, wUnusedTwoDayTimer
ld [hl], a ld [hl], a
@ -308,7 +308,7 @@ UpdateTimeRemaining:
scf scf
ret ret
GetSecondsSinceIfLessThan60: GetSecondsSinceIfLessThan60: ; unreferenced
ld a, [wDaysSince] ld a, [wDaysSince]
and a and a
jr nz, GetTimeElapsed_ExceedsUnitLimit jr nz, GetTimeElapsed_ExceedsUnitLimit
@ -330,7 +330,7 @@ GetMinutesSinceIfLessThan60:
ld a, [wMinutesSince] ld a, [wMinutesSince]
ret ret
GetHoursSinceIfLessThan24: GetHoursSinceIfLessThan24: ; unreferenced
ld a, [wDaysSince] ld a, [wDaysSince]
and a and a
jr nz, GetTimeElapsed_ExceedsUnitLimit jr nz, GetTimeElapsed_ExceedsUnitLimit
@ -349,7 +349,7 @@ CalcDaysSince:
xor a xor a
jr _CalcDaysSince jr _CalcDaysSince
CalcHoursDaysSince: CalcHoursDaysSince: ; unreferenced
inc hl inc hl
xor a xor a
jr _CalcHoursDaysSince jr _CalcHoursDaysSince
@ -423,7 +423,7 @@ CopyDayToHL:
ld [hl], a ld [hl], a
ret ret
CopyDayHourToHL: CopyDayHourToHL: ; unreferenced
ld a, [wCurDay] ld a, [wCurDay]
ld [hli], a ld [hli], a
ldh a, [hHours] ldh a, [hHours]

View File

@ -437,7 +437,7 @@ Script_SpecialBillCall::
ld e, PHONE_BILL ld e, PHONE_BILL
jp LoadCallerScript jp LoadCallerScript
LoadElmCallScript: Script_SpecialElmCall: ; unreferenced
callasm .LoadElmScript callasm .LoadElmScript
pause 30 pause 30
sjump Script_ReceivePhoneCall sjump Script_ReceivePhoneCall
@ -720,7 +720,7 @@ PhoneJustTalkToThemText:
text_far _PhoneJustTalkToThemText text_far _PhoneJustTalkToThemText
text_end text_end
PhoneThankYouTextScript: PhoneThankYouTextScript: ; unreferenced
writetext PhoneThankYouText writetext PhoneThankYouText
end end

View File

@ -95,7 +95,7 @@ ElmPhoneCallerScript:
specialphonecall SPECIALCALL_NONE specialphonecall SPECIALCALL_NONE
end end
.unused .neat ; unreferenced
farwritetext ElmPhoneGotAholdOfSomethingNeatText farwritetext ElmPhoneGotAholdOfSomethingNeatText
specialphonecall SPECIALCALL_NONE specialphonecall SPECIALCALL_NONE
end end

View File

@ -1103,7 +1103,7 @@ PhoneScript_Generic_Male:
promptbutton promptbutton
end end
.Unknown: .Unknown: ; unreferenced
farwritetext UnknownGenericText farwritetext UnknownGenericText
promptbutton promptbutton
end end

View File

@ -3,7 +3,7 @@ BeverlyComePickUpScript:
promptbutton promptbutton
sjump PhoneScript_HangUpText_Female sjump PhoneScript_HangUpText_Female
JoseComePickUpScript: JoseComePickUpScript: ; unreferenced
farwritetext JoseComePickUpText farwritetext JoseComePickUpText
promptbutton promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male

View File

@ -1166,7 +1166,7 @@ Pokedex_DrawDexEntryScreenBG:
call Pokedex_PlaceFrontpicTopLeftCorner call Pokedex_PlaceFrontpicTopLeftCorner
ret ret
.Unused: .Number: ; unreferenced
db $5c, $5d, -1 ; No. db $5c, $5d, -1 ; No.
.Height: .Height:
db "HT ?", $5e, "??", $5f, -1 ; HT ?'??" db "HT ?", $5e, "??", $5f, -1 ; HT ?'??"
@ -2480,6 +2480,7 @@ Pokedex_LoadUnownFont:
ld a, BANK(sScratch) ld a, BANK(sScratch)
call OpenSRAM call OpenSRAM
ld hl, UnownFont ld hl, UnownFont
; sScratch + $188 was the address of sDecompressBuffer in pokegold
ld de, sScratch + $188 ld de, sScratch + $188
ld bc, 39 tiles ld bc, 39 tiles
ld a, BANK(UnownFont) ld a, BANK(UnownFont)

View File

@ -1546,7 +1546,7 @@ RadioChannels:
jr z, .johto jr z, .johto
cp KANTO_LANDMARK cp KANTO_LANDMARK
jr c, .johto jr c, .johto
.kanto ; kanto
and a and a
ret ret
@ -2265,7 +2265,7 @@ FlyMap:
; The first 46 locations are part of Johto. The rest are in Kanto. ; The first 46 locations are part of Johto. The rest are in Kanto.
cp KANTO_LANDMARK cp KANTO_LANDMARK
jr nc, .KantoFlyMap jr nc, .KantoFlyMap
.JohtoFlyMap: ; Johto fly map
; Note that .NoKanto should be modified in tandem with this branch ; Note that .NoKanto should be modified in tandem with this branch
push af push af
ld a, JOHTO_FLYPOINT ; first Johto flypoint ld a, JOHTO_FLYPOINT ; first Johto flypoint
@ -2569,7 +2569,7 @@ Pokedex_GetArea:
jr z, .johto jr z, .johto
cp KANTO_LANDMARK cp KANTO_LANDMARK
jr c, .johto jr c, .johto
.kanto ; kanto
ld a, [wTownMapCursorLandmark] ld a, [wTownMapCursorLandmark]
and a and a
jr z, .clear jr z, .clear

View File

@ -141,7 +141,7 @@ PrintRadioLine:
ld [wRadioTextDelay], a ld [wRadioTextDelay], a
ret ret
ReplacePeriodsWithSpaces: ReplacePeriodsWithSpaces: ; unreferenced
push hl push hl
ld b, SCREEN_WIDTH * 2 ld b, SCREEN_WIDTH * 2
.loop .loop
@ -149,7 +149,6 @@ ReplacePeriodsWithSpaces:
cp "." cp "."
jr nz, .next jr nz, .next
ld [hl], " " ld [hl], " "
.next .next
inc hl inc hl
dec b dec b
@ -1779,7 +1778,7 @@ CopyRadioTextToRAM:
cp TX_FAR cp TX_FAR
jp z, FarCopyRadioText jp z, FarCopyRadioText
ld de, wRadioText ld de, wRadioText
ld bc, SCREEN_WIDTH * 2 ld bc, 2 * SCREEN_WIDTH
jp CopyBytes jp CopyBytes
StartRadioStation: StartRadioStation:

View File

@ -101,7 +101,7 @@ _DepositPKMN:
ld [wJumptableIndex], a ld [wJumptableIndex], a
ret ret
.go_back .go_back ; unreferenced
ld hl, wJumptableIndex ld hl, wJumptableIndex
dec [hl] dec [hl]
ret ret
@ -358,7 +358,7 @@ _WithdrawPKMN:
ld [wJumptableIndex], a ld [wJumptableIndex], a
ret ret
.unused .go_back ; unreferenced
ld hl, wJumptableIndex ld hl, wJumptableIndex
dec [hl] dec [hl]
ret ret
@ -609,7 +609,7 @@ _MovePKMNWithoutMail:
ld [wJumptableIndex], a ld [wJumptableIndex], a
ret ret
.unused .go_back ; unreferenced
ld hl, wJumptableIndex ld hl, wJumptableIndex
dec [hl] dec [hl]
ret ret
@ -2222,7 +2222,7 @@ PCString_ReleasedPKMN: db "Released <PK><MN>.@"
PCString_Bye: db "Bye,@" PCString_Bye: db "Bye,@"
PCString_Stored: db "Stored @" PCString_Stored: db "Stored @"
PCString_Got: db "Got @" PCString_Got: db "Got @"
PCString_Non: db "Non.@" PCString_Non: db "Non.@" ; unreferenced
PCString_BoxFull: db "The BOX is full.@" PCString_BoxFull: db "The BOX is full.@"
PCString_PartyFull: db "The party's full!@" PCString_PartyFull: db "The party's full!@"
PCString_NoReleasingEGGS: db "No releasing EGGS!@" PCString_NoReleasingEGGS: db "No releasing EGGS!@"
@ -2268,16 +2268,16 @@ _ChangeBox_MenuHeader:
dw .MenuData dw .MenuData
db 1 ; default option db 1 ; default option
.MenuData .MenuData:
db SCROLLINGMENU_CALL_FUNCTION3_NO_SWITCH | SCROLLINGMENU_ENABLE_FUNCTION3 ; flags db SCROLLINGMENU_CALL_FUNCTION3_NO_SWITCH | SCROLLINGMENU_ENABLE_FUNCTION3 ; flags
db 4, 0 ; rows, columns db 4, 0 ; rows, columns
db SCROLLINGMENU_ITEMS_NORMAL ; item format db SCROLLINGMENU_ITEMS_NORMAL ; item format
dba .boxes dba .Boxes
dba .boxnames dba .PrintBoxNames
dba NULL dba NULL
dba BillsPC_PrintBoxCountAndCapacity dba BillsPC_PrintBoxCountAndCapacity
.boxes .Boxes:
db NUM_BOXES db NUM_BOXES
x = 1 x = 1
rept NUM_BOXES rept NUM_BOXES
@ -2286,7 +2286,7 @@ x = x + 1
endr endr
db -1 db -1
.boxnames .PrintBoxNames:
push de push de
ld a, [wMenuSelection] ld a, [wMenuSelection]
dec a dec a

View File

@ -1,5 +1,5 @@
GetBreedMon1LevelGrowth: GetBreedMon1LevelGrowth:
ld hl, wBreedMon1Stats ld hl, wBreedMon1
ld de, wTempMon ld de, wTempMon
ld bc, BOXMON_STRUCT_LENGTH ld bc, BOXMON_STRUCT_LENGTH
call CopyBytes call CopyBytes
@ -13,7 +13,7 @@ GetBreedMon1LevelGrowth:
ret ret
GetBreedMon2LevelGrowth: GetBreedMon2LevelGrowth:
ld hl, wBreedMon2Stats ld hl, wBreedMon2
ld de, wTempMon ld de, wTempMon
ld bc, BOXMON_STRUCT_LENGTH ld bc, BOXMON_STRUCT_LENGTH
call CopyBytes call CopyBytes

View File

@ -8,7 +8,7 @@ SendMailToPC:
cp MAILBOX_CAPACITY cp MAILBOX_CAPACITY
jr nc, .full jr nc, .full
ld bc, MAIL_STRUCT_LENGTH ld bc, MAIL_STRUCT_LENGTH
ld hl, sMailbox ld hl, sMailboxes
call AddNTimes call AddNTimes
ld d, h ld d, h
ld e, l ld e, l
@ -44,7 +44,7 @@ DeleteMailFromPC:
call OpenSRAM call OpenSRAM
ld a, b ld a, b
push bc push bc
ld hl, sMailbox ld hl, sMailboxes
ld bc, MAIL_STRUCT_LENGTH ld bc, MAIL_STRUCT_LENGTH
call AddNTimes call AddNTimes
push hl push hl
@ -73,7 +73,7 @@ DeleteMailFromPC:
ReadMailMessage: ReadMailMessage:
ld a, b ld a, b
ld hl, sMailbox ld hl, sMailboxes
ld bc, MAIL_STRUCT_LENGTH ld bc, MAIL_STRUCT_LENGTH
call AddNTimes call AddNTimes
ld d, h ld d, h
@ -87,7 +87,7 @@ MoveMailFromPCToParty:
push bc push bc
ld a, b ld a, b
ld bc, MAIL_STRUCT_LENGTH ld bc, MAIL_STRUCT_LENGTH
ld hl, sMailbox ld hl, sMailboxes
call AddNTimes call AddNTimes
push hl push hl
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
@ -314,19 +314,19 @@ _PlayerMailBoxMenu:
text_end text_end
InitMail: InitMail:
; initialize wMailboxCount and beyond with incrementing values, one per mail ; return z if no mail
; set z if no mail
ld a, BANK(sMailboxCount) ld a, BANK(sMailboxCount)
call OpenSRAM call OpenSRAM
ld a, [sMailboxCount] ld a, [sMailboxCount]
call CloseSRAM call CloseSRAM
ld hl, wMailboxCount
ld [hli], a
and a
; initialize wMailboxCount from sMailboxCount
ld hl, wMailboxCount
ld [hli], a ; now hl = wMailboxItems
and a
jr z, .done ; if no mail, we're done jr z, .done ; if no mail, we're done
; load values in memory with incrementing values starting at wMailboxCount ; initialize wMailboxItems with incrementing values starting at 1
ld b, a ld b, a
ld a, 1 ld a, 1
.loop .loop
@ -334,6 +334,7 @@ InitMail:
inc a inc a
dec b dec b
jr nz, .loop jr nz, .loop
.done .done
ld [hl], -1 ; terminate ld [hl], -1 ; terminate

View File

@ -404,7 +404,7 @@ LoadBlueSkyMailGFX:
ld de, BlueSkyMailGrassGFX ld de, BlueSkyMailGrassGFX
ld c, 1 * LEN_1BPP_TILE ld c, 1 * LEN_1BPP_TILE
call LoadMailGFX_Color3 call LoadMailGFX_Color3
ld de, MailDragoniteGFX ld de, MailDragoniteAndSentretGFX
ld c, 23 * LEN_1BPP_TILE ld c, 23 * LEN_1BPP_TILE
call LoadMailGFX_Color3 call LoadMailGFX_Color3
ld de, MailCloudGFX ld de, MailCloudGFX
@ -767,7 +767,7 @@ Mail_Place14TileAlternatingRow:
ld b, 14 / 2 ld b, 14 / 2
jr Mail_PlaceAlternatingRow jr Mail_PlaceAlternatingRow
Mail_Place16TileAlternatingRow: Mail_Place16TileAlternatingRow: ; unreferenced
push af push af
ld b, 16 / 2 ld b, 16 / 2
jr Mail_PlaceAlternatingRow jr Mail_PlaceAlternatingRow
@ -775,6 +775,7 @@ Mail_Place16TileAlternatingRow:
Mail_Place18TileAlternatingRow: Mail_Place18TileAlternatingRow:
push af push af
ld b, 18 / 2 ld b, 18 / 2
; fallthrough
Mail_PlaceAlternatingRow: Mail_PlaceAlternatingRow:
.loop .loop
@ -812,16 +813,16 @@ Mail_PlaceAlternatingColumn:
pop af pop af
ret ret
Mail_Draw7TileRow: Mail_Draw7TileRow: ; unreferenced
ld b, $7 ld b, 7
jr Mail_DrawRowLoop jr Mail_DrawRowLoop
Mail_Draw13TileRow: Mail_Draw13TileRow:
ld b, $d ld b, 13
jr Mail_DrawRowLoop jr Mail_DrawRowLoop
Mail_Draw16TileRow: Mail_Draw16TileRow:
ld b, $10 ld b, 16
jr Mail_DrawRowLoop jr Mail_DrawRowLoop
Mail_DrawTopBottomBorder: Mail_DrawTopBottomBorder:
@ -830,6 +831,7 @@ Mail_DrawTopBottomBorder:
Mail_DrawFullWidthBorder: Mail_DrawFullWidthBorder:
ld b, SCREEN_WIDTH ld b, SCREEN_WIDTH
; fallthrough
Mail_DrawRowLoop: Mail_DrawRowLoop:
.loop .loop

View File

@ -758,12 +758,10 @@ TeachWhichPKMNString:
MoveToWhereString: MoveToWhereString:
db "Move to where?@" db "Move to where?@"
ChooseAFemalePKMNString: ChooseAFemalePKMNString: ; unreferenced
; unused
db "Choose a ♀<PK><MN>.@" db "Choose a ♀<PK><MN>.@"
ChooseAMalePKMNString: ChooseAMalePKMNString: ; unreferenced
; unused
db "Choose a ♂<PK><MN>.@" db "Choose a ♂<PK><MN>.@"
ToWhichPKMNString: ToWhichPKMNString:

View File

@ -304,7 +304,7 @@ Printer_ResetData:
xor a xor a
ld [wPrinterSendByteCounter], a ld [wPrinterSendByteCounter], a
ld [wPrinterSendByteCounter + 1], a ld [wPrinterSendByteCounter + 1], a
ld hl, wGameboyPrinterRAM ld hl, wGameboyPrinter2bppSource
ld bc, wGameboyPrinter2bppSourceEnd - wGameboyPrinter2bppSource ld bc, wGameboyPrinter2bppSourceEnd - wGameboyPrinter2bppSource
call Printer_ByteFill call Printer_ByteFill
ret ret
@ -435,10 +435,10 @@ PrinterDataPacket3:
PrinterDataPacket4: PrinterDataPacket4:
db 4, 0, $00, 0 db 4, 0, $00, 0
dw 4 dw 4
PrinterDataPacket5: ; unused PrinterDataPacket5: ; unreferenced
db 8, 0, $00, 0 db 8, 0, $00, 0
dw 8 dw 8
PrinterDataPacket6: ; unused PrinterDataPacket6: ; unreferenced
db 15, 0, $00, 0 db 15, 0, $00, 0
dw 15 dw 15

View File

@ -36,9 +36,9 @@ SmallFarFlagAction:
jr z, .set ; 1 = SET_FLAG jr z, .set ; 1 = SET_FLAG
dec b dec b
jr z, .check ; 2 = CHECK_FLAG jr z, .check ; 2 = CHECK_FLAG
; 0 = RESET_FLAG ; 0 = RESET_FLAG
.reset ; reset
ld a, c ld a, c
cpl cpl
and [hl] and [hl]

View File

@ -305,7 +305,7 @@ ScrollTileRightLeft:
jr nz, ScrollTileLeft jr nz, ScrollTileLeft
jr ScrollTileRight jr ScrollTileRight
ScrollTileUpDown: ScrollTileUpDown: ; unreferenced
; Scroll up for 4 ticks, then down for 4 ticks. ; Scroll up for 4 ticks, then down for 4 ticks.
ld a, [wTileAnimationTimer] ld a, [wTileAnimationTimer]
inc a inc a
@ -891,7 +891,7 @@ AnimateWaterPalette:
cp %100 ; frame 4 cp %100 ; frame 4
jr z, .color2 jr z, .color2
.color1 ; color1
ld hl, wBGPals1 palette PAL_BG_WATER color 1 ld hl, wBGPals1 palette PAL_BG_WATER color 1
ld a, [hli] ld a, [hli]
ldh [rBGPD], a ldh [rBGPD], a

View File

@ -33,13 +33,13 @@ INCBIN "gfx/battle/expbar.2bpp"
TownMapGFX: TownMapGFX:
INCBIN "gfx/pokegear/town_map.2bpp.lz" INCBIN "gfx/pokegear/town_map.2bpp.lz"
UnusedWeekdayKanjiGFX: UnusedWeekdayKanjiGFX: ; unreferenced
INCBIN "gfx/font/unused_weekday_kanji.2bpp" INCBIN "gfx/font/unused_weekday_kanji.2bpp"
PokegearPhoneIconGFX: PokegearPhoneIconGFX:
INCBIN "gfx/font/phone_icon.2bpp" INCBIN "gfx/font/phone_icon.2bpp"
UnusedBoldFontGFX: UnusedBoldFontGFX: ; unreferenced
INCBIN "gfx/font/unused_bold_font.1bpp" INCBIN "gfx/font/unused_bold_font.1bpp"
TextboxSpaceGFX: TextboxSpaceGFX:
@ -49,7 +49,7 @@ INCBIN "gfx/font/space.2bpp"
FontsExtra_SolidBlackGFX: FontsExtra_SolidBlackGFX:
INCBIN "gfx/font/black.1bpp" INCBIN "gfx/font/black.1bpp"
UnusedUpArrowGFX: UnusedUpArrowGFX: ; unreferenced
INCBIN "gfx/font/unused_up_arrow.1bpp" INCBIN "gfx/font/unused_up_arrow.1bpp"
MobilePhoneTilesGFX: MobilePhoneTilesGFX:

View File

@ -55,15 +55,10 @@ INCBIN "gfx/mail/ditto.1bpp"
MailMewGFX: MailMewGFX:
INCBIN "gfx/mail/mew.1bpp" INCBIN "gfx/mail/mew.1bpp"
MailDragoniteGFX: MailDragoniteAndSentretGFX:
INCBIN "gfx/mail/dragonite.1bpp" INCBIN "gfx/mail/dragonite.1bpp"
MailSentretGFX:
INCBIN "gfx/mail/sentret.1bpp" INCBIN "gfx/mail/sentret.1bpp"
MailUnusedGrassGFX:
INCBIN "gfx/mail/unused_grass.1bpp"
PortraitMailLargePokeballGFX: PortraitMailLargePokeballGFX:
INCBIN "gfx/mail/large_pokeball.1bpp" INCBIN "gfx/mail/large_pokeball.1bpp"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 116 B

After

Width:  |  Height:  |  Size: 135 B

View File

@ -90,7 +90,7 @@ INCLUDE "gfx/tilesets/lighthouse_palette_map.asm"
TilesetPlayersRoomPalMap: TilesetPlayersRoomPalMap:
INCLUDE "gfx/tilesets/players_room_palette_map.asm" INCLUDE "gfx/tilesets/players_room_palette_map.asm"
UnusedMuseumPalMap: UnusedMuseumPalMap: ; unreferenced
INCLUDE "gfx/tilesets/unused_museum_palette_map.asm" INCLUDE "gfx/tilesets/unused_museum_palette_map.asm"
TilesetIcePathPalMap: TilesetIcePathPalMap:

View File

@ -436,7 +436,7 @@ SpecialMapMusic::
and a and a
ret ret
.bike .bike ; unreferenced
ld de, MUSIC_BICYCLE ld de, MUSIC_BICYCLE
scf scf
ret ret

View File

@ -275,6 +275,6 @@ PushLYOverrides::
ld a, HIGH(wLYOverrides) ld a, HIGH(wLYOverrides)
ld [wRequested2bppDest + 1], a ld [wRequested2bppDest + 1], a
ld a, (wLYOverridesEnd - wLYOverrides) / 16 ld a, (wLYOverridesEnd - wLYOverrides) / LEN_2BPP_TILE
ld [wRequested2bpp], a ld [wRequested2bppSize], a
ret ret

View File

@ -80,7 +80,6 @@ LZ_LONG_HI EQU %00000011
cp LZ_LONG cp LZ_LONG
jr nz, .short jr nz, .short
.long
; The count is now 10 bits. ; The count is now 10 bits.
; Read the next 3 bits. ; Read the next 3 bits.
@ -133,7 +132,7 @@ LZ_LONG_HI EQU %00000011
cp LZ_ZERO cp LZ_ZERO
jr z, .Zero jr z, .Zero
.Literal: ; Literal
; Read literal data for bc bytes. ; Read literal data for bc bytes.
.lloop .lloop
dec c dec c
@ -215,10 +214,8 @@ LZ_LONG_HI EQU %00000011
bit 7, a ; sign bit 7, a ; sign
jr z, .positive jr z, .positive
.negative ; negative
; hl = de - a ; hl = de + -a
; Since we can't subtract a from de,
; Make it negative and add de.
and %01111111 and %01111111
cpl cpl
add e add e

View File

@ -111,7 +111,7 @@ LoadFontsExtra::
farcall _LoadFontsExtra2 farcall _LoadFontsExtra2
ret ret
LoadFontsExtra2: LoadFontsExtra2: ; unreferenced
farcall _LoadFontsExtra2 farcall _LoadFontsExtra2
ret ret
@ -226,10 +226,10 @@ Request2bpp::
cp [hl] cp [hl]
jr nc, .cycle jr nc, .cycle
ld [wRequested2bpp], a ld [wRequested2bppSize], a
.wait .wait
call DelayFrame call DelayFrame
ld a, [wRequested2bpp] ld a, [wRequested2bppSize]
and a and a
jr nz, .wait jr nz, .wait
@ -245,11 +245,11 @@ Request2bpp::
.cycle .cycle
ldh a, [hTilesPerCycle] ldh a, [hTilesPerCycle]
ld [wRequested2bpp], a ld [wRequested2bppSize], a
.wait2 .wait2
call DelayFrame call DelayFrame
ld a, [wRequested2bpp] ld a, [wRequested2bppSize]
and a and a
jr nz, .wait2 jr nz, .wait2
@ -300,10 +300,10 @@ Request1bpp::
cp [hl] cp [hl]
jr nc, .cycle jr nc, .cycle
ld [wRequested1bpp], a ld [wRequested1bppSize], a
.wait .wait
call DelayFrame call DelayFrame
ld a, [wRequested1bpp] ld a, [wRequested1bppSize]
and a and a
jr nz, .wait jr nz, .wait
@ -319,11 +319,11 @@ Request1bpp::
.cycle .cycle
ldh a, [hTilesPerCycle] ldh a, [hTilesPerCycle]
ld [wRequested1bpp], a ld [wRequested1bppSize], a
.wait2 .wait2
call DelayFrame call DelayFrame
ld a, [wRequested1bpp] ld a, [wRequested1bppSize]
and a and a
jr nz, .wait2 jr nz, .wait2

View File

@ -33,10 +33,11 @@ PrintBCDNumber::
jr nz, .loop jr nz, .loop
bit PRINTNUM_LEADINGZEROS_F, b bit PRINTNUM_LEADINGZEROS_F, b
jr z, .done ; if so, we are done jr z, .done ; if so, we are done
.numberEqualsZero ; if every digit of the BCD number is zero ; every digit of the BCD number is zero
bit PRINTNUM_LEFTALIGN_F, b bit PRINTNUM_LEFTALIGN_F, b
jr nz, .skipLeftAlignmentAdjustment jr nz, .skipLeftAlignmentAdjustment
dec hl ; if the string is left-aligned, it needs to be moved back one space ; the string is left-aligned; it needs to be moved back one space
dec hl
.skipLeftAlignmentAdjustment .skipLeftAlignmentAdjustment
bit PRINTNUM_MONEY_F, b bit PRINTNUM_MONEY_F, b
jr z, .skipCurrencySymbol jr z, .skipCurrencySymbol
@ -53,7 +54,7 @@ PrintBCDDigit::
and %00001111 and %00001111
and a and a
jr z, .zeroDigit jr z, .zeroDigit
.nonzeroDigit ; nonzero digit
bit PRINTNUM_LEADINGZEROS_F, b ; have any non-space characters been printed? bit PRINTNUM_LEADINGZEROS_F, b ; have any non-space characters been printed?
jr z, .outputDigit jr z, .outputDigit
; if bit 7 is set, then no numbers have been printed yet ; if bit 7 is set, then no numbers have been printed yet

View File

@ -278,7 +278,7 @@ Serial_PrintWaitingTextAndSyncAndExchangeNybble::
call WaitLinkTransfer call WaitLinkTransfer
jp SafeLoadTempTilemapToTilemap jp SafeLoadTempTilemapToTilemap
Serial_SyncAndExchangeNybble:: Serial_SyncAndExchangeNybble:: ; unreferenced
call LoadTilemapToTempTilemap call LoadTilemapToTempTilemap
callfar PlaceWaitingText callfar PlaceWaitingText
jp WaitLinkTransfer jp WaitLinkTransfer

View File

@ -242,7 +242,7 @@ ENDM
dict "゙", .place ; should be .diacritic dict "゙", .place ; should be .diacritic
jr .not_diacritic jr .not_diacritic
.diacritic .diacritic ; unreferenced
ld b, a ld b, a
call Diacritic call Diacritic
jp NextChar jp NextChar
@ -250,18 +250,19 @@ ENDM
.not_diacritic .not_diacritic
cp FIRST_REGULAR_TEXT_CHAR cp FIRST_REGULAR_TEXT_CHAR
jr nc, .place jr nc, .place
; dakuten or handakuten
cp "パ" cp "パ"
jr nc, .handakuten jr nc, .handakuten
; dakuten
.dakuten
cp FIRST_HIRAGANA_DAKUTEN_CHAR cp FIRST_HIRAGANA_DAKUTEN_CHAR
jr nc, .hiragana_dakuten jr nc, .hiragana_dakuten
; katakana dakuten
add "カ" - "ガ" add "カ" - "ガ"
jr .katakana_dakuten jr .place_dakuten
.hiragana_dakuten .hiragana_dakuten
add "か" - "が" add "か" - "が"
.katakana_dakuten .place_dakuten
ld b, "゙" ; dakuten ld b, "゙" ; dakuten
call Diacritic call Diacritic
jr .place jr .place
@ -269,11 +270,13 @@ ENDM
.handakuten .handakuten
cp "ぱ" cp "ぱ"
jr nc, .hiragana_handakuten jr nc, .hiragana_handakuten
; katakana handakuten
add "ハ" - "パ" add "ハ" - "パ"
jr .katakana_handakuten jr .place_handakuten
.hiragana_handakuten .hiragana_handakuten
add "は" - "ぱ" add "は" - "ぱ"
.katakana_handakuten .place_handakuten
ld b, "゚" ; handakuten ld b, "゚" ; handakuten
call Diacritic call Diacritic

View File

@ -184,7 +184,7 @@ UpdateBGMap::
THIRD_HEIGHT EQU SCREEN_HEIGHT / 3 THIRD_HEIGHT EQU SCREEN_HEIGHT / 3
.bottom ; bottom
ld de, 2 * THIRD_HEIGHT * SCREEN_WIDTH ld de, 2 * THIRD_HEIGHT * SCREEN_WIDTH
add hl, de add hl, de
ld sp, hl ld sp, hl
@ -267,7 +267,7 @@ endr
Serve1bppRequest:: Serve1bppRequest::
; Only call during the first fifth of VBlank ; Only call during the first fifth of VBlank
ld a, [wRequested1bpp] ld a, [wRequested1bppSize]
and a and a
ret z ret z
@ -278,7 +278,7 @@ Serve1bppRequest::
cp LY_VBLANK + 2 cp LY_VBLANK + 2
ret nc ret nc
; Copy [wRequested1bpp] 1bpp tiles from [wRequested1bppSource] to [wRequested1bppDest] ; Copy [wRequested1bppSize] 1bpp tiles from [wRequested1bppSource] to [wRequested1bppDest]
ld [hSPBuffer], sp ld [hSPBuffer], sp
@ -296,11 +296,11 @@ Serve1bppRequest::
ld l, a ld l, a
; # tiles to copy ; # tiles to copy
ld a, [wRequested1bpp] ld a, [wRequested1bppSize]
ld b, a ld b, a
xor a xor a
ld [wRequested1bpp], a ld [wRequested1bppSize], a
.next .next
@ -345,7 +345,7 @@ endr
Serve2bppRequest:: Serve2bppRequest::
; Only call during the first fifth of VBlank ; Only call during the first fifth of VBlank
ld a, [wRequested2bpp] ld a, [wRequested2bppSize]
and a and a
ret z ret z
@ -358,12 +358,12 @@ Serve2bppRequest::
jr _Serve2bppRequest jr _Serve2bppRequest
Serve2bppRequest_VBlank:: Serve2bppRequest_VBlank::
ld a, [wRequested2bpp] ld a, [wRequested2bppSize]
and a and a
ret z ret z
_Serve2bppRequest:: _Serve2bppRequest::
; Copy [wRequested2bpp] 2bpp tiles from [wRequested2bppSource] to [wRequested2bppDest] ; Copy [wRequested2bppSize] 2bpp tiles from [wRequested2bppSource] to [wRequested2bppDest]
ld [hSPBuffer], sp ld [hSPBuffer], sp
@ -381,11 +381,11 @@ _Serve2bppRequest::
ld l, a ld l, a
; # tiles to copy ; # tiles to copy
ld a, [wRequested2bpp] ld a, [wRequested2bppSize]
ld b, a ld b, a
xor a xor a
ld [wRequested2bpp], a ld [wRequested2bppSize], a
.next .next

View File

@ -36,8 +36,7 @@ AzaleaPokecenter1FGentlemanText:
line "fainted." line "fainted."
done done
AzaleaPokecenter1FUnusedText: AzaleaPokecenter1FUnusedText: ; unreferenced
; unreferenced
text "This BILL guy" text "This BILL guy"
line "created the system" line "created the system"

View File

@ -143,8 +143,7 @@ AzaleaTownSlowpokeScript:
closetext closetext
end end
UnusedWoosterScript: UnusedWoosterScript: ; unreferenced
; unused
faceplayer faceplayer
opentext opentext
writetext WoosterText writetext WoosterText

View File

@ -364,7 +364,7 @@ Text_RightThisWayToYourBattleRoom:
line "your BATTLE ROOM." line "your BATTLE ROOM."
done done
Text_BattleTowerIntroduction_1: Text_BattleTowerIntroduction_1: ; unreferenced
text "BATTLE TOWER is a" text "BATTLE TOWER is a"
line "facility made for" line "facility made for"
cont "#MON battles." cont "#MON battles."
@ -473,7 +473,7 @@ Text_PleaseConfirmOnThisMonitor:
line "this monitor." line "this monitor."
done done
Text_ThankYou: Text_ThankYou: ; unreferenced
text "Thank you!" text "Thank you!"
para "" para ""
@ -484,7 +484,7 @@ Text_ThanksForVisiting:
line "visiting!" line "visiting!"
done done
Text_BeatenAllTheTrainers_Mobile: Text_BeatenAllTheTrainers_Mobile: ; unreferenced
text "Congratulations!" text "Congratulations!"
para "You've beaten all" para "You've beaten all"
@ -514,7 +514,7 @@ Text_CongratulationsYouveBeatenAllTheTrainers:
para "" para ""
done done
Text_AskRegisterRecord_Mobile: Text_AskRegisterRecord_Mobile: ; unreferenced
text "Would you like to" text "Would you like to"
line "register your" line "register your"
@ -539,7 +539,7 @@ Text_YourPackIsStuffedFull:
line "and come back." line "and come back."
done done
Text_YourRegistrationIsComplete: Text_YourRegistrationIsComplete: ; unreferenced
text "Your registration" text "Your registration"
line "is complete." line "is complete."
@ -582,7 +582,7 @@ Text_CantBeRegistered_PreviousRecordDeleted:
cont "deleted. OK?" cont "deleted. OK?"
done done
Text_CheckTheLeaderHonorRoll: Text_CheckTheLeaderHonorRoll: ; unreferenced
text "Check the LEADER" text "Check the LEADER"
line "HONOR ROLL?" line "HONOR ROLL?"
done done
@ -639,7 +639,7 @@ Text_NextUpOpponentNo:
text ". Ready?" text ". Ready?"
done done
Text_SaveBeforeConnecting_Mobile: Text_SaveBeforeConnecting_Mobile: ; unreferenced
text "Your session will" text "Your session will"
line "be SAVED before" line "be SAVED before"
@ -673,7 +673,7 @@ Text_CancelYourBattleRoomChallenge:
line "ROOM challenge?" line "ROOM challenge?"
done done
Text_RegisterRecordOnFile_Mobile: Text_RegisterRecordOnFile_Mobile: ; unreferenced
text "We have your" text "We have your"
line "previous record on" line "previous record on"
@ -714,8 +714,8 @@ Text_TooMuchTimeElapsedNoRegister:
cont "challenge." cont "challenge."
done done
; a dupe? Text_RegisterRecordTimedOut_Mobile: ; unreferenced
Text_RegisterRecordTimedOut_Mobile: ; duplicate of Text_TooMuchTimeElapsedNoRegister
text "Sorry, but it's" text "Sorry, but it's"
line "not possible to" line "not possible to"

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