pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

More WRAM tidying

Browse Source
This commit is contained in:
PikalaxALT
2016-01-12 12:46:18 -05:00
parent 35f687b536
commit 2ed6c357af
42 changed files with 1309 additions and 1365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
battle/ai/items.asm
View File

@@ -549,7 +549,7 @@ AIUpdateHUD: ; 38387
callba UpdateEnemyHUD callba UpdateEnemyHUD
ld a, $1 ld a, $1
ld [hBGMapMode], a ld [hBGMapMode], a
ld hl, wc6e6 ld hl, wEnemyItemState
dec [hl] dec [hl]
scf scf
ret ret

8
battle/ai/scoring.asm
View File

@@ -982,7 +982,7 @@ AI_Smart_Whirlwind: ; 38a2a
push hl push hl
callab CheckPlayerMoveTypeMatchups callab CheckPlayerMoveTypeMatchups
ld a, [wc716] ld a, [wEnemyAISwitchScore]
cp 10 ; neutral cp 10 ; neutral
pop hl pop hl
ret c ret c
@@ -1909,7 +1909,7 @@ AI_Smart_MeanLook: ; 38dfb
; Otherwise, discourage this move unless the player only has not very effective moves against the enemy. ; Otherwise, discourage this move unless the player only has not very effective moves against the enemy.
push hl push hl
callab CheckPlayerMoveTypeMatchups callab CheckPlayerMoveTypeMatchups
ld a, [wc716] ld a, [wEnemyAISwitchScore]
cp $b ; not very effective cp $b ; not very effective
pop hl pop hl
ret nc ret nc
@@ -2170,7 +2170,7 @@ AI_Smart_PerishSong: ; 38f4a
push hl push hl
callab CheckPlayerMoveTypeMatchups callab CheckPlayerMoveTypeMatchups
ld a, [wc716] ld a, [wEnemyAISwitchScore]
cp 10 ; 1.0 cp 10 ; 1.0
pop hl pop hl
ret c ret c
@@ -2432,7 +2432,7 @@ AI_Smart_BatonPass: ; 39062
push hl push hl
callab CheckPlayerMoveTypeMatchups callab CheckPlayerMoveTypeMatchups
ld a, [wc716] ld a, [wEnemyAISwitchScore]
cp 10 ; neutral cp 10 ; neutral
pop hl pop hl
ret c ret c

36
battle/ai/switch.asm
View File

@@ -6,7 +6,7 @@ CheckPlayerMoveTypeMatchups: ; 3484e
push de push de
push bc push bc
ld a, 10 ld a, 10
ld [wc716], a ld [wEnemyAISwitchScore], a
ld hl, PlayerUsedMoves ld hl, PlayerUsedMoves
ld a, [hl] ld a, [hl]
and a and a
@@ -167,17 +167,17 @@ endr
.DecreaseScore: ; 34931 .DecreaseScore: ; 34931
ld a, [wc716] ld a, [wEnemyAISwitchScore]
dec a dec a
ld [wc716], a ld [wEnemyAISwitchScore], a
ret ret
; 34939 ; 34939
.IncreaseScore: ; 34939 .IncreaseScore: ; 34939
ld a, [wc716] ld a, [wEnemyAISwitchScore]
inc a inc a
ld [wc716], a ld [wEnemyAISwitchScore], a
ret ret
; 34941 ; 34941
@@ -206,7 +206,7 @@ CheckAbleToSwitch: ; 34941
cp 2 cp 2
jr nz, .not_2 jr nz, .not_2
ld a, [wc716] ld a, [wEnemyAISwitchScore]
add $30 add $30
ld [wEnemySwitchMonParam], a ld [wEnemySwitchMonParam], a
ret ret
@@ -230,7 +230,7 @@ CheckAbleToSwitch: ; 34941
.no_perish .no_perish
call CheckPlayerMoveTypeMatchups call CheckPlayerMoveTypeMatchups
ld a, [wc716] ld a, [wEnemyAISwitchScore]
cp 11 cp 11
ret nc ret nc
@@ -239,13 +239,13 @@ CheckAbleToSwitch: ; 34941
jr z, .no_last_counter_move jr z, .no_last_counter_move
call Function34a2a call Function34a2a
ld a, [wc716] ld a, [wEnemyAISwitchScore]
and a and a
jr z, .no_last_counter_move jr z, .no_last_counter_move
ld c, a ld c, a
call Function34aa7 call Function34aa7
ld a, [wc716] ld a, [wEnemyAISwitchScore]
cp $ff cp $ff
ret z ret z
@@ -255,7 +255,7 @@ CheckAbleToSwitch: ; 34941
jr z, .not_2_again jr z, .not_2_again
call CheckPlayerMoveTypeMatchups call CheckPlayerMoveTypeMatchups
ld a, [wc716] ld a, [wEnemyAISwitchScore]
cp 10 cp 10
ret nc ret nc
@@ -267,7 +267,7 @@ CheckAbleToSwitch: ; 34941
.not_2_again .not_2_again
ld c, $10 ld c, $10
call CheckPlayerMoveTypeMatchups call CheckPlayerMoveTypeMatchups
ld a, [wc716] ld a, [wEnemyAISwitchScore]
cp 10 cp 10
jr nc, .okay jr nc, .okay
ld c, $20 ld c, $20
@@ -280,7 +280,7 @@ CheckAbleToSwitch: ; 34941
.no_last_counter_move .no_last_counter_move
call CheckPlayerMoveTypeMatchups call CheckPlayerMoveTypeMatchups
ld a, [wc716] ld a, [wEnemyAISwitchScore]
cp 10 cp 10
ret nc ret nc
@@ -293,7 +293,7 @@ CheckAbleToSwitch: ; 34941
cp $2 cp $2
ret nz ret nz
ld a, [wc716] ld a, [wEnemyAISwitchScore]
add $10 add $10
ld [wEnemySwitchMonParam], a ld [wEnemySwitchMonParam], a
ret ret
@@ -359,7 +359,7 @@ Function34a2a: ; 34a2a
ld c, 1 << (PARTY_LENGTH - 1) ld c, 1 << (PARTY_LENGTH - 1)
ld d, 0 ld d, 0
xor a xor a
ld [wc716], a ld [wEnemyAISwitchScore], a
.asm_34a39 .asm_34a39
ld a, [CurOTMon] ld a, [CurOTMon]
@@ -395,9 +395,9 @@ Function34a2a: ; 34a2a
and a and a
jr nz, .asm_34a77 jr nz, .asm_34a77
ld a, [wc716] ld a, [wEnemyAISwitchScore]
or c or c
ld [wc716], a ld [wEnemyAISwitchScore], a
.asm_34a77 .asm_34a77
pop hl pop hl
dec b dec b
@@ -451,7 +451,7 @@ Function34a85: ; 34a85
Function34aa7: ; 34aa7 Function34aa7: ; 34aa7
ld a, $ff ld a, $ff
ld [wc716], a ld [wEnemyAISwitchScore], a
ld hl, OTPartyMon1Moves ld hl, OTPartyMon1Moves
ld b, 1 << (PARTY_LENGTH - 1) ld b, 1 << (PARTY_LENGTH - 1)
ld d, 0 ld d, 0
@@ -540,7 +540,7 @@ Function34aa7: ; 34aa7
jr nc, .loop2 jr nc, .loop2
ld a, c ld a, c
ld [wc716], a ld [wEnemyAISwitchScore], a
pop bc pop bc
ret ret
; 34b20 ; 34b20

4
battle/bg_effects.asm
View File

@@ -748,7 +748,7 @@ endr
jr z, .clear jr z, .clear
cp -3 cp -3
jr z, .skip jr z, .skip
call .FillBox call .PlaceGraphic
.skip .skip
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
ld a, $1 ld a, $1
@@ -798,7 +798,7 @@ endr
pop bc pop bc
ret ret
.FillBox .PlaceGraphic
; get dims ; get dims
push bc push bc
push hl push hl

150
battle/core.asm
View File

