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

Use correct WRAM labels for intro/title scenes

Browse Source 
Remove outdated WRAM alias comments
This commit is contained in:
Remy Oukaour 2017-12-10 00:18:29 -05:00
parent ab7025a144
commit d554b997c5
10 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/billspc.asm
View File

@ -1783,7 +1783,7 @@ BillsPC_CopyMon: ; e2fd6 (38:6fd6)
call CopyNicknameToTemp
ld hl, PartyMonOT
call CopyOTNameToTemp
ld hl, PartyMons ; wdcdf (aliases: PartyMon1, PartyMon1Species)
ld hl, PartyMon1
ld bc, PARTYMON_STRUCT_LENGTH
ld a, [CurPartyMon]
call AddNTimes

6
engine/breeding/egg.asm
View File

@ -234,7 +234,7 @@ HatchEggs: ; 16f70 (5:6f70)
callba SetEggMonCaughtData
callba TrainerRankings_EggsHatched
ld a, [CurPartyMon]
ld hl, PartyMons ; wdcdf (aliases: PartyMon1, PartyMon1Species)
ld hl, PartyMon1Species
ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes
ld a, [hl]
@ -263,7 +263,7 @@ HatchEggs: ; 16f70 (5:6f70)
ld [wd26b], a
call GetBaseData
ld a, [CurPartyMon]
ld hl, PartyMons ; wdcdf (aliases: PartyMon1, PartyMon1Species)
ld hl, PartyMon1
ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes
push hl
@ -309,7 +309,7 @@ HatchEggs: ; 16f70 (5:6f70)
ld a, [PlayerID + 1]
ld [hl], a
ld a, [CurPartyMon]
ld hl, PartyMonOT ; wddff (aliases: PartyMonOT)
ld hl, PartyMonOT
ld bc, NAME_LENGTH
call AddNTimes
ld d, h

24
engine/intro_menu.asm
View File

@ -1051,7 +1051,7 @@ StartTitleScreen: ; 6219
ld b, SCGB_DIPLOMA
call GetSGBLayout
call UpdateTimePals
ld a, [wcf64]
ld a, [wIntroSceneFrameCounter]
cp $5
jr c, .ok
xor a
@ -1191,7 +1191,7 @@ TitleScreenTimer: ; 62f6
inc [hl]
; Start a timer
ld hl, wcf65
ld hl, wTitleScreenTimer
ld de, 73 * 60 + 36
ld [hl], e
inc hl
@ -1202,7 +1202,7 @@ TitleScreenTimer: ; 62f6
TitleScreenMain: ; 6304
; Run the timer down.
ld hl, wcf65
ld hl, wTitleScreenTimer
ld e, [hl]
inc hl
ld d, [hl]
@ -1268,7 +1268,7 @@ TitleScreenMain: ; 6304
ld a, 1
.done
ld [wcf64], a
ld [wIntroSceneFrameCounter], a
; Return to the intro sequence.
ld hl, wJumptableIndex
@ -1287,13 +1287,13 @@ TitleScreenMain: ; 6304
ld hl, MusicFade
ld [hl], 8 ; 1 second
ld hl, wcf65
ld hl, wTitleScreenTimer
inc [hl]
ret
.clock_reset
ld a, 4
ld [wcf64], a
ld [wIntroSceneFrameCounter], a
; Return to the intro sequence.
ld hl, wJumptableIndex
@ -1305,7 +1305,7 @@ TitleScreenEnd: ; 6375
; Wait until the music is done fading.
ld hl, wcf65
ld hl, wTitleScreenTimer
inc [hl]
ld a, [MusicFade]
@ -1313,7 +1313,7 @@ TitleScreenEnd: ; 6375
ret nz
ld a, 2
ld [wcf64], a
ld [wIntroSceneFrameCounter], a
; Back to the intro.
ld hl, wJumptableIndex
@ -1332,8 +1332,8 @@ ResetClock: ; 6392
; 639b
Function639b: ; unreferenced
; If bit 0 or 1 of [wcf65] is set, we don't need to be here.
ld a, [wcf65]
; If bit 0 or 1 of [wTitleScreenTimer] is set, we don't need to be here.
ld a, [wTitleScreenTimer]
and $3
ret nz
ld bc, SpriteAnim10
@ -1345,8 +1345,8 @@ Function639b: ; unreferenced
add hl, hl
ld de, Data63ca
add hl, de
; If bit 2 of [wcf65] is set, get the second dw; else, get the first dw
ld a, [wcf65]
; If bit 2 of [wTitleScreenTimer] is set, get the second dw; else, get the first dw
ld a, [wTitleScreenTimer]
and %00000100
srl a
srl a

