Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokecrystal

Browse Source 
# Conflicts:
#	audio/engine.asm
#	constants/gfx_constants.asm
#	constants/map_data_constants.asm
#	constants/pokemon_data_constants.asm
#	constants/sprite_constants.asm
#	constants/wram_constants.asm
#	data/maps/data.asm
#	engine/battle/ai/scoring.asm
#	engine/battle/core.asm
#	engine/battle/effect_commands.asm
#	engine/battle/misc.asm
#	engine/battle_anims/getpokeballwobble.asm
#	engine/breeding.asm
#	engine/buy_sell_toss.asm
#	engine/decorations.asm
#	engine/events/battle_tower/battle_tower.asm
#	engine/events/battle_tower/rules.asm
#	engine/events/buena.asm
#	engine/events/bug_contest/contest_2.asm
#	engine/events/daycare.asm
#	engine/events/dratini.asm
#	engine/events/halloffame.asm
#	engine/events/happiness_egg.asm
#	engine/events/kurt.asm
#	engine/events/lucky_number.asm
#	engine/events/magnet_train.asm
#	engine/events/overworld.asm
#	engine/events/pokerus/pokerus.asm
#	engine/events/print_unown.asm
#	engine/events/print_unown_2.asm
#	engine/events/unown_walls.asm
#	engine/item_effects.asm
#	engine/link.asm
#	engine/mon_menu.asm
#	engine/player_object.asm
#	engine/routines/playslowcry.asm
#	engine/scripting.asm
#	engine/search.asm
#	engine/search2.asm
#	engine/specials.asm
#	engine/start_menu.asm
#	engine/timeset.asm
#	home/battle_vars.asm
#	home/map.asm
#	maps/GoldenrodUndergroundSwitchRoomEntrances.asm
#	maps/IlexForest.asm
#	maps/KrissHouse2F.asm
#	maps/Route39Barn.asm
#	mobile/mobile_12_2.asm
#	mobile/mobile_40.asm
#	mobile/mobile_5f.asm
#	wram.asm
This commit is contained in:
Rangi
2018-02-03 18:21:53 -05:00
parent 6ff2cb20e6 b35eb72290
commit 32ed487a47
367 changed files with 8920 additions and 8922 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
engine/color.asm
View File

@@ -239,13 +239,13 @@ Unreferenced_Function8b81:
ret
LoadTrainerClassPaletteAsNthBGPal:
ld a, [TrainerClass]
ld a, [wTrainerClass]
call GetTrainerPalettePointer
ld a, e
jr got_palette_pointer_8bd7
LoadMonPaletteAsNthBGPal:
ld a, [CurPartySpecies]
ld a, [wCurPartySpecies]
call GetMonPalettePointer
ld a, e
bit 7, a
@@ -278,14 +278,14 @@ Unreferenced_Function8bec:
ld a, [hCGB]
and a
jr nz, .cgb
ld hl, PlayerLightScreenCount
ld hl, wPlayerLightScreenCount
jp PushSGBPals_
.cgb
ld a, [EnemyLightScreenCount] ; col
ld a, [wEnemyLightScreenCount] ; col
ld c, a
ld a, [EnemyReflectCount] ; row
hlcoord 0, 0, AttrMap
ld a, [wEnemyReflectCount] ; row
hlcoord 0, 0, wAttrMap
ld de, SCREEN_WIDTH
.loop
and a
@@ -298,7 +298,7 @@ Unreferenced_Function8bec:
ld b, $0
add hl, bc
lb bc, 6, 4
ld a, [EnemySafeguardCount] ; value
ld a, [wEnemySafeguardCount] ; value
and $3
call FillBoxCGB
call CopyTilemapAtOnce
@@ -310,12 +310,12 @@ ApplyMonOrTrainerPals:
ld a, e
and a
jr z, .get_trainer
ld a, [CurPartySpecies]
ld a, [wCurPartySpecies]
call GetMonPalettePointer_
jr .load_palettes
.get_trainer
ld a, [TrainerClass]
ld a, [wTrainerClass]
call GetTrainerPalettePointer
.load_palettes
@@ -360,9 +360,9 @@ ApplyHPBarPals:
.PartyMenu:
ld e, c
inc e
hlcoord 11, 1, AttrMap
hlcoord 11, 1, wAttrMap
ld bc, 2 * SCREEN_WIDTH
ld a, [CurPartyMon]
ld a, [wCurPartyMon]
.loop
and a
jr z, .done
@@ -592,7 +592,7 @@ ResetBGPals:
ret
WipeAttrMap:
hlcoord 0, 0, AttrMap
hlcoord 0, 0, wAttrMap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
xor a
call ByteFill
@@ -602,7 +602,7 @@ ApplyPals:
ld hl, wBGPals1
ld de, wBGPals2
ld bc, 16 palettes
ld a, BANK(wPals)
ld a, BANK(wGBCPalettes)
call FarCopyWRAM
ret
@@ -623,7 +623,7 @@ ApplyAttrMap:
ret
.UpdateVBank1:
hlcoord 0, 0, AttrMap
hlcoord 0, 0, wAttrMap
debgcoord 0, 0
ld b, SCREEN_HEIGHT
ld a, $1
@@ -660,7 +660,7 @@ CGB_ApplyPartyMenuHPPals: ; 96f3
ld a, [de]
inc a
ld e, a
hlcoord 11, 2, AttrMap
hlcoord 11, 2, wAttrMap
ld bc, 2 * SCREEN_WIDTH
ld a, [wSGBPals]
.loop
@@ -688,7 +688,7 @@ GetBattlemonBackpicPalettePointer:
farcall GetPartyMonDVs
ld c, l
ld b, h
ld a, [TempBattleMonSpecies]
ld a, [wTempBattleMonSpecies]
call GetPlayerOrMonPalettePointer
pop de
ret
@@ -698,7 +698,7 @@ GetEnemyFrontpicPalettePointer:
farcall GetEnemyMonDVs
ld c, l
ld b, h
ld a, [TempEnemyMonSpecies]
ld a, [wTempEnemyMonSpecies]
call GetFrontpicPalettePointer
pop de
ret
@@ -716,13 +716,13 @@ GetPlayerOrMonPalettePointer:
ret
.male
ld hl, PlayerPalette
ld hl, wPlayerPalette
ret
GetFrontpicPalettePointer:
and a
jp nz, GetMonNormalOrShinyPalettePointer
ld a, [TrainerClass]
ld a, [wTrainerClass]
GetTrainerPalettePointer:
ld l, a
@@ -1230,7 +1230,7 @@ LoadMapPals:
ld h, [hl]
ld l, a
; Futher refine by time of day
ld a, [TimeOfDayPal]
ld a, [wTimeOfDayPal]
maskbits NUM_DAYTIMES
add a
add a
@@ -1276,7 +1276,7 @@ LoadMapPals:
ld [rSVBK], a
.got_pals
ld a, [TimeOfDayPal]
ld a, [wTimeOfDayPal]
maskbits NUM_DAYTIMES
ld bc, 8 palettes
ld hl, MapObjectPals
@@ -1292,7 +1292,7 @@ LoadMapPals:
cp ROUTE
ret nz
.outside
ld a, [MapGroup]
ld a, [wMapGroup]
ld l, a
ld h, 0
add hl, hl
@@ -1300,7 +1300,7 @@ LoadMapPals:
add hl, hl
ld de, RoofPals
add hl, de
ld a, [TimeOfDayPal]
ld a, [wTimeOfDayPal]
maskbits NUM_DAYTIMES
cp NITE_F
jr c, .morn_day