pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Identify more unnamed labels

Browse Source
This commit is contained in:
Rangi 2020-06-29 12:25:58 -04:00
parent 022f9e6af1
commit f2efda1f68
9 changed files with 250 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
audio/cries.asm
View File

@ -221,9 +221,9 @@ Cry_Magcargo_Ch6:
Cry_Magcargo_Ch8:
noise_note 2, 14, 8, 59
Cry_Magcargo_branch_f2ef5:
.loop:
noise_note 1, 15, 1, 78
sound_loop 5, Cry_Magcargo_branch_f2ef5
sound_loop 5, .loop
noise_note 2, 13, 8, 63
noise_note 20, 12, 2, 95
sound_ret
@ -348,7 +348,6 @@ Cry_Marill_Ch8:
Cry_Togepi_Ch5:
pitch_offset 2
Cry_Togepi_Ch6:
Cry_Togetic_branch_f3022:
duty_cycle_pattern 1, 1, 0, 2
square_note 4, 15, 1, 1942
square_note 4, 15, 1, 1837
@ -359,7 +358,7 @@ Cry_Togetic_branch_f3022:
Cry_Togetic_Ch5:
pitch_offset 2
Cry_Togetic_Ch6:
sound_call Cry_Togetic_branch_f3022
sound_call Cry_Togepi_Ch6
sound_loop 2, Cry_Togetic_Ch6
square_note 14, 0, 0, 0
square_note 8, 15, 2, 1986
@ -436,12 +435,12 @@ Cry_Hoothoot_Ch5:
Cry_Hoothoot_Ch6:
duty_cycle_pattern 0, 2, 0, 2
Cry_Hoothoot_branch_f30fb:
.loop1:
square_note 2, 10, 1, 1536
sound_loop 3, Cry_Hoothoot_branch_f30fb
Cry_Hoothoot_branch_f3103:
sound_loop 3, .loop1
.loop2:
square_note 2, 10, 1, 1584
sound_loop 4, Cry_Hoothoot_branch_f3103
sound_loop 4, .loop2
square_note 4, 10, 2, 1588
square_note 4, 9, 1, 1592
sound_ret
@ -456,11 +455,11 @@ Cry_Hoothoot_Ch8:
Cry_Sentret_Ch5:
pitch_offset 32
duty_cycle 0
sound_jump Cry_Sentret_branch_f312b
sound_jump Cry_Sentret_Ch6.body
Cry_Sentret_Ch6:
duty_cycle_pattern 0, 1, 2, 3
Cry_Sentret_branch_f312b:
.body:
square_note 8, 3, -1, 1837
square_note 8, 15, 1, 1824
sound_ret
@ -473,12 +472,11 @@ Cry_Sentret_Ch8:
Cry_Mareep_Ch5:
pitch_offset 32
duty_cycle 0
sound_jump Cry_Mareep_branch_f3145
sound_jump Cry_Mareep_Ch6.body
Cry_Mareep_Ch6:
duty_cycle_pattern 0, 0, 0, 1
Cry_Mareep_branch_f3145:
Cry_Gligar_branch_f3145:
.body:
square_note 4, 3, -2, 1853
square_note 6, 15, 8, 1890
square_note 6, 15, 8, 1888
@ -490,14 +488,14 @@ Cry_Cyndaquil_Ch5:
Cry_Cyndaquil_Ch6:
duty_cycle 2
square_note 8, 2, -7, 263
Cry_Cyndaquil_branch_f315f:
.loop1:
square_note 0, 14, 1, 1155
square_note 0, 5, 1, 1102
sound_loop 4, Cry_Cyndaquil_branch_f315f
Cry_Cyndaquil_branch_f316b:
sound_loop 4, .loop1
.loop2:
square_note 0, 14, 1, 986
square_note 1, 5, 1, 786
sound_loop 4, Cry_Cyndaquil_branch_f316b
sound_loop 4, .loop2
sound_ret
Cry_Gligar_Ch8:
@ -524,16 +522,16 @@ Cry_Chikorita_Ch8:
Cry_Gligar_Ch5:
duty_cycle_pattern 2, 2, 0, 2
sound_jump Cry_Gligar_branch_f3145
sound_jump Cry_Mareep_Ch6.body
Cry_Girafarig_Ch5:
duty_cycle 1
pitch_offset 4
sound_jump Cry_Girafarig_branch_f31af
sound_jump Cry_Girafarig_Ch6.body
Cry_Girafarig_Ch6:
duty_cycle_pattern 1, 0, 0, 1
Cry_Girafarig_branch_f31af:
.body:
square_note 4, 6, 8, 1880
square_note 2, 14, 8, 1888
square_note 2, 14, 8, 1895
@ -568,11 +566,11 @@ Cry_Slugma_Ch8:
Cry_Ledyba_Ch5:
pitch_offset 2
duty_cycle 2
sound_jump Cry_Ledyba_branch_f3202
sound_jump Cry_Ledyba_Ch6.body
Cry_Ledyba_Ch6:
duty_cycle_pattern 0, 0, 0, 1
Cry_Ledyba_branch_f3202:
.body:
square_note 3, 15, 8, 1937
square_note 3, 13, 8, 1933
square_note 2, 0, 0, 0
@ -631,24 +629,24 @@ Cry_Donphan_Ch8:
Cry_Teddiursa_Ch5:
Cry_Typhlosion_Ch5:
duty_cycle_pattern 0, 1, 0, 2
Cry_Teddiursa_branch_f3286:
.loop1:
square_note 3, 12, 1, 1937
sound_loop 3, Cry_Teddiursa_branch_f3286
Cry_Teddiursa_branch_f328e:
sound_loop 3, .loop1
.loop2:
square_note 3, 13, 1, 1201
sound_loop 6, Cry_Teddiursa_branch_f328e
Cry_Teddiursa_branch_f3296:
sound_loop 6, .loop2
.loop3:
square_note 1, 13, 1, 1169
square_note 1, 11, 1, 1105
sound_loop 6, Cry_Teddiursa_branch_f3296
Cry_Teddiursa_branch_f32a2:
sound_loop 6, .loop3
.loop4:
square_note 1, 10, 3, 1137
square_note 1, 8, 1, 1089
sound_loop 6, Cry_Teddiursa_branch_f32a2
Cry_Teddiursa_branch_f32ae:
sound_loop 6, .loop4
.loop5:
square_note 1, 4, 1, 1057
square_note 1, 2, 1, 1025
sound_loop 4, Cry_Teddiursa_branch_f32ae
sound_loop 4, .loop5
sound_ret
Cry_Teddiursa_Ch6:
@ -672,12 +670,11 @@ Cry_Typhlosion_Ch8:
Cry_Natu_Ch5:
duty_cycle_pattern 3, 1, 3, 2
Cry_Mantine_branch_f32e9:
Cry_Sunflora_branch_f32e9:
.body1:
square_note 4, 15, 8, 1969
square_note 4, 15, 8, 1968
square_note 4, 4, 8, 1967
Cry_Mantine_branch_f32f5:
.body2:
square_note 4, 15, 8, 1970
square_note 4, 15, 8, 1971
square_note 4, 4, 8, 1972
@ -685,12 +682,12 @@ Cry_Mantine_branch_f32f5:
Cry_Natu_Ch6:
Cry_Sunflora_Ch6:
Cry_Mantine_branch_f3302:
.body1:
duty_cycle_pattern 3, 3, 0, 2
square_note 4, 15, 8, 1970
square_note 4, 15, 8, 1969
square_note 4, 2, 8, 1968
Cry_Mantine_branch_f3310:
.body2:
square_note 4, 15, 8, 1972
square_note 4, 15, 8, 1974
square_note 4, 4, 8, 1976
@ -698,11 +695,11 @@ Cry_Mantine_branch_f3310:
Cry_Natu_Ch8:
Cry_Sunflora_Ch8:
Cry_Mantine_branch_f331d:
.body1:
noise_note 4, 8, 8, 5
noise_note 4, 8, 8, 4
noise_note 4, 3, 8, 3
Cry_Mantine_branch_f3326:
.body2:
noise_note 4, 8, 8, 5
noise_note 4, 8, 8, 4
noise_note 4, 8, 7, 4
@ -715,30 +712,30 @@ Cry_Teddiursa_Ch8:
Cry_Sunflora_Ch5:
duty_cycle 0
sound_jump Cry_Sunflora_branch_f32e9
sound_jump Cry_Natu_Ch5.body1
Cry_Mantine_Ch5:
duty_cycle 0
sound_call Cry_Mantine_branch_f32e9
sound_call Cry_Mantine_branch_f32f5
sound_call Cry_Natu_Ch5.body1
sound_call Cry_Natu_Ch5.body2
sound_ret
Cry_Mantine_Ch6:
sound_call Cry_Mantine_branch_f3302
sound_call Cry_Mantine_branch_f3310
sound_call Cry_Sunflora_Ch6.body1
sound_call Cry_Sunflora_Ch6.body2
sound_ret
Cry_Mantine_Ch8:
sound_call Cry_Mantine_branch_f331d
sound_call Cry_Mantine_branch_f3326
sound_call Cry_Sunflora_Ch8.body1
sound_call Cry_Sunflora_Ch8.body2
sound_ret
Cry_Ampharos_Ch5:
duty_cycle_pattern 3, 1, 3, 2
Cry_Ampharos_branch_f3355:
.loop:
square_note 1, 12, 1, 1312
square_note 1, 10, 1, 1056
sound_loop 4, Cry_Ampharos_branch_f3355
sound_loop 4, .loop
duty_cycle 0
square_note 4, 7, 8, 1888
square_note 4, 7, 8, 1840
@ -833,15 +830,15 @@ Cry_Aipom_Ch5:
Cry_Aipom_Ch6:
duty_cycle_pattern 0, 2, 1, 3
Cry_Aipom_branch_f3443:
.loop1:
square_note 1, 15, 1, 1972
sound_loop 8, Cry_Aipom_branch_f3443
Cry_Aipom_branch_f344b:
sound_loop 8, .loop1
.loop2:
square_note 1, 12, 1, 1936
sound_loop 3, Cry_Aipom_branch_f344b
Cry_Aipom_branch_f3453:
sound_loop 3, .loop2
.loop3:
square_note 1, 11, 1, 1933
sound_loop 2, Cry_Aipom_branch_f3453
sound_loop 2, .loop3
square_note 16, 9, 2, 1941
sound_ret

