diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/breeding/egg.asm | 2 | ||||
| -rwxr-xr-x | engine/intro_menu.asm | 6 | ||||
| -rwxr-xr-x | engine/link.asm | 6 | ||||
| -rwxr-xr-x | engine/mart.asm | 2 | ||||
| -rwxr-xr-x | engine/stats_screen.asm | 2 | ||||
| -rwxr-xr-x | engine/trade/animation.asm | 47 |
6 files changed, 33 insertions, 32 deletions
diff --git a/engine/breeding/egg.asm b/engine/breeding/egg.asm index 4c2ff4c4c..221626bcf 100755 --- a/engine/breeding/egg.asm +++ b/engine/breeding/egg.asm @@ -703,7 +703,7 @@ EggHatch_AnimationSequence: ; 1728f (5:728f) push af ld de, MUSIC_NONE call PlayMusic - callba Function8000 + callba BlankScreen call DisableLCD ld hl, EggHatchGFX ld de, VTiles0 tile $00 diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index 7c80f1005..ca80665b4 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -1067,7 +1067,7 @@ endr .jumptable dw _MainMenu - dw Function6389 + dw DeleteSaveData dw CrystalIntroSequence dw CrystalIntroSequence dw ResetClock @@ -1320,8 +1320,8 @@ TitleScreenEnd: ; 6375 ret ; 6389 -Function6389: ; 6389 - callba Function4d54c +DeleteSaveData: ; 6389 + callba _DeleteSaveData jp Init ; 6392 diff --git a/engine/link.asm b/engine/link.asm index 677c503fa..2083c9fb6 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -1258,7 +1258,7 @@ Function28835: ; 28835 ld [wd263], a callab Function50db9 ld hl, OTPartyMon1Species - callba Function4d319 + callba LinkMonStatsScreen jp Function2891c .asm_2885b @@ -1276,7 +1276,7 @@ Function28835: ; 28835 push bc ld bc, NAME_LENGTH add hl, bc - ld [hl], $7f + ld [hl], " " pop bc pop hl ld a, [PartyCount] @@ -1450,7 +1450,7 @@ Function28926: ; 28926 ld a, $4 ld [wd263], a callab Function50db9 - callba Function4d319 + callba LinkMonStatsScreen call Call_LoadTempTileMapToTileMap hlcoord 6, 1 lb bc, 6, 1 diff --git a/engine/mart.asm b/engine/mart.asm index 7d92e468b..d051d4632 100755 --- a/engine/mart.asm +++ b/engine/mart.asm @@ -369,7 +369,7 @@ BargainShopData: ; 15c51 BuyMenu: ; 15c62 call FadeToMenu - callba Function8000 + callba BlankScreen xor a ld [wd045 + 1], a ld a, 1 diff --git a/engine/stats_screen.asm b/engine/stats_screen.asm index ae6f9150e..4e3a6d9b3 100755 --- a/engine/stats_screen.asm +++ b/engine/stats_screen.asm @@ -120,7 +120,7 @@ Function4dd3a: ; 4dd3a (13:5d3a) call DelayFrame ret .asm_4dd49 - callba Functiond00b4 + callba SetUpPokeAnim jr nc, .asm_4dd56 ld hl, wcf64 res 6, [hl] diff --git a/engine/trade/animation.asm b/engine/trade/animation.asm index fe356d70a..a084fc3be 100755 --- a/engine/trade/animation.asm +++ b/engine/trade/animation.asm @@ -180,23 +180,23 @@ Function28fdb: ; 28fdb ld [hWX], a ld a, $90 ld [hWY], a - callba Function4d7fd + callba GetTrademonFrontpic call EnableLCD call Function2982b ld a, [wPlayerTrademonSpecies] ld hl, wPlayerTrademonDVs ld de, VTiles0 - call Function29491 + call TradeAnim_GetFrontpic ld a, [wOTTrademonSpecies] ld hl, wOTTrademonDVs ld de, VTiles0 tile $31 - call Function29491 + call TradeAnim_GetFrontpic ld a, [wPlayerTrademonSpecies] ld de, wPlayerTrademonSpeciesName - call Function294a9 + call TradeAnim_GetNickname ld a, [wOTTrademonSpecies] ld de, wOTTrademonSpeciesName - call Function294a9 + call TradeAnim_GetNickname call Function297ed ret ; 29082 @@ -368,7 +368,7 @@ Function2914e: ; 2914e call WaitBGMap ld b, SCGB_1B call GetSGBLayout - ld a, $e4 + ld a, %11100100 ; 3,2,1,0 call DmgToCgbBGPals ld a, $d0 call DmgToCgbObjPal0 @@ -566,6 +566,7 @@ Function292be: ; 292be hlcoord 17, 3 ld a, $5d ld [hl], a + ld a, $61 ld de, SCREEN_WIDTH ld c, $3 @@ -574,6 +575,7 @@ Function292be: ; 292be ld [hl], a dec c jr nz, .loop + add hl, de ld a, $5f ld [hld], a @@ -644,9 +646,9 @@ TradeAnim_EnterLinkTube: ; 29348 call WaitBGMap ld b, SCGB_1B call GetSGBLayout - ld a, $e4 + ld a, %11100100 ; 3,2,1,0 call DmgToCgbBGPals - ld de, $e4e4 + lb de, %11100100, %11100100 ; 3,2,1,0, 3,2,1,0 call DmgToCgbObjPals ld de, SFX_POTION call PlaySFX @@ -784,9 +786,9 @@ TradeAnim_ShowGivemonData: ; 2942e ld [TempMonDVs + 1], a ld b, SCGB_1A call GetSGBLayout - ld a, $e4 + ld a, %11100100 ; 3,2,1,0 call DmgToCgbBGPals - call Function294bb + call TradeAnim_ShowGivemonFrontpic ld a, [wPlayerTrademonSpecies] call GetCryIndex @@ -810,20 +812,20 @@ TradeAnim_ShowGetmonData: ; 29461 ld [TempMonDVs + 1], a ld b, SCGB_1A call GetSGBLayout - ld a, $e4 + ld a, %11100100 ; 3,2,1,0 call DmgToCgbBGPals - call Function294c0 + call TradeAnim_ShowGetmonFrontpic call TradeAnim_Next ret ; 29487 TradeAnim_AnimateFrontpic: ; 29487 - callba Function4d81e + callba AnimateTrademonFrontpic call TradeAnim_Next ret ; 29491 -Function29491: ; 29491 +TradeAnim_GetFrontpic: ; 29491 push de push af predef GetUnownLetter @@ -836,7 +838,7 @@ Function29491: ; 29491 ret ; 294a9 -Function294a9: ; 294a9 +TradeAnim_GetNickname: ; 294a9 push de ld [wd265], a call GetPokemonName @@ -847,14 +849,13 @@ Function294a9: ; 294a9 ret ; 294bb -Function294bb: ; 294bb +TradeAnim_ShowGivemonFrontpic: ; 294bb ld de, VTiles0 - jr Function294c3 + jr TradeAnim_ShowFrontpic -Function294c0: ; 294c0 +TradeAnim_ShowGetmonFrontpic: ; 294c0 ld de, VTiles0 tile $31 - -Function294c3: ; 294c3 +TradeAnim_ShowFrontpic: ; 294c3 call DelayFrame ld hl, VTiles2 lb bc, 10, $31 @@ -1087,7 +1088,7 @@ TradeAnim_Poof: ; 29649 ; 29660 TradeAnim_BulgeThroughTube: ; 29660 - ld a, $e4 + ld a, %11100100 ; 3,2,1,0 call DmgToCgbObjPal0 depixel 5, 11 ld a, SPRITE_ANIM_INDEX_10 @@ -1374,13 +1375,13 @@ Function297db: ; 297db Function297ed: ; 297ed ld a, [hSGB] and a - ld a, $e4 + ld a, %11100100 ; 3,2,1,0 jr z, .asm_297f6 ld a, $f0 .asm_297f6 call DmgToCgbObjPal0 - ld a, $e4 + ld a, %11100100 ; 3,2,1,0 call DmgToCgbBGPals ret ; 297ff |