@@ -3,7 +3,7 @@ BattleCore:
DoBattle: ; 3c000 DoBattle: ; 3c000
xor a xor a
ld [wBattleParticipantsNotFainted], a ld [wBattleParticipantsNotFainted], a
ld [wc6fc], a ld [wBattleParticipantsIncludingFainted], a
ld [wPlayerAction], a ld [wPlayerAction], a
ld [BattleEnded], a ld [BattleEnded], a
inc a inc a
@@ -2110,8 +2110,8 @@ HandleEnemyMonFaint: ; 3cd55
or [hl] or [hl]
call z, FaintYourPokemon call z, FaintYourPokemon
xor a xor a
ld [wc6f7], a ld [wWhichMonFaintedFirst], a
call Function3ce01 call UpdateBattleStateAndExperienceAfterEnemyFaint
call CheckPlayerPartyForFitPkmn call CheckPlayerPartyForFitPkmn
ld a, d ld a, d
and a and a
@@ -2202,7 +2202,7 @@ DoubleSwitch: ; 3cdca
ret ret
; 3ce01 ; 3ce01
Function3ce01: ; 3ce01 UpdateBattleStateAndExperienceAfterEnemyFaint: ; 3ce01
call UpdateBattleMonInParty call UpdateBattleMonInParty
ld a, [wBattleMode] ld a, [wBattleMode]
dec a dec a
@@ -2231,14 +2231,14 @@ Function3ce01: ; 3ce01
.wild2 .wild2
call StopDangerSound call StopDangerSound
ld a, $1 ld a, $1
ld [wc6fd], a ld [wDanger], a
.trainer .trainer
ld hl, BattleMonHP ld hl, BattleMonHP
ld a, [hli] ld a, [hli]
or [hl] or [hl]
jr nz, .player_mon_did_not_faint jr nz, .player_mon_did_not_faint
ld a, [wc6f7] ld a, [wWhichMonFaintedFirst]
and a and a
jr nz, .player_mon_did_not_faint jr nz, .player_mon_did_not_faint
call PlayerMonFaintHappinessMod call PlayerMonFaintHappinessMod
@@ -2256,10 +2256,10 @@ Function3ce01: ; 3ce01
ld a, [wBattleResult] ld a, [wBattleResult]
and $c0 and $c0
ld [wBattleResult], a ld [wBattleResult], a
call DoOthersShareExperience call IsAnyMonHoldingExpShare
jr z, .skip_exp jr z, .skip_exp
ld hl, EnemyMonBaseStats ld hl, EnemyMonBaseStats
ld b, $7 ld b, EnemyMonEnd - EnemyMonBaseStats
.loop .loop
srl [hl] srl [hl]
inc hl inc hl
@@ -2268,32 +2268,32 @@ Function3ce01: ; 3ce01
.skip_exp .skip_exp
ld hl, EnemyMonBaseStats ld hl, EnemyMonBaseStats
ld de, wc720 ld de, wBackupEnemyMonBaseStats
ld bc, EnemyMonEnd - EnemyMonBaseStats ld bc, EnemyMonEnd - EnemyMonBaseStats
call CopyBytes call CopyBytes
xor a xor a
ld [wc71f], a ld [wGivingExperienceToExpShareHolders], a
call GiveExperiencePoints call GiveExperiencePoints
call DoOthersShareExperience call IsAnyMonHoldingExpShare
ret z ret z
ld a, [wBattleParticipantsNotFainted] ld a, [wBattleParticipantsNotFainted]
push af push af
ld a, d ld a, d
ld [wBattleParticipantsNotFainted], a ld [wBattleParticipantsNotFainted], a
ld hl, wc720 ld hl, wBackupEnemyMonBaseStats
ld de, EnemyMonBaseStats ld de, EnemyMonBaseStats
ld bc, EnemyMonEnd - EnemyMonBaseStats ld bc, EnemyMonEnd - EnemyMonBaseStats
call CopyBytes call CopyBytes
ld a, $1 ld a, $1
ld [wc71f], a ld [wGivingExperienceToExpShareHolders], a
call GiveExperiencePoints call GiveExperiencePoints
pop af pop af
ld [wBattleParticipantsNotFainted], a ld [wBattleParticipantsNotFainted], a
ret ret
; 3ceaa ; 3ceaa
DoOthersShareExperience: ; 3ceaa IsAnyMonHoldingExpShare: ; 3ceaa
ld a, [PartyCount] ld a, [PartyCount]
ld b, a ld b, a
ld hl, PartyMon1 ld hl, PartyMon1
@@ -2465,7 +2465,7 @@ WinTrainerBattle: ; 3cfa4
; Player won the battle ; Player won the battle
call StopDangerSound call StopDangerSound
ld a, $1 ld a, $1
ld [wc6fd], a ld [wDanger], a
ld [BattleEnded], a ld [BattleEnded], a
ld a, [wLinkMode] ld a, [wLinkMode]
and a and a
@@ -2682,7 +2682,7 @@ PlayVictoryMusic: ; 3d0ea
dec a dec a
jr nz, .trainer_victory jr nz, .trainer_victory
push de push de
call DoOthersShareExperience call IsAnyMonHoldingExpShare
pop de pop de
jr nz, .play_music jr nz, .play_music
ld hl, wPayDayMoney ld hl, wPayDayMoney
@@ -2771,7 +2771,7 @@ HandlePlayerMonFaint: ; 3d14e
or [hl] or [hl]
call z, FaintEnemyPokemon call z, FaintEnemyPokemon
ld a, $1 ld a, $1
ld [wc6f7], a ld [wWhichMonFaintedFirst], a
call PlayerMonFaintHappinessMod call PlayerMonFaintHappinessMod
call CheckPlayerPartyForFitPkmn call CheckPlayerPartyForFitPkmn
ld a, d ld a, d
@@ -2781,7 +2781,7 @@ HandlePlayerMonFaint: ; 3d14e
ld a, [hli] ld a, [hli]
or [hl] or [hl]
jr nz, .notfainted jr nz, .notfainted
call Function3ce01 call UpdateBattleStateAndExperienceAfterEnemyFaint
ld a, [wBattleMode] ld a, [wBattleMode]
dec a dec a
jr nz, .trainer jr nz, .trainer
@@ -2847,7 +2847,7 @@ PlayerMonFaintHappinessMod: ; 3d1aa
and %11000000 and %11000000
add $1 add $1
ld [wBattleResult], a ld [wBattleResult], a
ld a, [wc6f7] ld a, [wWhichMonFaintedFirst]
and a and a
ret z ret z
ret ; ?????????? ret ; ??????????
@@ -3338,7 +3338,7 @@ EnemySwitch: ; 3d4e1
; If we're here, then we're switching too ; If we're here, then we're switching too
xor a xor a
ld [wBattleParticipantsNotFainted], a ld [wBattleParticipantsNotFainted], a
ld [wc6fc], a ld [wBattleParticipantsIncludingFainted], a
ld [wPlayerAction], a ld [wPlayerAction], a
inc a inc a
ld [wEnemyIsSwitching], a ld [wEnemyIsSwitching], a
@@ -3403,7 +3403,7 @@ ResetEnemyBattleVars: ; 3d557
ld [LastEnemyMove], a ld [LastEnemyMove], a
ld [CurEnemyMove], a ld [CurEnemyMove], a
dec a dec a
ld [wc6e6], a ld [wEnemyItemState], a
xor a xor a
ld [wPlayerWrapCount], a ld [wPlayerWrapCount], a
hlcoord 18, 0 hlcoord 18, 0
@@ -3416,7 +3416,7 @@ ResetEnemyBattleVars: ; 3d557
ResetBattleParticipants: ; 3d57a ResetBattleParticipants: ; 3d57a
xor a xor a
ld [wBattleParticipantsNotFainted], a ld [wBattleParticipantsNotFainted], a
ld [wc6fc], a ld [wBattleParticipantsIncludingFainted], a
AddBattleParticipant: ; 3d581 AddBattleParticipant: ; 3d581
ld a, [CurBattleMon] ld a, [CurBattleMon]
ld c, a ld c, a
@@ -3425,7 +3425,7 @@ AddBattleParticipant: ; 3d581
push bc push bc
predef FlagPredef predef FlagPredef
pop bc pop bc
ld hl, wc6fc ld hl, wBattleParticipantsIncludingFainted
predef_jump FlagPredef predef_jump FlagPredef
; 3d599 ; 3d599
@@ -4250,7 +4250,7 @@ SendOutPlayerMon: ; 3db5f
ld [hBGMapMode], a ld [hBGMapMode], a
call GetMonBackpic call GetMonBackpic
xor a xor a
ld [hFillBox], a ld [hGraphicStartTile], a
ld [wd0d2], a ld [wd0d2], a
ld [CurMoveNum], a ld [CurMoveNum], a
ld [TypeModifier], a ld [TypeModifier], a
@@ -4418,7 +4418,7 @@ PursuitSwitch: ; 3dc5b
ld [CryTracks], a ld [CryTracks], a
ld a, [BattleMonSpecies] ld a, [BattleMonSpecies]
call PlayStereoCry call PlayStereoCry
ld a, [wc71a] ld a, [LastPlayerMon]
ld c, a ld c, a
ld hl, wBattleParticipantsNotFainted ld hl, wBattleParticipantsNotFainted
ld b, RESET_FLAG ld b, RESET_FLAG
@@ -4887,7 +4887,7 @@ CheckDanger: ; 3df9e
ld a, [hli] ld a, [hli]
or [hl] or [hl]
jr z, .no_danger jr z, .no_danger
ld a, [wc6fd] ld a, [wDanger]
and a and a
jr nz, .done jr nz, .done
ld a, [PlayerHPPal] ld a, [PlayerHPPal]
@@ -5771,7 +5771,7 @@ MoveSelectionScreen: ; 3e4bc
dec a dec a
cp c cp c
jr z, .move_disabled jr z, .move_disabled
ld a, [wc6e1] ld a, [wUnusedPlayerLockedMove]
and a and a
jr nz, .skip2 jr nz, .skip2
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
@@ -7383,7 +7383,7 @@ GiveExperiencePoints: ; 3ee3b
bit 0, a bit 0, a
ret nz ret nz
call Function3f0d4 call .EvenlyDivideExpAmongParticipants
xor a xor a
ld [CurPartyMon], a ld [CurPartyMon], a
ld bc, PartyMon1Species ld bc, PartyMon1Species
@@ -7407,6 +7407,7 @@ GiveExperiencePoints: ; 3ee3b
pop bc pop bc
jp z, .skip_stats jp z, .skip_stats
; give stat exp
ld hl, MON_STAT_EXP + 1 ld hl, MON_STAT_EXP + 1
add hl, bc add hl, bc
ld d, h ld d, h
@@ -7472,6 +7473,7 @@ GiveExperiencePoints: ; 3ee3b
ld [hDivisor], a ld [hDivisor], a
ld b, 4 ld b, 4
call Divide call Divide
; Boost Experience for traded Pokemon
pop bc pop bc
ld hl, MON_ID ld hl, MON_ID
add hl, bc add hl, bc
@@ -7489,10 +7491,12 @@ GiveExperiencePoints: ; 3ee3b
ld a, $1 ld a, $1
.no_boost .no_boost
; Boost experience for a Trainer Battle
ld [StringBuffer2 + 2], a ld [StringBuffer2 + 2], a
ld a, [wBattleMode] ld a, [wBattleMode]
dec a dec a
call nz, BoostExp call nz, BoostExp
; Boost experience for Lucky Egg
push bc push bc
ld a, MON_ITEM ld a, MON_ITEM
call GetPartyParamLocation call GetPartyParamLocation
@@ -7513,7 +7517,7 @@ GiveExperiencePoints: ; 3ee3b
ld a, [StringBuffer2] ld a, [StringBuffer2]
ld [hQuotient + 1], a ld [hQuotient + 1], a
pop bc pop bc
call Function3f136 call AnimateExpBar
push bc push bc
call LoadTileMapToTempTileMap call LoadTileMapToTempTileMap
pop bc pop bc
@@ -7748,26 +7752,26 @@ GiveExperiencePoints: ; 3ee3b
jp ResetBattleParticipants jp ResetBattleParticipants
; 3f0d4 ; 3f0d4
Function3f0d4: ; 3f0d4 .EvenlyDivideExpAmongParticipants
; count number of battle participants ; count number of battle participants
ld a, [wBattleParticipantsNotFainted] ld a, [wBattleParticipantsNotFainted]
ld b, a ld b, a
ld c, PARTY_LENGTH ld c, PARTY_LENGTH
ld d, 0 ld d, 0
.loop .count_loop
xor a xor a
srl b srl b
adc d adc d
ld d, a ld d, a
dec c dec c
jr nz, .loop jr nz, .count_loop
cp 2 cp 2
ret c ret c
ld [wd265], a ld [wd265], a
ld hl, EnemyMonBaseStats ld hl, EnemyMonBaseStats
ld c, EnemyMonEnd - EnemyMonBaseStats ld c, EnemyMonEnd - EnemyMonBaseStats
.loop2 .count_loop2
xor a xor a
ld [hDividend + 0], a ld [hDividend + 0], a
ld a, [hl] ld a, [hl]
@@ -7779,7 +7783,7 @@ Function3f0d4: ; 3f0d4
ld a, [hQuotient + 2] ld a, [hQuotient + 2]
ld [hli], a ld [hli], a
dec c dec c
jr nz, .loop2 jr nz, .count_loop2
ret ret
; 3f106 ; 3f106
@@ -7827,7 +7831,7 @@ TextJump_StringBuffer2ExpPoints: ; 3f131
; 3f136 ; 3f136
Function3f136: ; 3f136 AnimateExpBar: ; 3f136
push bc push bc
ld hl, CurPartyMon ld hl, CurPartyMon
@@ -7864,15 +7868,15 @@ Function3f136: ; 3f136
ld a, [wd003] ld a, [wd003]
adc [hl] adc [hl]
ld [hld], a ld [hld], a
jr nc, .asm_3f186 jr nc, .NoOverflow
inc [hl] inc [hl]
jr nz, .asm_3f186 jr nz, .NoOverflow
ld a, $ff ld a, $ff
ld [hli], a ld [hli], a
ld [hli], a ld [hli], a
ld [hl], a ld [hl], a
.asm_3f186 .NoOverflow
ld d, MAX_LEVEL ld d, MAX_LEVEL
callab CalcExpAtLevel callab CalcExpAtLevel
ld a, [hProduct + 1] ld a, [hProduct + 1]
@@ -7888,7 +7892,7 @@ Function3f136: ; 3f136
sbc c sbc c
ld a, [hl] ld a, [hl]
sbc b sbc b
jr c, .asm_3f1a8 jr c, .AlreadyAtMaxExp
ld a, b ld a, b
ld [hli], a ld [hli], a
ld a, c ld a, c
@@ -7896,37 +7900,37 @@ Function3f136: ; 3f136
ld a, d ld a, d
ld [hld], a ld [hld], a
.asm_3f1a8 .AlreadyAtMaxExp
callab CalcLevel callab CalcLevel
ld a, d ld a, d
pop bc pop bc
pop de pop de
ld d, a ld d, a
cp e cp e
jr nc, .asm_3f1b7 jr nc, .LoopLevels
ld a, e ld a, e
ld d, a ld d, a
.asm_3f1b7 .LoopLevels
ld a, e ld a, e
cp MAX_LEVEL cp MAX_LEVEL
jr nc, .asm_3f1ff jr nc, .FinishExpBar
cp d cp d
jr z, .asm_3f1ff jr z, .FinishExpBar
inc a inc a
ld [TempMonLevel], a ld [TempMonLevel], a
ld [CurPartyLevel], a ld [CurPartyLevel], a
ld [BattleMonLevel], a ld [BattleMonLevel], a
push de push de
call Function3f21b call .PlayExpBarSound
ld c, $40 ld c, $40
call Function3f22c call .LoopBarAnimation
call PrintPlayerHUD call PrintPlayerHUD
ld hl, BattleMonNick ld hl, BattleMonNick
ld de, StringBuffer1 ld de, StringBuffer1
ld bc, PKMN_NAME_LENGTH ld bc, PKMN_NAME_LENGTH
call CopyBytes call CopyBytes
call Function3dfe call TerminateExpBarSound
ld de, SFX_HIT_END_OF_EXP_BAR ld de, SFX_HIT_END_OF_EXP_BAR
call PlaySFX call PlaySFX
callba AnimateEndOfExpBar callba AnimateEndOfExpBar
@@ -7936,9 +7940,9 @@ Function3f136: ; 3f136
pop de pop de
inc e inc e
ld b, $0 ld b, $0
jr .asm_3f1b7 jr .LoopLevels
.asm_3f1ff .FinishExpBar
push bc push bc
ld b, d ld b, d
ld de, TempMonExp + 2 ld de, TempMonExp + 2
@@ -7946,9 +7950,9 @@ Function3f136: ; 3f136
ld a, b ld a, b
pop bc pop bc
ld c, a ld c, a
call Function3f21b call .PlayExpBarSound
call Function3f22c call .LoopBarAnimation
call Function3dfe call TerminateExpBarSound
pop af pop af
ld [hProduct + 2], a ld [hProduct + 2], a
pop af pop af
@@ -7957,9 +7961,8 @@ Function3f136: ; 3f136
.finish .finish
pop bc pop bc
ret ret
; 3f21b
Function3f21b: ; 3f21b .PlayExpBarSound
push bc push bc
call WaitSFX call WaitSFX
ld de, SFX_EXP_BAR ld de, SFX_EXP_BAR
@@ -7968,12 +7971,11 @@ Function3f21b: ; 3f21b
call DelayFrames call DelayFrames
pop bc pop bc
ret ret
; 3f22c
Function3f22c: ; 3f22c .LoopBarAnimation
ld d, $3 ld d, 3
dec b dec b
.asm_3f22f .anim_loop
inc b inc b
push bc push bc
push de push de
@@ -7989,7 +7991,7 @@ Function3f22c: ; 3f22c
pop bc pop bc
ld a, c ld a, c
cp b cp b
jr z, .asm_3f268 jr z, .end_animation
inc b inc b
push bc push bc
push de push de
@@ -8003,16 +8005,14 @@ Function3f22c: ; 3f22c
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
dec d dec d
jr nz, .asm_3f263 jr nz, .min_number_of_frames
ld d, $1 ld d, 1
.min_number_of_frames
.asm_3f263
pop bc pop bc
ld a, c ld a, c
cp b cp b
jr nz, .asm_3f22f jr nz, .anim_loop
.end_animation
.asm_3f268
ld a, $1 ld a, $1
ld [hBGMapMode], a ld [hBGMapMode], a
ret ret
@@ -8575,12 +8575,12 @@ InitEnemyTrainer: ; 3f594
ld de, VTiles2 ld de, VTiles2
callab GetTrainerPic callab GetTrainerPic
xor a xor a
ld [hFillBox], a ld [hGraphicStartTile], a
dec a dec a
ld [wc6e6], a ld [wEnemyItemState], a
hlcoord 12, 0 hlcoord 12, 0
lb bc, 7, 7 lb bc, 7, 7
predef FillBox predef PlaceGraphic
ld a, -1 ld a, -1
ld [CurOTMon], a ld [CurOTMon], a
ld a, TRAINER_BATTLE ld a, TRAINER_BATTLE
@@ -8640,10 +8640,10 @@ InitEnemyWildmon: ; 3f607
predef FrontpicPredef predef FrontpicPredef
xor a xor a
ld [TrainerClass], a ld [TrainerClass], a
ld [hFillBox], a ld [hGraphicStartTile], a
hlcoord 12, 0 hlcoord 12, 0
lb bc, 7, 7 lb bc, 7, 7
predef FillBox predef PlaceGraphic
ret ret
; 3f662 ; 3f662
@@ -9402,10 +9402,10 @@ InitBattleDisplay: ; 3fb6c
ld a, $1 ld a, $1
ld [hBGMapMode], a ld [hBGMapMode], a
ld a, $31 ld a, $31
ld [hFillBox], a ld [hGraphicStartTile], a
hlcoord 2, 6 hlcoord 2, 6
lb bc, 6, 6 lb bc, 6, 6
predef FillBox predef PlaceGraphic
xor a xor a
ld [hWY], a ld [hWY], a
ld [rWY], a ld [rWY], a
@@ -9499,10 +9499,10 @@ CopyBackpic: ; 3fc30
ld [rSVBK], a ld [rSVBK], a
call Function3fc5b call Function3fc5b
ld a, $31 ld a, $31
ld [hFillBox], a ld [hGraphicStartTile], a
hlcoord 2, 6 hlcoord 2, 6
lb bc, 6, 6 lb bc, 6, 6
predef FillBox predef PlaceGraphic
ret ret
; 3fc5b ; 3fc5b