26
audio/sfx.asm
View File

@ -4496,18 +4496,18 @@ Sfx_Thunder_Ch8:
Sfx_Supersonic_Ch5:
duty_cycle 2
square_note 15, 3, -7, 1984
Sfx_Supersonic_branch_f21ef:
.loop:
square_note 15, 13, -7, 1984
sound_loop 4, Sfx_Supersonic_branch_f21ef
sound_loop 4, .loop
square_note 15, 13, 1, 1984
sound_ret
Sfx_Supersonic_Ch6:
duty_cycle_pattern 2, 3, 0, 3
square_note 15, 2, -7, 1992
Sfx_Supersonic_branch_f2202:
.loop:
square_note 15, 12, -7, 1991
sound_loop 4, Sfx_Supersonic_branch_f2202
sound_loop 4, .loop
square_note 15, 12, 1, 1992
sound_ret
@ -4839,10 +4839,10 @@ Sfx_HyperBeam_Ch5:
square_note 2, 15, 1, 1984
square_note 2, 15, 1, 1792
square_note 2, 15, 1, 2000
Sfx_HyperBeam_branch_f24f8:
.loop:
square_note 2, 15, 1, 1792
square_note 2, 15, 1, 2016
sound_loop 12, Sfx_HyperBeam_branch_f24f8
sound_loop 12, .loop
square_note 15, 15, 1, 1792
sound_ret
@ -4859,10 +4859,10 @@ Sfx_HyperBeam_Ch6:
square_note 2, 15, 1, 1985
square_note 2, 15, 1, 1793
square_note 2, 15, 1, 2001
Sfx_HyperBeam_branch_f2537:
.loop:
square_note 2, 15, 1, 1793
square_note 2, 15, 1, 2017
sound_loop 12, Sfx_HyperBeam_branch_f2537
sound_loop 12, .loop
square_note 15, 15, 1, 1793
sound_ret
@ -4966,17 +4966,17 @@ Sfx_Metronome_Ch5:
sound_ret
Sfx_Unknown5F_Ch5:
Sfx_Unknown5F_branch_f2617:
.loop:
square_note 2, 15, 7, 1537
square_note 2, 15, 7, 1793
sound_loop 8, Sfx_Unknown5F_Ch5
sound_loop 8, .loop
sound_ret
Sfx_Unknown5F_Ch6:
square_note 1, 15, 7, 65535
square_note 2, 15, 7, 1538
square_note 2, 15, 7, 1794
sound_loop 8, Sfx_Unknown5F_branch_f2617
sound_loop 8, Sfx_Unknown5F_Ch5.loop
sound_ret
Sfx_Fanfare2_Ch5:
@ -5160,9 +5160,9 @@ Sfx_Sandstorm_Ch8:
Sfx_Elevator_Ch5:
duty_cycle 2
pitch_sweep 5, -2
Sfx_Elevator_branch_f2726:
.loop:
square_note 2, 15, 1, 768
sound_loop 48, Sfx_Elevator_branch_f2726
sound_loop 48, .loop
pitch_sweep 0, 8
duty_cycle 2
square_note 15, 15, 3, 1840

