pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #715 from Rangi42/master

Browse Source 
Miscellaneous updates
This commit is contained in:
mid-kid 2020-04-30 17:54:56 +00:00 committed by GitHub
commit d47c560367
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants/scgb_constants.asm
View File

@ -38,7 +38,7 @@ SCGB_RAM EQU -1
; PredefPals indexes (see gfx/sgb/predef.pal) ; PredefPals indexes (see gfx/sgb/predef.pal)
; GetPredefPal arguments (see engine/gfx/color.asm) ; GetPredefPal arguments (see engine/gfx/color.asm)
const_def const_def
const PREDEFPAL_00 const PREDEFPAL_ROUTES
const PREDEFPAL_PALLET const PREDEFPAL_PALLET
const PREDEFPAL_VIRIDIAN const PREDEFPAL_VIRIDIAN
const PREDEFPAL_PEWTER const PREDEFPAL_PEWTER

2
data/maps/sgb_roof_pal_inds.asm
View File

@ -2,7 +2,7 @@
MapGroupRoofSGBPalInds: MapGroupRoofSGBPalInds:
; entries correspond to map groups ; entries correspond to map groups
db PREDEFPAL_00 db PREDEFPAL_ROUTES
db PREDEFPAL_OLIVINE db PREDEFPAL_OLIVINE
db PREDEFPAL_MAHOGANY db PREDEFPAL_MAHOGANY
db PREDEFPAL_DUNGEONS db PREDEFPAL_DUNGEONS

2
engine/gfx/sgb_layouts.asm
View File

@ -547,7 +547,7 @@ endr
ret ret
.route .route
ld a, PREDEFPAL_00 ld a, PREDEFPAL_ROUTES
ret ret
.cave .cave

13
engine/overworld/player_movement.asm
View File

@ -577,11 +577,14 @@ DoPlayerMovement::
; Standing ; Standing
jr .update jr .update
.d_down add hl, de .d_down
.d_up add hl, de add hl, de
.d_left add hl, de .d_up
.d_right add hl, de add hl, de
.d_left
add hl, de
.d_right
add hl, de
.update .update
ld a, [hli] ld a, [hli]
ld [wWalkingDirection], a ld [wWalkingDirection], a

2
engine/overworld/player_object.asm
View File

@ -124,7 +124,7 @@ RefreshPlayerCoords:
ld e, a ld e, a
; the next three lines are useless ; the next three lines are useless
ld a, [wObjectFollow_Leader] ld a, [wObjectFollow_Leader]
cp $0 cp PLAYER
ret nz ret nz
ret ret

28
gfx/sgb/pal_packets.asm
View File