10
battle/effect_commands.asm
View File

@@ -3155,7 +3155,7 @@ BattleCommand_BeatUp: ; 35461
xor a xor a
ld [PlayerRolloutCount], a ld [PlayerRolloutCount], a
ld [wd002], a ld [wd002], a
ld [wc72d], a ld [wBeatUpHitAtLeastOnce], a
jr .got_mon jr .got_mon
.next_mon .next_mon
@@ -3188,7 +3188,7 @@ BattleCommand_BeatUp: ; 35461
jp nz, .beatup_fail jp nz, .beatup_fail
ld a, $1 ld a, $1
ld [wc72d], a ld [wBeatUpHitAtLeastOnce], a
ld hl, BeatUpAttackText ld hl, BeatUpAttackText
call StdBattleTextBox call StdBattleTextBox
ld a, [EnemyMonSpecies] ld a, [EnemyMonSpecies]
@@ -3223,7 +3223,7 @@ BattleCommand_BeatUp: ; 35461
xor a xor a
ld [EnemyRolloutCount], a ld [EnemyRolloutCount], a
ld [wd002], a ld [wd002], a
ld [wc72d], a ld [wBeatUpHitAtLeastOnce], a
jr .enemy_continue jr .enemy_continue
.not_first_enemy_beatup .not_first_enemy_beatup
@@ -3283,7 +3283,7 @@ BattleCommand_BeatUp: ; 35461
jr nz, .beatup_fail jr nz, .beatup_fail
ld a, $1 ld a, $1
ld [wc72d], a ld [wBeatUpHitAtLeastOnce], a
jr .finish_beatup jr .finish_beatup
.wild .wild
@@ -3332,7 +3332,7 @@ BattleCommand_BeatUp: ; 35461
BattleCommanda8: ; 355b5 BattleCommanda8: ; 355b5
ld a, [wc72d] ld a, [wBeatUpHitAtLeastOnce]
and a and a
ret nz ret nz