4
constants/pokemon_data_constants.asm
View File

@ -96,8 +96,8 @@ MON_DEF EQUS "(wPartyMon1Defense - wPartyMon1)"
MON_SPD EQUS "(wPartyMon1Speed - wPartyMon1)"
MON_SAT EQUS "(wPartyMon1SpclAtk - wPartyMon1)"
MON_SDF EQUS "(wPartyMon1SpclDef - wPartyMon1)"
BOXMON_STRUCT_LENGTH EQUS "(wPartyMon1End - wPartyMon1)"
PARTYMON_STRUCT_LENGTH EQUS "(wPartyMon1StatsEnd - wPartyMon1)"
BOXMON_STRUCT_LENGTH EQUS "(wPartyMon1BoxEnd - wPartyMon1)"
PARTYMON_STRUCT_LENGTH EQUS "(wPartyMon1StructEnd - wPartyMon1)"
NICKNAMED_MON_STRUCT_LENGTH EQUS "(PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH)"
REDMON_STRUCT_LENGTH EQU 44

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

@ -711,7 +711,7 @@ EnemyWithdrewText:
text_far _EnemyWithdrewText
text_end
Function384d5: ; This appears to be unused
EnemyUsedFullHealRed: ; unreferenced
call AIUsedItemSound
call AI_HealStatus
ld a, FULL_HEAL_RED ; X_SPEED
@ -758,7 +758,7 @@ EnemyUsedDireHit:
ld a, DIRE_HIT
jp PrintText_UsedItemOn_AND_AIUpdateHUD
Function3851e: ; This appears to be unused
Function3851e: ; unreferenced
ldh [hDivisor], a
ld hl, wEnemyMonMaxHP
ld a, [hli]