2
engine/mon_icons.asm
View File

@ -240,7 +240,7 @@ MoveList_InitAnimatedMonIcon: ; 8e97d (23:697d)
ld [CurIcon], a
xor a
call GetIconGFX
ld d, 3 * 8 + 2
ld d, 3 * 8 + 2 ; depixel 3, 4, 2, 4
ld e, 4 * 8 + 4
ld a, SPRITE_ANIM_INDEX_PARTY_MON
call InitSpriteAnimStruct

10
engine/mysterygift.asm
View File

@ -815,7 +815,7 @@ Function104e93: ; 104e93 (41:4e93)
ld c, rRP % $100
ld d, $3d
call Function104dd1
ld hl, hPrintNum2 ; $ffb4 (aliases: hMultiplicand)
ld hl, hPrintNum2
ld a, $5a
ld [hli], a
ld [hl], b
@ -830,7 +830,7 @@ Function104e93: ; 104e93 (41:4e93)
ld a, [hPrintNum6]
ld [hPrintNum3], a
push hl
ld hl, hPrintNum2 ; $ffb4 (aliases: hMultiplicand)
ld hl, hPrintNum2
ld b, $2
call Function104ed6
ld hl, hMGStatusFlags
@ -934,7 +934,7 @@ Function104f57: ; 104f57 (41:4f57)
ld [hPrintNum6], a
push bc
push hl
ld hl, hPrintNum2 ; $ffb4 (aliases: hMultiplicand)
ld hl, hPrintNum2
ld b, $2
call Function104faf
ld a, [hPrintNum3]
@ -954,11 +954,11 @@ Function104f57: ; 104f57 (41:4f57)
ld e, a
push hl
push de
ld hl, hPrintNum2 ; $ffb4 (aliases: hMultiplicand)
ld hl, hPrintNum2
ld b, $2
call Function104faf
pop de
ld hl, hPrintNum2 ; $ffb4 (aliases: hMultiplicand)
ld hl, hPrintNum2
ld a, [hli]
xor d
ld b, a

4
engine/phone.asm
View File

@ -203,7 +203,7 @@ ChooseRandomCaller: ; 900bf (24:40bf)
GetAvailableCallers: ; 900de (24:40de)
callba CheckTime
ld a, c
ld [EngineBuffer1], a ; wd03e (aliases: MenuItemsList, CurFruitTree, CurInput)
ld [EngineBuffer1], a
ld hl, EngineBuffer3
ld bc, 11
xor a
@ -219,7 +219,7 @@ GetAvailableCallers: ; 900de (24:40de)
ld hl, PhoneContacts + PHONE_CONTACT_SCRIPT2_TIME
ld bc, PHONE_TABLE_WIDTH
call AddNTimes
ld a, [EngineBuffer1] ; wd03e (aliases: MenuItemsList, CurFruitTree, CurInput)
ld a, [EngineBuffer1]
and [hl]
jr z, .not_good_for_call
ld bc, PHONE_CONTACT_MAP_GROUP - PHONE_CONTACT_SCRIPT2_TIME

12
engine/stats_screen.asm
View File