4
battle/misc.asm
View File

@@ -32,8 +32,8 @@ AppearUser: ; fbd77 (3e:7d77)
call GetPlayerBackpicCoords call GetPlayerBackpicCoords
ld a, $31 ld a, $31
.okay .okay
ld [hFillBox], a ld [hGraphicStartTile], a
predef FillBox predef PlaceGraphic
FinishAppearDisappearUser: ; fbd91 (3e:7d91) FinishAppearDisappearUser: ; fbd91 (3e:7d91)
ld a, $1 ld a, $1
ld [hBGMapMode], a ld [hBGMapMode], a

61
constants/map_constants.asm
View File

@@ -668,36 +668,37 @@ EMOTE_OBJECT EQU 7
; fruit trees ; fruit trees
const_value SET 1 const_value SET 1
const FRUITTREE_ROUTE_29 const FRUITTREE_ROUTE_29 ; 01
const FRUITTREE_ROUTE_30_1 const FRUITTREE_ROUTE_30_1 ; 02
const FRUITTREE_ROUTE_38 const FRUITTREE_ROUTE_38 ; 03
const FRUITTREE_ROUTE_46_1 const FRUITTREE_ROUTE_46_1 ; 04
const FRUITTREE_ROUTE_30_2 const FRUITTREE_ROUTE_30_2 ; 05
const FRUITTREE_ROUTE_33 const FRUITTREE_ROUTE_33 ; 06
const FRUITTREE_ROUTE_31 const FRUITTREE_ROUTE_31 ; 07
const FRUITTREE_ROUTE_43 const FRUITTREE_ROUTE_43 ; 08
const FRUITTREE_VIOLET_CITY const FRUITTREE_VIOLET_CITY ; 09
const FRUITTREE_ROUTE_46_2 const FRUITTREE_ROUTE_46_2 ; 0a
const FRUITTREE_ROUTE_35 const FRUITTREE_ROUTE_35 ; 0b
const FRUITTREE_ROUTE_45 const FRUITTREE_ROUTE_45 ; 0c
const FRUITTREE_ROUTE_36 const FRUITTREE_ROUTE_36 ; 0d
const FRUITTREE_ROUTE_26 const FRUITTREE_ROUTE_26 ; 0e
const FRUITTREE_ROUTE_39 const FRUITTREE_ROUTE_39 ; 0f
const FRUITTREE_ROUTE_44 const FRUITTREE_ROUTE_44 ; 10
const FRUITTREE_ROUTE_37_1 const FRUITTREE_ROUTE_37_1 ; 11
const FRUITTREE_ROUTE_37_2 const FRUITTREE_ROUTE_37_2 ; 12
const FRUITTREE_ROUTE_37_3 const FRUITTREE_ROUTE_37_3 ; 13
const FRUITTREE_AZALEA_TOWN const FRUITTREE_AZALEA_TOWN ; 14
const FRUITTREE_ROUTE_42_1 const FRUITTREE_ROUTE_42_1 ; 15
const FRUITTREE_ROUTE_42_2 const FRUITTREE_ROUTE_42_2 ; 16
const FRUITTREE_ROUTE_42_3 const FRUITTREE_ROUTE_42_3 ; 17
const FRUITTREE_ROUTE_11 const FRUITTREE_ROUTE_11 ; 18
const FRUITTREE_ROUTE_2 const FRUITTREE_ROUTE_2 ; 19
const FRUITTREE_ROUTE_1 const FRUITTREE_ROUTE_1 ; 1a
const FRUITTREE_ROUTE_8 const FRUITTREE_ROUTE_8 ; 1b
const FRUITTREE_PEWTER_CITY_1 const FRUITTREE_PEWTER_CITY_1 ; 1c
const FRUITTREE_PEWTER_CITY_2 const FRUITTREE_PEWTER_CITY_2 ; 1d
const FRUITTREE_FUCHSIA_CITY const FRUITTREE_FUCHSIA_CITY ; 1e
NUM_FRUIT_TREES EQU const_value +- 1
CMDQUEUE_TYPE EQU 0 CMDQUEUE_TYPE EQU 0
CMDQUEUE_ADDR EQU 1 CMDQUEUE_ADDR EQU 1