4
engine/battle/ai/move.asm
View File

@ -50,7 +50,7 @@ AIChooseMove:
.CheckMovePP:
inc b
ld a, b
cp wEnemyMonMovesEnd - wEnemyMonMoves + 1
cp NUM_MOVES + 1
jr z, .ApplyLayers
inc hl
ld a, [de]
@ -119,7 +119,7 @@ AIChooseMove:
.DecrementScores:
ld hl, wBuffer1
ld de, wEnemyMonMoves
ld c, wEnemyMonMovesEnd - wEnemyMonMoves
ld c, NUM_MOVES
.DecrementNextScore:
; If the enemy has no moves, this will infinite.

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

File diff suppressed because it is too large Load Diff

2
engine/battle/core.asm
View File

@ -6403,7 +6403,7 @@ LoadEnemyMon:
ld hl, wEnemyMonStats
ld de, wEnemyStats
ld bc, wEnemyMonStatsEnd - wEnemyMonStats
ld bc, NUM_EXP_STATS * 2
call CopyBytes
ret

4
engine/events/daycare.asm
View File

@ -480,7 +480,7 @@ DayCare_GiveEgg:
ld bc, PARTYMON_STRUCT_LENGTH
call DayCare_GetCurrentPartyMember
ld hl, wEggMon
ld bc, wEggMonEnd - wEggMon
ld bc, BOXMON_STRUCT_LENGTH
call CopyBytes
call GetBaseData
@ -548,7 +548,7 @@ DayCare_InitBreeding:
.UselessJump:
xor a
ld hl, wEggMon
ld bc, wEggMonEnd - wEggMon
ld bc, BOXMON_STRUCT_LENGTH
call ByteFill
ld hl, wEggNick
ld bc, MON_NAME_LENGTH

6
macros/wram.asm
View File

@ -26,7 +26,7 @@ box_struct: MACRO
\1CaughtGender::
\1CaughtLocation:: db
\1Level:: db
\1End::
\1BoxEnd::
ENDM
party_struct: MACRO
@ -41,7 +41,7 @@ party_struct: MACRO
\1Speed:: dw
\1SpclAtk:: dw
\1SpclDef:: dw
\1StatsEnd::
\1StructEnd::
ENDM
red_box_struct: MACRO
@ -80,7 +80,6 @@ battle_struct: MACRO
\1Species:: db
\1Item:: db
\1Moves:: ds NUM_MOVES
\1MovesEnd::
\1DVs:: dw
\1PP:: ds NUM_MOVES
\1Happiness:: db
@ -94,7 +93,6 @@ battle_struct: MACRO
\1Speed:: dw
\1SpclAtk:: dw
\1SpclDef:: dw
\1StatsEnd::
\1Type::
\1Type1:: db
\1Type2:: db