@ -3,7 +3,7 @@ BattleStatsScreenInit: ; 4dc7b (13:5c7b)
cp LINK_MOBILE
jr nz, StatsScreenInit
ld a, [wBattleMode] ; wd22d (aliases: EnemyMonEnd)
ld a, [wBattleMode]
and a
jr z, StatsScreenInit
jr _MobileStatsScreenInit
@ -377,7 +377,7 @@ StatsScreen_InitUpperHalf: ; 4deea (13:5eea)
call .PlaceHPBar
xor a
ld [hBGMapMode], a
ld a, [CurBaseData] ; wd236 (aliases: BaseDexNo)
ld a, [CurBaseData]
ld [wd265], a
ld [CurSpecies], a
hlcoord 8, 0
@ -401,7 +401,7 @@ StatsScreen_InitUpperHalf: ; 4deea (13:5eea)
hlcoord 9, 4
ld a, "/"
ld [hli], a
ld a, [CurBaseData] ; wd236 (aliases: BaseDexNo)
ld a, [CurBaseData]
ld [wd265], a
call GetPokemonName
call PlaceString
@ -487,7 +487,7 @@ StatsScreen_PlaceShinyIcon: ; 4dfa6 (13:5fa6)
ret
StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
ld a, [BaseDexNo] ; wd236 (aliases: BaseDexNo)
ld a, [BaseDexNo]
ld [wd265], a
ld [CurSpecies], a
xor a
@ -891,7 +891,7 @@ StatsScreen_GetAnimationParam: ; 4e2ad (13:62ad)
.PartyMon: ; 4e2bf (13:62bf)
ld a, [CurPartyMon]
ld hl, PartyMons ; wdcdf (aliases: PartyMon1, PartyMon1Species)
ld hl, PartyMon1
ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes
ld b, h
@ -918,7 +918,7 @@ StatsScreen_GetAnimationParam: ; 4e2ad (13:62ad)
ret
.Tempmon: ; 4e2ed (13:62ed)
ld bc, TempMonSpecies ; wd10e (aliases: TempMon)
ld bc, TempMonSpecies
jr .CheckEggFaintedFrzSlp ; utterly pointless
.CheckEggFaintedFrzSlp: ; 4e2f2 (13:62f2)

12
engine/title.asm
View File

@ -10,10 +10,10 @@ _TitleScreen: ; 10ed67
; Reset timing variables
ld hl, wJumptableIndex
ld [hli], a ; cf63 ; Scene?
ld [hli], a ; cf64
ld [hli], a ; cf65 ; Timer lo
ld [hl], a ; cf66 ; Timer hi
ld [hli], a ; wJumptableIndex
ld [hli], a ; wIntroSceneFrameCounter
ld [hli], a ; wTitleScreenTimer
ld [hl], a ; wTitleScreenTimer + 1
; Turn LCD off
call DisableLCD
@ -145,12 +145,12 @@ _TitleScreen: ; 10ed67
; Update palette colors
ld hl, TitleScreenPalettes
ld de, UnknBGPals
ld bc, 4 * 32
ld bc, 16 palettes
call CopyBytes
ld hl, TitleScreenPalettes
ld de, BGPals
ld bc, 4 * 32
ld bc, 16 palettes
call CopyBytes
; Restore WRAM bank

4
main.asm
View File

@ -492,7 +492,7 @@ HiddenItemScript:: ; 0x13625
db "@"
SetMemEvent: ; 1364f
ld hl, EngineBuffer1 ; wd03e (aliases: MenuItemsList, CurFruitTree, CurInput)
ld hl, EngineBuffer1
ld a, [hli]
ld d, [hl]
ld e, a
@ -4565,7 +4565,7 @@ _SwitchPartyMons:
ld bc, PARTYMON_STRUCT_LENGTH
call CopyBytes
ld a, [Buffer3]
ld hl, PartyMons ; wdcdf (aliases: PartyMon1, PartyMon1Species)
ld hl, PartyMon1
ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes
pop de

2
misc/battle_tower_5c.asm
View File

@ -1361,7 +1361,7 @@ BattleTowerAction_EggTicket: ; 17093c (5c:493c) BattleTowerAction $0e
cp EGG
jr nz, .not_egg
push hl
ld hl, PartyMonOT ; wddff (aliases: PartyMonOT)
ld hl, PartyMonOT
ld de, $6 ; NAME_LENGTH
ld a, b
and a