From 5ea3a953c3332a718ec3d69ec8830979a12db6cb Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 13 May 2016 22:46:32 -0400 Subject: Name all link trade animation related functions --- engine/intro_menu.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'engine/intro_menu.asm') diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index ea5c9296a..46d09721c 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -688,7 +688,7 @@ OakSpeech: ; 0x5f99 ld [TrainerClass], a call Intro_PrepTrainerPic - ld b, SCGB_FRONTPICPALS + ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS call GetSGBLayout call Intro_RotatePalettesLeftFrontpic @@ -709,7 +709,7 @@ OakSpeech: ; 0x5f99 ld [TempMonDVs], a ld [TempMonDVs + 1], a - ld b, SCGB_FRONTPICPALS + ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS call GetSGBLayout call Intro_WipeInFrontpic @@ -726,7 +726,7 @@ OakSpeech: ; 0x5f99 ld [TrainerClass], a call Intro_PrepTrainerPic - ld b, SCGB_FRONTPICPALS + ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS call GetSGBLayout call Intro_RotatePalettesLeftFrontpic @@ -739,7 +739,7 @@ OakSpeech: ; 0x5f99 ld [CurPartySpecies], a callba DrawIntroPlayerPic - ld b, SCGB_FRONTPICPALS + ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS call GetSGBLayout call Intro_RotatePalettesLeftFrontpic @@ -809,7 +809,7 @@ NamePlayer: ; 0x6074 ld [CurPartySpecies], a callba DrawIntroPlayerPic - ld b, SCGB_FRONTPICPALS + ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS call GetSGBLayout call RotateThreePalettesLeft -- cgit v1.2.3 From d7a01e92e9b571b91b956cda873de89f4bf8f5f5 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Mon, 6 Jun 2016 18:23:00 -0400 Subject: Remaining layout constants --- engine/intro_menu.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/intro_menu.asm') diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index 46d09721c..34eb67eeb 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -1048,7 +1048,7 @@ StartTitleScreen: ; 6219 ld [hWX], a ld a, $90 ld [hWY], a - ld b, SCGB_08 + ld b, SCGB_DIPLOMA call GetSGBLayout call UpdateTimePals ld a, [wcf64] -- cgit v1.2.3 From 4e2487c056c4dcddd3059a105e6ac89144137ab1 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Mon, 13 Jun 2016 22:53:33 -0400 Subject: hLCDCPointer and InitList --- engine/intro_menu.asm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'engine/intro_menu.asm') diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index 34eb67eeb..3e4257ab7 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -140,7 +140,7 @@ _ResetWRAM: ; 5bae ld [wSecretID + 1], a ld hl, PartyCount - call InitList + call .InitList xor a ld [wCurBox], a @@ -151,20 +151,20 @@ _ResetWRAM: ; 5bae ld a, BANK(sBoxCount) call GetSRAMBank ld hl, sBoxCount - call InitList + call .InitList call CloseSRAM ld hl, NumItems - call InitList + call .InitList ld hl, NumKeyItems - call InitList + call .InitList ld hl, NumBalls - call InitList + call .InitList ld hl, PCItems - call InitList + call .InitList xor a ld [wRoamMon1Species], a @@ -232,7 +232,7 @@ ENDC ret ; 5ca1 -InitList: ; 5ca1 +.InitList: ; 5ca1 ; Loads 0 in the count and -1 in the first item or mon slot. xor a ld [hli], a @@ -1041,7 +1041,7 @@ StartTitleScreen: ; 6219 call ClearScreen call WaitBGMap2 xor a - ld [hFFC6], a + ld [hLCDCPointer], a ld [hSCX], a ld [hSCY], a ld a, $7 @@ -1172,7 +1172,7 @@ TitleScreenEntrance: ; 62bc ld hl, wJumptableIndex inc [hl] xor a - ld [hFFC6], a + ld [hLCDCPointer], a ; Play the title screen music. ld de, MUSIC_TITLE -- cgit v1.2.3