4
engine/breeding/egg.asm
View File

@@ -677,9 +677,9 @@ Hatch_UpdateFrontpicBGMapCenter: ; 17254 (5:7254)
ld a, b ld a, b
ld [hBGMapAddress + 1], a ld [hBGMapAddress + 1], a
ld a, c ld a, c
ld [hFillBox], a ld [hGraphicStartTile], a
lb bc, 7, 7 lb bc, 7, 7
predef FillBox predef PlaceGraphic
pop af pop af
call Hatch_LoadFrontpicPal call Hatch_LoadFrontpicPal
call SetPalettes call SetPalettes

8
engine/debug.asm
View File

@@ -401,10 +401,10 @@ Function81adb: ; 81adb
ld de, VTiles2 tile $31 ld de, VTiles2 tile $31
predef GetBackpic predef GetBackpic
ld a, $31 ld a, $31
ld [hFillBox], a ld [hGraphicStartTile], a
hlcoord 2, 4 hlcoord 2, 4
lb bc, 6, 6 lb bc, 6, 6
predef FillBox predef PlaceGraphic
ld a, [wd003] ld a, [wd003]
and a and a
jr z, .asm_81b66 jr z, .asm_81b66
@@ -433,10 +433,10 @@ Function81adb: ; 81adb
callab GetTrainerPic callab GetTrainerPic
xor a xor a
ld [TempEnemyMonSpecies], a ld [TempEnemyMonSpecies], a
ld [hFillBox], a ld [hGraphicStartTile], a
hlcoord 2, 3 hlcoord 2, 3
lb bc, 7, 7 lb bc, 7, 7
predef FillBox predef PlaceGraphic
.asm_81ba9 .asm_81ba9
ld a, $1 ld a, $1

2
engine/engine_flags.asm
View File

@@ -108,7 +108,7 @@ ENDM
engine_flag wMomSavingMoney, 0 ; mom saving money ; $8 engine_flag wMomSavingMoney, 0 ; mom saving money ; $8
engine_flag wMomSavingMoney, 7 ; dst engine_flag wMomSavingMoney, 7 ; dst
engine_flag wdc39, 0 ; unused, possibly related to a 2-day timer engine_flag wUnusedTwoDayTimerOn, 0 ; unused, possibly related to a 2-day timer
engine_flag StatusFlags, 0 ; pokedex engine_flag StatusFlags, 0 ; pokedex
engine_flag StatusFlags, 1 ; unown dex engine_flag StatusFlags, 1 ; unown dex

4
engine/events.asm
View File

@@ -124,8 +124,8 @@ StartMap: ; 96724
call ClearJoypad call ClearJoypad
EnterMap: ; 9673e EnterMap: ; 9673e
xor a xor a
ld [wd453], a ld [wXYComparePointer], a
ld [wd454], a ld [wXYComparePointer + 1], a
call SetUpFiveStepWildEncounterCooldown call SetUpFiveStepWildEncounterCooldown
callba RunMapSetupScript callba RunMapSetupScript
call DisableEvents call DisableEvents

2
engine/events_3.asm
View File

@@ -288,7 +288,7 @@ CheckForHiddenItems: ; b8172
add SCREEN_HEIGHT / 4 add SCREEN_HEIGHT / 4
ld [wd1ec], a ld [wd1ec], a
; Get the pointer for the first signpost header in the map... ; Get the pointer for the first signpost header in the map...
ld hl, wdc02 ld hl, wCurrentMapSignpostHeaderPointer
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a

19
engine/evolve.asm
View File

@@ -6,7 +6,6 @@ EvolvePokemon: ; 421d8
ld c, a ld c, a
ld b, SET_FLAG ld b, SET_FLAG
call EvoFlagAction call EvoFlagAction
EvolveAfterBattle: ; 421e6 EvolveAfterBattle: ; 421e6
xor a xor a
ld [wMonTriedToEvolve], a ld [wMonTriedToEvolve], a
@@ -19,7 +18,7 @@ EvolveAfterBattle: ; 421e6
push hl push hl
CheckForEvolvablePokemon: ; 421f5 EvolveAfterBattle_MasterLoop
ld hl, CurPartyMon ld hl, CurPartyMon
inc [hl] inc [hl]
@@ -28,7 +27,7 @@ CheckForEvolvablePokemon: ; 421f5
inc hl inc hl
ld a, [hl] ld a, [hl]
cp $ff cp $ff
jp z, Evolution_ReturnToMap jp z, .ReturnToMap
ld [Buffer1], a ld [Buffer1], a
@@ -40,7 +39,7 @@ CheckForEvolvablePokemon: ; 421f5
call EvoFlagAction call EvoFlagAction
ld a, c ld a, c
and a and a
jp z, CheckForEvolvablePokemon jp z, EvolveAfterBattle_MasterLoop
ld a, [Buffer1] ld a, [Buffer1]
dec a dec a
@@ -63,7 +62,7 @@ endr
.loop .loop
ld a, [hli] ld a, [hli]
and a and a
jr z, CheckForEvolvablePokemon jr z, EvolveAfterBattle_MasterLoop
ld b, a ld b, a
@@ -324,7 +323,7 @@ endr
push hl push hl
ld l, e ld l, e
ld h, d ld h, d
jp CheckForEvolvablePokemon jp EvolveAfterBattle_MasterLoop
; 423f8 ; 423f8
.dont_evolve_1 .dont_evolve_1
@@ -334,12 +333,10 @@ endr
.dont_evolve_3 .dont_evolve_3
inc hl inc hl
jp .loop jp .loop
; 423fe
; dummy pop ; XXX
pop hl pop hl
.ReturnToMap
Evolution_ReturnToMap: ; 423ff
pop de pop de
pop bc pop bc
pop hl pop hl
@@ -393,7 +390,7 @@ CancelEvolution: ; 42454
call PrintText call PrintText
call ClearTileMap call ClearTileMap
pop hl pop hl
jp CheckForEvolvablePokemon jp EvolveAfterBattle_MasterLoop
; 42461 ; 42461
IsMonHoldingEverstone: ; 42461 IsMonHoldingEverstone: ; 42461

8
engine/intro_menu.asm
View File

@@ -947,10 +947,10 @@ Intro_PrepTrainerPic: ; 619c
ld de, VTiles2 ld de, VTiles2
callba GetTrainerPic callba GetTrainerPic
xor a xor a
ld [hFillBox], a ld [hGraphicStartTile], a
hlcoord 6, 4 hlcoord 6, 4
lb bc, 7, 7 lb bc, 7, 7
predef FillBox predef PlaceGraphic
ret ret
; 61b4 ; 61b4
@@ -959,10 +959,10 @@ ShrinkFrame: ; 61b4
ld c, $31 ld c, $31
predef DecompressPredef predef DecompressPredef
xor a xor a
ld [hFillBox], a ld [hGraphicStartTile], a
hlcoord 6, 4 hlcoord 6, 4
lb bc, 7, 7 lb bc, 7, 7
predef FillBox predef PlaceGraphic
ret ret
; 61cd ; 61cd

25
engine/npctrade.asm
View File