@ -20,7 +20,7 @@ PalPacket_GSTitleScreen:
sgb_pal_set GS_TITLE_SCREEN_0, GS_TITLE_SCREEN_1, GS_TITLE_SCREEN_2, GS_TITLE_SCREEN_3 sgb_pal_set GS_TITLE_SCREEN_0, GS_TITLE_SCREEN_1, GS_TITLE_SCREEN_2, GS_TITLE_SCREEN_3
PalPacket_MagnetTrain: PalPacket_MagnetTrain:
sgb_pal_set BETA_SHINY_GREENMON, CGB_BADGE, RB_BROWNMON, 00 sgb_pal_set BETA_SHINY_GREENMON, CGB_BADGE, RB_BROWNMON, ROUTES
PalPacket_BetaPoker: PalPacket_BetaPoker:
sgb_pal_set BETA_POKER_0, BETA_POKER_1, BETA_POKER_2, BETA_POKER_3 sgb_pal_set BETA_POKER_0, BETA_POKER_1, BETA_POKER_2, BETA_POKER_3
@ -29,28 +29,28 @@ PalPacket_UnownPuzzle:
sgb_pal_set UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE sgb_pal_set UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE
PalPacket_9bd6: PalPacket_9bd6:
sgb_pal_set 00, 00, 00, 00 sgb_pal_set ROUTES, ROUTES, ROUTES, ROUTES
PalPacket_GSIntroShellderLapras: PalPacket_GSIntroShellderLapras:
sgb_pal_set GS_INTRO_SHELLDER_LAPRAS, 00, 00, 00 sgb_pal_set GS_INTRO_SHELLDER_LAPRAS, ROUTES, ROUTES, ROUTES
UnreferencedPalPacket_BetaIntroLapras: UnreferencedPalPacket_BetaIntroLapras:
sgb_pal_set BETA_INTRO_LAPRAS, 00, 00, 00 sgb_pal_set BETA_INTRO_LAPRAS, ROUTES, ROUTES, ROUTES
PalPacket_GSIntroJigglypuffPikachu: PalPacket_GSIntroJigglypuffPikachu:
sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_BG, GS_INTRO_JIGGLYPUFF_PIKACHU_OB, 00, 00 sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_BG, GS_INTRO_JIGGLYPUFF_PIKACHU_OB, ROUTES, ROUTES
PalPacket_GSIntroStartersTransition: PalPacket_GSIntroStartersTransition:
sgb_pal_set GS_INTRO_STARTERS_TRANSITION, 00, 00, 00 sgb_pal_set GS_INTRO_STARTERS_TRANSITION, ROUTES, ROUTES, ROUTES
PalPacket_BetaIntroVenusaur: PalPacket_BetaIntroVenusaur:
sgb_pal_set BETA_INTRO_VENUSAUR, 00, 00, 00 sgb_pal_set BETA_INTRO_VENUSAUR, ROUTES, ROUTES, ROUTES
PalPacket_Pack: PalPacket_Pack:
sgb_pal_set PACK, 00, 00, 00 sgb_pal_set PACK, ROUTES, ROUTES, ROUTES
PalPacket_BetaPikachuMinigame: PalPacket_BetaPikachuMinigame:
sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_OB, 00, 00, 00 sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_OB, ROUTES, ROUTES, ROUTES
PalPacket_PartyMenu: PalPacket_PartyMenu:
sgb_pal_set PARTY_ICON, HP_GREEN, HP_YELLOW, HP_RED sgb_pal_set PARTY_ICON, HP_GREEN, HP_YELLOW, HP_RED
@ -59,10 +59,10 @@ PalPacket_BattleGrayscale:
sgb_pal_set BLACKOUT, BLACKOUT, BLACKOUT, BLACKOUT sgb_pal_set BLACKOUT, BLACKOUT, BLACKOUT, BLACKOUT
PalPacket_Pokegear: PalPacket_Pokegear:
sgb_pal_set POKEGEAR, 00, 00, 00 sgb_pal_set POKEGEAR, ROUTES, ROUTES, ROUTES
UnreferencedPalPacket_9c86: UnreferencedPalPacket_9c86:
sgb_pal_set PACK, 00, 00, 00 sgb_pal_set PACK, ROUTES, ROUTES, ROUTES
PalPacket_SlotMachine: PalPacket_SlotMachine:
sgb_pal_set SLOT_MACHINE_0, SLOT_MACHINE_1, SLOT_MACHINE_2, SLOT_MACHINE_3 sgb_pal_set SLOT_MACHINE_0, SLOT_MACHINE_1, SLOT_MACHINE_2, SLOT_MACHINE_3
@ -71,13 +71,13 @@ PalPacket_BetaTitleScreen:
sgb_pal_set BETA_LOGO_1, BETA_LOGO_2, DIPLOMA, RB_PURPLEMON sgb_pal_set BETA_LOGO_1, BETA_LOGO_2, DIPLOMA, RB_PURPLEMON
PalPacket_Diploma: PalPacket_Diploma:
sgb_pal_set DIPLOMA, 00, 00, 00 sgb_pal_set DIPLOMA, ROUTES, ROUTES, ROUTES
PalPacket_TradeTube: PalPacket_TradeTube:
sgb_pal_set TRADE_TUBE, 00, 00, 00 sgb_pal_set TRADE_TUBE, ROUTES, ROUTES, ROUTES
PalPacket_GamefreakLogo: PalPacket_GamefreakLogo:
sgb_pal_set GS_INTRO_GAMEFREAK_LOGO, 00, 00, 00 sgb_pal_set GS_INTRO_GAMEFREAK_LOGO, ROUTES, ROUTES, ROUTES
PalPacket_9ce6: PalPacket_9ce6:
sgb_pal01 sgb_pal01