@@ -430,21 +430,22 @@ GetTradeMonNames: ; fce1b
NPCTrades: ; fce58 NPCTrades: ; fce58
npctrade: MACRO npctrade: MACRO
db \1, \2, \3, \4 db \1, \2, \3, \4 ; dialog set, requested mon, offered mon, nickname
dw \5 db \5, \6 ; dvs
db \6 shift
dw \7 db \6 ; item
db \8, \9, 0 dw \7 ; OT ID
db \8, \9, 0 ; OT name, gender requested
ENDM ENDM
npctrade 0, ABRA, MACHOP, "MUSCLE@@@@@", $6637, GOLD_BERRY, 37460, "MIKE@@@@@@@", TRADE_EITHER_GENDER npctrade 0, ABRA, MACHOP, "MUSCLE@@@@@", $37, $66, GOLD_BERRY, 37460, "MIKE@@@@@@@", TRADE_EITHER_GENDER
npctrade 0, BELLSPROUT, ONIX, "ROCKY@@@@@@", $6696, BITTER_BERRY, 48926, "KYLE@@@@@@@", TRADE_EITHER_GENDER npctrade 0, BELLSPROUT, ONIX, "ROCKY@@@@@@", $96, $66, BITTER_BERRY, 48926, "KYLE@@@@@@@", TRADE_EITHER_GENDER
npctrade 1, KRABBY, VOLTORB, "VOLTY@@@@@@", $8898, PRZCUREBERRY, 29189, "TIM@@@@@@@@", TRADE_EITHER_GENDER npctrade 1, KRABBY, VOLTORB, "VOLTY@@@@@@", $98, $88, PRZCUREBERRY, 29189, "TIM@@@@@@@@", TRADE_EITHER_GENDER
npctrade 3, DRAGONAIR, DODRIO, "DORIS@@@@@@", $6677, SMOKE_BALL, 00283, "EMY@@@@@@@@", TRADE_FEMALE_ONLY npctrade 3, DRAGONAIR, DODRIO, "DORIS@@@@@@", $77, $66, SMOKE_BALL, 00283, "EMY@@@@@@@@", TRADE_FEMALE_ONLY
npctrade 2, HAUNTER, XATU, "PAUL@@@@@@@", $8696, MYSTERYBERRY, 15616, "CHRIS@@@@@@", TRADE_EITHER_GENDER npctrade 2, HAUNTER, XATU, "PAUL@@@@@@@", $96, $86, MYSTERYBERRY, 15616, "CHRIS@@@@@@", TRADE_EITHER_GENDER
npctrade 3, CHANSEY, AERODACTYL, "AEROY@@@@@@", $6696, GOLD_BERRY, 26491, "KIM@@@@@@@@", TRADE_EITHER_GENDER npctrade 3, CHANSEY, AERODACTYL, "AEROY@@@@@@", $96, $66, GOLD_BERRY, 26491, "KIM@@@@@@@@", TRADE_EITHER_GENDER
npctrade 0, DUGTRIO, MAGNETON, "MAGGIE@@@@@", $6696, METAL_COAT, 50082, "FOREST@@@@@", TRADE_EITHER_GENDER npctrade 0, DUGTRIO, MAGNETON, "MAGGIE@@@@@", $96, $66, METAL_COAT, 50082, "FOREST@@@@@", TRADE_EITHER_GENDER
; fcf38 ; fcf38

76
engine/phone.asm
View File

@@ -777,44 +777,44 @@ phone: MACRO
dba \7 ; script 2 dba \7 ; script 2
ENDM ENDM
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONECONTACT_MOM, KRISS_HOUSE_1F, 7, MomPhoneScript, 0, UnusedPhoneScript phone TRAINER_NONE, PHONECONTACT_MOM, KRISS_HOUSE_1F, 7, MomPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONECONTACT_BIKESHOP, OAKS_LAB, 0, UnusedPhoneScript, 0, UnusedPhoneScript phone TRAINER_NONE, PHONECONTACT_BIKESHOP, OAKS_LAB, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONECONTACT_BILL, N_A, 7, BillPhoneScript1, 0, BillPhoneScript2 phone TRAINER_NONE, PHONECONTACT_BILL, N_A, 7, BillPhoneScript1, 0, BillPhoneScript2
phone TRAINER_NONE, PHONECONTACT_ELM, ELMS_LAB, 7, ElmPhoneScript1, 0, ElmPhoneScript2 phone TRAINER_NONE, PHONECONTACT_ELM, ELMS_LAB, 7, ElmPhoneScript1, 0, ElmPhoneScript2
phone SCHOOLBOY, JACK1, NATIONAL_PARK, 7, JackPhoneScript1, 7, JackPhoneScript2 phone SCHOOLBOY, JACK1, NATIONAL_PARK, 7, JackPhoneScript1, 7, JackPhoneScript2
phone POKEFANF, BEVERLY1, NATIONAL_PARK, 7, BeverlyPhoneScript1, 7, BeverlyPhoneScript2 phone POKEFANF, BEVERLY1, NATIONAL_PARK, 7, BeverlyPhoneScript1, 7, BeverlyPhoneScript2
phone SAILOR, HUEY1, OLIVINE_LIGHTHOUSE_2F, 7, HueyPhoneScript1, 7, HueyPhoneScript2 phone SAILOR, HUEY1, OLIVINE_LIGHTHOUSE_2F, 7, HueyPhoneScript1, 7, HueyPhoneScript2
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone COOLTRAINERM, GAVEN3, ROUTE_26, 7, GavenPhoneScript1, 7, GavenPhoneScript2 phone COOLTRAINERM, GAVEN3, ROUTE_26, 7, GavenPhoneScript1, 7, GavenPhoneScript2
phone COOLTRAINERF, BETH1, ROUTE_26, 7, BethPhoneScript1, 7, BethPhoneScript2 phone COOLTRAINERF, BETH1, ROUTE_26, 7, BethPhoneScript1, 7, BethPhoneScript2
phone BIRD_KEEPER, JOSE2, ROUTE_27, 7, JosePhoneScript1, 7, JosePhoneScript2 phone BIRD_KEEPER, JOSE2, ROUTE_27, 7, JosePhoneScript1, 7, JosePhoneScript2
phone COOLTRAINERF, REENA1, ROUTE_27, 7, ReenaPhoneScript1, 7, ReenaPhoneScript2 phone COOLTRAINERF, REENA1, ROUTE_27, 7, ReenaPhoneScript1, 7, ReenaPhoneScript2
phone YOUNGSTER, JOEY1, ROUTE_30, 7, JoeyPhoneScript1, 7, JoeyPhoneScript2 phone YOUNGSTER, JOEY1, ROUTE_30, 7, JoeyPhoneScript1, 7, JoeyPhoneScript2
phone BUG_CATCHER, WADE1, ROUTE_31, 7, WadePhoneScript1, 7, WadePhoneScript2 phone BUG_CATCHER, WADE1, ROUTE_31, 7, WadePhoneScript1, 7, WadePhoneScript2
phone FISHER, RALPH1, ROUTE_32, 7, RalphPhoneScript1, 7, RalphPhoneScript2 phone FISHER, RALPH1, ROUTE_32, 7, RalphPhoneScript1, 7, RalphPhoneScript2
phone PICNICKER, LIZ1, ROUTE_32, 7, LizPhoneScript1, 7, LizPhoneScript2 phone PICNICKER, LIZ1, ROUTE_32, 7, LizPhoneScript1, 7, LizPhoneScript2
phone HIKER, ANTHONY2, ROUTE_33, 7, AnthonyPhoneScript1, 7, AnthonyPhoneScript2 phone HIKER, ANTHONY2, ROUTE_33, 7, AnthonyPhoneScript1, 7, AnthonyPhoneScript2
phone CAMPER, TODD1, ROUTE_34, 7, ToddPhoneScript1, 7, ToddPhoneScript2 phone CAMPER, TODD1, ROUTE_34, 7, ToddPhoneScript1, 7, ToddPhoneScript2
phone PICNICKER, GINA1, ROUTE_34, 7, GinaPhoneScript1, 7, GinaPhoneScript2 phone PICNICKER, GINA1, ROUTE_34, 7, GinaPhoneScript1, 7, GinaPhoneScript2
phone JUGGLER, IRWIN1, ROUTE_35, 7, IrwinPhoneScript1, 7, IrwinPhoneScript2 phone JUGGLER, IRWIN1, ROUTE_35, 7, IrwinPhoneScript1, 7, IrwinPhoneScript2
phone BUG_CATCHER, ARNIE1, ROUTE_35, 7, ArniePhoneScript1, 7, ArniePhoneScript2 phone BUG_CATCHER, ARNIE1, ROUTE_35, 7, ArniePhoneScript1, 7, ArniePhoneScript2
phone SCHOOLBOY, ALAN1, ROUTE_36, 7, AlanPhoneScript1, 7, AlanPhoneScript2 phone SCHOOLBOY, ALAN1, ROUTE_36, 7, AlanPhoneScript1, 7, AlanPhoneScript2
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone LASS, DANA1, ROUTE_38, 7, DanaPhoneScript1, 7, DanaPhoneScript2 phone LASS, DANA1, ROUTE_38, 7, DanaPhoneScript1, 7, DanaPhoneScript2
phone SCHOOLBOY, CHAD1, ROUTE_38, 7, ChadPhoneScript1, 7, ChadPhoneScript2 phone SCHOOLBOY, CHAD1, ROUTE_38, 7, ChadPhoneScript1, 7, ChadPhoneScript2
phone POKEFANM, DEREK1, ROUTE_39, 7, DerekPhoneScript1, 7, DerekPhoneScript2 phone POKEFANM, DEREK1, ROUTE_39, 7, DerekPhoneScript1, 7, DerekPhoneScript2
phone FISHER, TULLY1, ROUTE_42, 7, TullyPhoneScript1, 7, TullyPhoneScript2 phone FISHER, TULLY1, ROUTE_42, 7, TullyPhoneScript1, 7, TullyPhoneScript2
phone POKEMANIAC, BRENT1, ROUTE_43, 7, BrentPhoneScript1, 7, BrentPhoneScript2 phone POKEMANIAC, BRENT1, ROUTE_43, 7, BrentPhoneScript1, 7, BrentPhoneScript2
phone PICNICKER, TIFFANY3, ROUTE_43, 7, TiffanyPhoneScript1, 7, TiffanyPhoneScript2 phone PICNICKER, TIFFANY3, ROUTE_43, 7, TiffanyPhoneScript1, 7, TiffanyPhoneScript2
phone BIRD_KEEPER, VANCE1, ROUTE_44, 7, VancePhoneScript1, 7, VancePhoneScript2 phone BIRD_KEEPER, VANCE1, ROUTE_44, 7, VancePhoneScript1, 7, VancePhoneScript2
phone FISHER, WILTON1, ROUTE_44, 7, WiltonPhoneScript1, 7, WiltonPhoneScript2 phone FISHER, WILTON1, ROUTE_44, 7, WiltonPhoneScript1, 7, WiltonPhoneScript2
phone BLACKBELT_T, KENJI3, ROUTE_45, 7, KenjiPhoneScript1, 7, KenjiPhoneScript2 phone BLACKBELT_T, KENJI3, ROUTE_45, 7, KenjiPhoneScript1, 7, KenjiPhoneScript2
phone HIKER, PARRY1, ROUTE_45, 7, ParryPhoneScript1, 7, ParryPhoneScript2 phone HIKER, PARRY1, ROUTE_45, 7, ParryPhoneScript1, 7, ParryPhoneScript2
phone PICNICKER, ERIN1, ROUTE_46, 7, ErinPhoneScript1, 7, ErinPhoneScript2 phone PICNICKER, ERIN1, ROUTE_46, 7, ErinPhoneScript1, 7, ErinPhoneScript2
phone TRAINER_NONE, PHONECONTACT_BUENA, GOLDENROD_DEPT_STORE_ROOF, 7, BuenaPhoneScript1, 7, BuenaPhoneScript2 phone TRAINER_NONE, PHONECONTACT_BUENA, GOLDENROD_DEPT_STORE_ROOF, 7, BuenaPhoneScript1, 7, BuenaPhoneScript2
; 90627 ; 90627
SpecialPhoneCallList: ; 90627 SpecialPhoneCallList: ; 90627

60
engine/pokedex.asm
View File

@@ -1051,14 +1051,14 @@ asm_4073f: ; 4073f (10:473f)
scf scf
ret ret
Function40741: ; 40741 Pokedex_FillColumn: ; 40741
push de push de
ld de, $0014 ld de, SCREEN_WIDTH
.asm_40745 .loop
ld [hl], a ld [hl], a
add hl, de add hl, de
dec b dec b
jr nz, .asm_40745 jr nz, .loop
pop de pop de
ret ret
; 4074c ; 4074c
@@ -1076,7 +1076,7 @@ Function4074c: ; 4074c (10:474c)
lb bc, 7, 7 lb bc, 7, 7
call Pokedex_PlaceBorder call Pokedex_PlaceBorder
hlcoord 0, 9 hlcoord 0, 9
ld bc, $607 lb bc, 6, 7
call Pokedex_PlaceBorder call Pokedex_PlaceBorder
hlcoord 1, 11 hlcoord 1, 11
ld de, String_SEEN ld de, String_SEEN
@@ -1102,13 +1102,13 @@ Function4074c: ; 4074c (10:474c)
ld de, String_SELECT_OPTION ld de, String_SELECT_OPTION
call Pokedex_PlaceString call Pokedex_PlaceString
hlcoord 8, 1 hlcoord 8, 1
ld b, $7 ld b, 7
ld a, $5a ld a, $5a
call Function40741 call Pokedex_FillColumn
hlcoord 8, 10 hlcoord 8, 10
ld b, $6 ld b, 6
ld a, $5a ld a, $5a
call Function40741 call Pokedex_FillColumn
hlcoord 8, 0 hlcoord 8, 0
ld [hl], $59 ld [hl], $59
hlcoord 8, 8 hlcoord 8, 8
@@ -1134,22 +1134,22 @@ String_START_SEARCH: ; 407f2
Function407fd: ; 407fd Function407fd: ; 407fd
call Pokedex_FillBackgroundColor2 call Pokedex_FillBackgroundColor2
hlcoord 0, 0 hlcoord 0, 0
ld bc, $0f12 lb bc, 15, 18
call Pokedex_PlaceBorder call Pokedex_PlaceBorder
hlcoord 19, 0 hlcoord 19, 0
ld [hl], $34 ld [hl], $34
hlcoord 19, 1 hlcoord 19, 1
ld a, $7f ld a, " "
ld b, $f ld b, 15
call Function40741 call Pokedex_FillColumn
ld [hl], $39 ld [hl], $39
hlcoord 1, 10 hlcoord 1, 10
ld bc, $0013 ld bc, 19
ld a, $61 ld a, $61
call ByteFill call ByteFill
hlcoord 1, 17 hlcoord 1, 17
ld bc, $0012 ld bc, 18
ld a, $7f ld a, " "
call ByteFill call ByteFill
hlcoord 9, 7 hlcoord 9, 7
ld de, Unknown_40852 ld de, Unknown_40852
@@ -1218,38 +1218,38 @@ Function408f0: ; 408f0 (10:48f0)
lb bc, 14, 18 lb bc, 14, 18
call Pokedex_PlaceBorder call Pokedex_PlaceBorder
hlcoord 0, 1 hlcoord 0, 1
ld de, Unknown_4092a ld de, .SEARCH
call Pokedex_PlaceString call Pokedex_PlaceString
hlcoord 8, 4 hlcoord 8, 4
ld de, Unknown_40935 ld de, .BLANK
call Pokedex_PlaceString call Pokedex_PlaceString
hlcoord 8, 6 hlcoord 8, 6
ld de, Unknown_40935 ld de, .BLANK
call Pokedex_PlaceString call Pokedex_PlaceString
hlcoord 3, 4 hlcoord 3, 4
ld de, String_40940 ld de, .Type1Type2
call PlaceString call PlaceString
hlcoord 3, 13 hlcoord 3, 13
ld de, String_4094c ld de, BeginSearch_Cancel
call PlaceString call PlaceString
ret ret
; 4092a (10:492a) ; 4092a (10:492a)
Unknown_4092a: ; 4092a .SEARCH: ; 4092a
db $3b, " SEARCH ", $3c, $ff db $3b, " SEARCH ", $3c, $ff
; 40925 ; 40925
Unknown_40935: ; 40935 .BLANK: ; 40935
db $3d, " ", $3e, $ff db $3d, " ", $3e, $ff
; 40940 ; 40940
String_40940: ; 40940 .Type1Type2: ; 40940
db "TYPE1" db "TYPE1"
next "TYPE2" next "TYPE2"
db "@" db "@"
; 4094c ; 4094c
String_4094c: ; 4094c BeginSearch_Cancel: ; 4094c
db "BEGIN SEARCH!!" db "BEGIN SEARCH!!"
next "CANCEL" next "CANCEL"
db "@" db "@"
@@ -1273,9 +1273,9 @@ Function40962: ; 40962 (10:4962)
hlcoord 8, 0 hlcoord 8, 0
ld [hl], $59 ld [hl], $59
hlcoord 8, 1 hlcoord 8, 1
ld b, $7 ld b, 7
ld a, $5a ld a, $5a
call Function40741 call Pokedex_FillColumn
hlcoord 8, 8 hlcoord 8, 8
ld [hl], $53 ld [hl], $53
hlcoord 8, 9 hlcoord 8, 9
@@ -1736,7 +1736,7 @@ Function40e5b: ; 40e5b
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
hlcoord 0, 12 hlcoord 0, 12
lb bc, 4, SCREEN_WIDTH - 2 lb bc, 4, 18
call Pokedex_PlaceBorder call Pokedex_PlaceBorder
ld a, [wc7d8] ld a, [wc7d8]
ld hl, Unknown_40e7d ld hl, Unknown_40e7d
@@ -1781,7 +1781,7 @@ Function40f08: ; 40f08 (10:4f08)
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
hlcoord 0, 12 hlcoord 0, 12
lb bc, 4, SCREEN_WIDTH - 2 lb bc, 4, 18
call Pokedex_PlaceBorder call Pokedex_PlaceBorder
ld de, String_ChangingModesPleaseWait ld de, String_ChangingModesPleaseWait
hlcoord 1, 14 hlcoord 1, 14
@@ -2018,7 +2018,7 @@ Function41107: ; 41107
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
hlcoord 0, 12 hlcoord 0, 12
ld bc, $0412 lb bc, 4, 18
call Pokedex_PlaceBorder call Pokedex_PlaceBorder
ld de, String_41126 ld de, String_41126
hlcoord 1, 14 hlcoord 1, 14

32
engine/pokegear.asm
View File

@@ -199,14 +199,14 @@ TownMap_InitCursorAndPlayerIconPositions: ; 90d70 (24:4d70)
ld c, a ld c, a
call GetWorldMapLocation call GetWorldMapLocation
.LoadLandmark .LoadLandmark
ld [wTownMapPlayerIconLandmark], a ld [wPokegearMapPlayerIconLandmark], a
ld [wTownMapCursorLandmark], a ld [wPokegearMapCursorLandmark], a
ret ret
.FastShip .FastShip
ld [wTownMapPlayerIconLandmark], a ld [wPokegearMapPlayerIconLandmark], a
ld a, NEW_BARK_TOWN ld a, NEW_BARK_TOWN
ld [wTownMapCursorLandmark], a ld [wPokegearMapCursorLandmark], a
ret ret
Pokegear_InitJumptableIndices: ; 90d9e (24:4d9e) Pokegear_InitJumptableIndices: ; 90d9e (24:4d9e)
@@ -307,7 +307,7 @@ InitPokegearTilemap: ; 90da8 (24:4da8)
; 90e3f ; 90e3f
.Map: ; 90e3f .Map: ; 90e3f
ld a, [wTownMapPlayerIconLandmark] ld a, [wPokegearMapPlayerIconLandmark]
cp FAST_SHIP cp FAST_SHIP
jr z, .johto jr z, .johto
cp KANTO_LANDMARK cp KANTO_LANDMARK
@@ -328,7 +328,7 @@ InitPokegearTilemap: ; 90da8 (24:4da8)
ld [hl], $6 ld [hl], $6
hlcoord 19, 2 hlcoord 19, 2
ld [hl], $17 ld [hl], $17
ld a, [wTownMapCursorLandmark] ld a, [wPokegearMapCursorLandmark]
call PokegearMap_UpdateLandmarkName call PokegearMap_UpdateLandmarkName
ret ret
@@ -530,7 +530,7 @@ Pokegear_UpdateClock: ; 90f86 (24:4f86)
; 0x90fb4 ; 0x90fb4
PokegearMap_CheckRegion: ; 90fb4 (24:4fb4) PokegearMap_CheckRegion: ; 90fb4 (24:4fb4)
ld a, [wTownMapPlayerIconLandmark] ld a, [wPokegearMapPlayerIconLandmark]
cp FAST_SHIP cp FAST_SHIP
jr z, .johto jr z, .johto
cp KANTO_LANDMARK cp KANTO_LANDMARK
@@ -549,9 +549,9 @@ PokegearMap_CheckRegion: ; 90fb4 (24:4fb4)
PokegearMap_Init: ; 90fcd (24:4fcd) PokegearMap_Init: ; 90fcd (24:4fcd)
call InitPokegearTilemap call InitPokegearTilemap
ld a, [wTownMapPlayerIconLandmark] ld a, [wPokegearMapPlayerIconLandmark]
call PokegearMap_InitPlayerIcon call PokegearMap_InitPlayerIcon
ld a, [wTownMapCursorLandmark] ld a, [wPokegearMapCursorLandmark]
call PokegearMap_InitCursor call PokegearMap_InitCursor
ld a, c ld a, c
ld [wPokegearMapCursorObjectPointer], a ld [wPokegearMapCursorObjectPointer], a
@@ -621,7 +621,7 @@ PokegearMap_ContinueMap: ; 90ff2 (24:4ff2)
ret ret
.up .up
ld hl, wTownMapCursorLandmark ld hl, wPokegearMapCursorLandmark
ld a, [hl] ld a, [hl]
cp d cp d
jr c, .wrap_around_up jr c, .wrap_around_up
@@ -633,7 +633,7 @@ PokegearMap_ContinueMap: ; 90ff2 (24:4ff2)
jr .done_dpad jr .done_dpad
.down .down
ld hl, wTownMapCursorLandmark ld hl, wPokegearMapCursorLandmark
ld a, [hl] ld a, [hl]
cp e cp e
jr nz, .wrap_around_down jr nz, .wrap_around_down
@@ -643,13 +643,13 @@ PokegearMap_ContinueMap: ; 90ff2 (24:4ff2)
.wrap_around_down .wrap_around_down
dec [hl] dec [hl]
.done_dpad .done_dpad
ld a, [wTownMapCursorLandmark] ld a, [wPokegearMapCursorLandmark]
call PokegearMap_UpdateLandmarkName call PokegearMap_UpdateLandmarkName
ld a, [wPokegearMapCursorObjectPointer] ld a, [wPokegearMapCursorObjectPointer]
ld c, a ld c, a
ld a, [wPokegearMapCursorObjectPointer + 1] ld a, [wPokegearMapCursorObjectPointer + 1]
ld b, a ld b, a
ld a, [wTownMapCursorLandmark] ld a, [wPokegearMapCursorLandmark]
call PokegearMap_UpdateCursorPosition call PokegearMap_UpdateCursorPosition
ret ret
@@ -1552,7 +1552,7 @@ RadioChannels:
jp LoadStation_BuenasPassword jp LoadStation_BuenasPassword
.RuinsOfAlphRadio .RuinsOfAlphRadio
ld a, [wTownMapPlayerIconLandmark] ld a, [wPokegearMapPlayerIconLandmark]
cp RUINS_OF_ALPH cp RUINS_OF_ALPH
jr nz, .NoSignal jr nz, .NoSignal
jp LoadStation_UnownRadio jp LoadStation_UnownRadio
@@ -1586,7 +1586,7 @@ RadioChannels:
ld a, [StatusFlags] ld a, [StatusFlags]
bit 4, a bit 4, a
jr z, .NoSignal jr z, .NoSignal
ld a, [wTownMapPlayerIconLandmark] ld a, [wPokegearMapPlayerIconLandmark]
cp MAHOGANY_TOWN cp MAHOGANY_TOWN
jr z, .ok jr z, .ok
cp ROUTE_43 cp ROUTE_43
@@ -1604,7 +1604,7 @@ RadioChannels:
; if in Johto or on the S.S. Aqua, set carry ; if in Johto or on the S.S. Aqua, set carry
; otherwise clear carry ; otherwise clear carry
ld a, [wTownMapPlayerIconLandmark] ld a, [wPokegearMapPlayerIconLandmark]
cp FAST_SHIP cp FAST_SHIP
jr z, .johto jr z, .johto
cp KANTO_LANDMARK cp KANTO_LANDMARK

6
engine/predef.asm
View File

@@ -49,7 +49,7 @@ PredefPointers:: ; 856b
add_predef Predef_LinkTextbox ; $ 10 add_predef Predef_LinkTextbox ; $ 10
add_predef PrintMoveDesc add_predef PrintMoveDesc
add_predef UpdatePlayerHUD add_predef UpdatePlayerHUD
add_predef FillBox add_predef PlaceGraphic
add_predef CheckPlayerPartyForFitPkmn add_predef CheckPlayerPartyForFitPkmn
add_predef UpdateEnemyHUD add_predef UpdateEnemyHUD
add_predef StartBattle add_predef StartBattle
@@ -88,7 +88,7 @@ PredefPointers:: ; 856b
add_predef PlayBattleAnim add_predef PlayBattleAnim
add_predef Predef38 ; $38 add_predef Predef38 ; $38
add_predef Predef39 add_predef Predef39
add_predef Functionfd1d0 add_predef Predef3A
add_predef PartyMonItemName add_predef PartyMonItemName
add_predef GetFrontpic add_predef GetFrontpic
add_predef GetBackpic add_predef GetBackpic
@@ -103,6 +103,6 @@ PredefPointers:: ; 856b
add_predef LoadMonAnimation add_predef LoadMonAnimation
add_predef AnimateFrontpic add_predef AnimateFrontpic
add_predef Functiond0669 ; $48 add_predef Functiond0669 ; $48
add_predef Functiond066e add_predef HOF_AnimateFrontpic
dbw $ff, Function2d43 ; ???? dbw $ff, Function2d43 ; ????
; 864c ; 864c

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