diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-22 18:03:00 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-22 18:03:00 -0500 |
| commit | d08199c79d8168368aeac0381427d533e09f073d (patch) | |
| tree | e97f322f3ec8a6f9e12e3360d358f3ed10ccb4d9 /predef | |
| parent | 630d789c70fcd2b87336caf4762be2012790d4a8 (diff) | |
Color fns, some more address decoding in link/mobile
Diffstat (limited to 'predef')
| -rw-r--r-- | predef/cgb.asm | 63 | ||||
| -rw-r--r-- | predef/sgb.asm | 327 |
2 files changed, 194 insertions, 196 deletions
diff --git a/predef/cgb.asm b/predef/cgb.asm index b681d6df7..c235816c0 100644 --- a/predef/cgb.asm +++ b/predef/cgb.asm @@ -11,7 +11,6 @@ Predef_LoadSGBLayoutCGB: ; 8d59 cp SCGB_RAM jr nz, .not_ram ld a, [SGBPredef] - .not_ram cp SCGB_FC jp z, Function96f3 @@ -62,7 +61,7 @@ Predef_LoadSGBLayoutCGB: ; 8d59 dw _CGB19 dw _CGB1a dw _CGB1b - dw _CGB1c + dw _CGB_FrontpicPals dw _CGB1d dw _CGB1e ; 8db8 @@ -289,7 +288,7 @@ Unknown_8f6a: ; 8f6a _CGB04: ; 8f70 ld de, UnknBGPals ld a, $1d - call GetAthPalletFromPalettes9df6 + call GetPredefPal call LoadHLPaletteIntoDE ld a, [CurPartySpecies] cp $ff @@ -336,7 +335,7 @@ Palette8fc2: ; 8fc2 _CGB17: ; 8fca ld de, UnknBGPals ld a, $1d - call GetAthPalletFromPalettes9df6 + call GetPredefPal call LoadHLPaletteIntoDE ld a, [CurPartySpecies] cp $ff @@ -396,7 +395,7 @@ Palette9036: ; 9036 _CGB16: ; 903e ld de, UnknBGPals ld a, $1d - call GetAthPalletFromPalettes9df6 + call GetPredefPal call LoadHLPaletteIntoDE ld a, [CurPartySpecies] call GetMonPalettePointer_ @@ -474,7 +473,7 @@ _CGB06: ; 90f8 call WipeAttrMap ld de, UnknOBPals ld a, $3c - call GetAthPalletFromPalettes9df6 + call GetPredefPal call LoadHLPaletteIntoDE hlcoord 0, 6, AttrMap lb bc, 12, SCREEN_WIDTH @@ -539,12 +538,12 @@ Palette_9156: ; 9156 Function9166: ; 9166 ld de, UnknBGPals ld a, $38 - call GetAthPalletFromPalettes9df6 + call GetPredefPal call LoadHLPaletteIntoDE ld de, UnknOBPals ld a, $39 - call GetAthPalletFromPalettes9df6 + call GetPredefPal call LoadHLPaletteIntoDE call WipeAttrMap ret @@ -555,7 +554,7 @@ Function9180: ; 9180 call CopyFourPalettes ld de, UnknOBPals ld a, $3a - call GetAthPalletFromPalettes9df6 + call GetPredefPal call LoadHLPaletteIntoDE call WipeAttrMap ret @@ -587,8 +586,8 @@ _CGB08: ; 91ad ; 91c8 _CGB09: ; 91c8 - call Functionb1de - ld a, SCGB_09 + call LoadMapPals + ld a, SCGB_MAPPALS ld [SGBPredef], a ret ; 91d1 @@ -609,7 +608,7 @@ _CGB0b: ; 91e4 and a jr z, .pokemon ld a, $1a - call GetAthPalletFromPalettes9df6 + call GetPredefPal call LoadHLPaletteIntoDE jr .got_palette @@ -670,7 +669,7 @@ _CGB18: ; 925e call CopyFourPalettes ld de, UnknOBPals ld a, $4c - call GetAthPalletFromPalettes9df6 + call GetPredefPal call LoadHLPaletteIntoDE ld a, [rSVBK] push af @@ -715,7 +714,7 @@ _CGB15: ; 9289 call GetTrainerPalettePointer call LoadPalette_White_Col1_Col2_Black ld a, $24 - call GetAthPalletFromPalettes9df6 + call GetPredefPal call LoadHLPaletteIntoDE hlcoord 0, 0, AttrMap @@ -793,7 +792,7 @@ _CGB15: ; 9289 _CGB0e: ; 9373 ld de, UnknBGPals ld a, $10 - call GetAthPalletFromPalettes9df6 + call GetPredefPal call LoadHLPaletteIntoDE ld a, [PlayerHPPal] ld l, a @@ -830,7 +829,7 @@ _CGB0f: ; 93a6 _CGB10: ; 93ba ld de, UnknBGPals ld a, $1d - call GetAthPalletFromPalettes9df6 + call GetPredefPal call LoadHLPaletteIntoDE call WipeAttrMap call ApplyAttrMap @@ -850,11 +849,11 @@ _CGB14: ; 93d3 bit 0, a jr z, .tutorial_male - ld hl, Palettes_9469 + ld hl, .KrisPackPals jr .got_gender .tutorial_male - ld hl, Palettes_9439 + ld hl, .ChrisPackPals .got_gender ld de, UnknBGPals @@ -889,7 +888,7 @@ _CGB14: ; 93d3 ret ; 9439 -Palettes_9439: ; 9439 +.ChrisPackPals: ; 9439 RGB 31, 31, 31 RGB 15, 15, 31 RGB 00, 00, 31 @@ -921,7 +920,7 @@ Palettes_9439: ; 9439 RGB 00, 00, 00 ; 9469 -Palettes_9469: ; 9469 +.KrisPackPals: ; 9469 RGB 31, 31, 31 RGB 31, 14, 31 RGB 31, 07, 31 @@ -1010,13 +1009,13 @@ _CGB13: ; 94d0 _CGB19: ; 94fa ld de, UnknBGPals ld a, $4e - call GetAthPalletFromPalettes9df6 + call GetPredefPal call LoadHLPaletteIntoDE - ld hl, Palette_9521 + ld hl, .Palette ld de, UnknOBPals call LoadHLPaletteIntoDE - ld hl, Palette_9521 - ld de, UnknOBPals + 8 + ld hl, .Palette + ld de, UnknOBPals + 1 palettes call LoadHLPaletteIntoDE call WipeAttrMap call ApplyAttrMap @@ -1024,7 +1023,7 @@ _CGB19: ; 94fa ret ; 9521 -Palette_9521: ; 9521 +.Palette: ; 9521 RGB 31, 31, 31 RGB 13, 11, 00 RGB 23, 12, 28 @@ -1058,18 +1057,18 @@ _CGB1b: ; 9555 call CopyFourPalettes ld hl, Palettes_b681 ld de, UnknOBPals - ld bc, $8 + ld bc, 1 palettes ld a, $5 call FarCopyWRAM - ld de, UnknOBPals + $38 + ld de, UnknOBPals + 7 palettes ld a, $1c - call GetAthPalletFromPalettes9df6 + call GetPredefPal call LoadHLPaletteIntoDE call WipeAttrMap ret ; 9578 -_CGB1c: ; 9578 +_CGB_FrontpicPals: ; 9578 ld de, UnknBGPals ld a, [CurPartySpecies] ld bc, TempMonDVs @@ -1082,9 +1081,9 @@ _CGB1c: ; 9578 ; 9591 _CGB1d: ; 9591 - ld hl, Palette95e0 + ld hl, .Palettes ld de, UnknBGPals - ld bc, $10 + ld bc, 2 palettes ld a, $5 call FarCopyWRAM call ApplyPals @@ -1113,7 +1112,7 @@ _CGB1d: ; 9591 ret ; 95e0 -Palette95e0: ; 95e0 +.Palettes: ; 95e0 RGB 31, 31, 31 RGB 16, 31, 14 RGB 05, 14, 21 diff --git a/predef/sgb.asm b/predef/sgb.asm index 471eeea39..aad463052 100644 --- a/predef/sgb.asm +++ b/predef/sgb.asm @@ -7,7 +7,6 @@ Predef_LoadSGBLayout: ; 864c cp SCGB_RAM jr nz, .not_ram ld a, [SGBPredef] - .not_ram cp SCGB_FC jp z, Function8ade @@ -53,7 +52,7 @@ Predef_LoadSGBLayout: ; 864c dw .SGB19 dw .SGB1a dw .SGB1b - dw .SGB1c + dw .SGB_FrontpicPals dw .SGB1d dw .SGB1e ; 86ad @@ -69,8 +68,8 @@ Predef_LoadSGBLayout: ; 864c call Function9809 ld hl, PalPacket_9ce6 - ld de, wcda9 - ld bc, $0010 + ld de, wSGBPals + ld bc, $10 call CopyBytes ld a, [PlayerHPPal] @@ -83,17 +82,17 @@ endr add hl, de ld a, [hli] - ld [wcda9 + 3], a + ld [wSGBPals + 3], a ld a, [hli] - ld [wcda9 + 4], a + ld [wSGBPals + 4], a ld a, [hli] - ld [wcda9 + 5], a + ld [wSGBPals + 5], a ld a, [hl] - ld [wcda9 + 6], a + ld [wSGBPals + 6], a ld a, [EnemyHPPal] ld l, a - ld h, $0 + ld h, 0 rept 2 add hl, hl endr @@ -101,41 +100,41 @@ endr ld de, Palettes_a8be add hl, de ld a, [hli] - ld [wcda9 + 9], a + ld [wSGBPals + 9], a ld a, [hli] - ld [wcda9 + 10], a + ld [wSGBPals + 10], a ld a, [hli] - ld [wcda9 + 11], a + ld [wSGBPals + 11], a ld a, [hl] - ld [wcda9 + 12], a + ld [wSGBPals + 12], a ld hl, PalPacket_9cf6 - ld de, wcda9 + $10 - ld bc, $0010 + ld de, wSGBPals + $10 + ld bc, $10 call CopyBytes call GetBattlemonBackpicPalettePointer ld a, [hli] - ld [wcda9 + $13], a + ld [wSGBPals + $13], a ld a, [hli] - ld [wcda9 + $14], a + ld [wSGBPals + $14], a ld a, [hli] - ld [wcda9 + $15], a + ld [wSGBPals + $15], a ld a, [hl] - ld [wcda9 + $16], a + ld [wSGBPals + $16], a call GetEnemyFrontpicPalettePointer ld a, [hli] - ld [wcda9 + $19], a + ld [wSGBPals + $19], a ld a, [hli] - ld [wcda9 + $1a], a + ld [wSGBPals + $1a], a ld a, [hli] - ld [wcda9 + $1b], a + ld [wSGBPals + $1b], a ld a, [hl] - ld [wcda9 + $1c], a + ld [wSGBPals + $1c], a - ld hl, wcda9 - ld de, wcda9 + $10 + ld hl, wSGBPals + ld de, wSGBPals + $10 ld a, SCGB_01 ld [SGBPredef], a ret @@ -143,11 +142,11 @@ endr .SGB0e: ; 873c ld hl, PalPacket_9bd6 - ld de, wcda9 - ld bc, $0010 + ld de, wSGBPals + ld bc, $10 call CopyBytes - ld hl, wcda9 + 1 + ld hl, wSGBPals + 1 ld [hl], $10 rept 2 inc hl @@ -156,7 +155,7 @@ endr ld a, [PlayerHPPal] add $2f ld [hl], a - ld hl, wcda9 + ld hl, wSGBPals ld de, BlkPacket_9ad6 ret ; 875c @@ -169,53 +168,53 @@ endr .SGB03: ; 8763 ld hl, PalPacket_9ce6 - ld de, wcda9 - ld bc, $0010 + ld de, wSGBPals + ld bc, $10 call CopyBytes ld a, [wcda1] ld l, a - ld h, $0 + ld h, 0 rept 2 add hl, hl endr ld de, Palettes_a8be add hl, de ld a, [hli] - ld [wcda9 + 3], a + ld [wSGBPals + 3], a ld a, [hli] - ld [wcda9 + 4], a + ld [wSGBPals + 4], a ld a, [hli] - ld [wcda9 + 5], a + ld [wSGBPals + 5], a ld a, [hl] - ld [wcda9 + 6], a + ld [wSGBPals + 6], a ld a, [CurPartySpecies] - ld bc, wd10e + 21 + ld bc, TempMonDVs call GetPlayerOrMonPalettePointer ld a, [hli] - ld [wcda9 + 9], a + ld [wSGBPals + 9], a ld a, [hli] - ld [wcda9 + 10], a + ld [wSGBPals + 10], a ld a, [hli] - ld [wcda9 + 11], a + ld [wSGBPals + 11], a ld a, [hl] - ld [wcda9 + 12], a - ld hl, wcda9 + ld [wSGBPals + 12], a + ld hl, wSGBPals ld de, BlkPacket_9ac6 ret ; 87ab .SGB0a: ; 87ab ld hl, PalPacket_9c56 - ld de, wcda9 + 1 + ld de, wSGBPals + 1 ret ; 87b2 .SGB04: ; 87b2 ld hl, PalPacket_9ce6 - ld de, wcda9 - ld bc, $0010 + ld de, wSGBPals + ld bc, $10 call CopyBytes - ld hl, wcda9 + 3 + ld hl, wSGBPals + 3 ld [hl], $9f inc hl ld [hl], $2a @@ -226,24 +225,24 @@ endr ld a, [CurPartySpecies] call GetMonPalettePointer_ ld a, [hli] - ld [wcda9 + 9], a + ld [wSGBPals + 9], a ld a, [hli] - ld [wcda9 + 10], a + ld [wSGBPals + 10], a ld a, [hli] - ld [wcda9 + 11], a + ld [wSGBPals + 11], a ld a, [hl] - ld [wcda9 + 12], a - ld hl, wcda9 + ld [wSGBPals + 12], a + ld hl, wSGBPals ld de, BlkPacket_9ae6 ret ; 87e9 .SGB17: ; 87e9 ld hl, PalPacket_9ce6 - ld de, wcda9 - ld bc, $0010 + ld de, wSGBPals + ld bc, $10 call CopyBytes - ld hl, wcda9 + 3 + ld hl, wSGBPals + 3 ld [hl], $9f inc hl ld [hl], $2a @@ -252,17 +251,17 @@ endr inc hl ld [hl], $19 ld a, [CurPartySpecies] - ld bc, wd10e + 21 + ld bc, TempMonDVs call GetPlayerOrMonPalettePointer ld a, [hli] - ld [wcda9 + 9], a + ld [wSGBPals + 9], a ld a, [hli] - ld [wcda9 + 10], a + ld [wSGBPals + 10], a ld a, [hli] - ld [wcda9 + 11], a + ld [wSGBPals + 11], a ld a, [hl] - ld [wcda9 + 12], a - ld hl, wcda9 + ld [wSGBPals + 12], a + ld hl, wSGBPals ld de, BlkPacket_9ae6 ret ; 8823 @@ -275,10 +274,10 @@ endr .SGB10: ; 882a ld hl, PalPacket_9ce6 - ld de, wcda9 - ld bc, $0010 + ld de, wSGBPals + ld bc, $10 call CopyBytes - ld hl, wcda9 + 3 + ld hl, wSGBPals + 3 ld [hl], $9f inc hl ld [hl], $2a @@ -286,7 +285,7 @@ endr ld [hl], $5a inc hl ld [hl], $19 - ld hl, wcda9 + ld hl, wSGBPals ld de, BlkPacket_9a86 ret ; 884b @@ -361,7 +360,7 @@ endr .SGB11: ; 889e ld hl, BlkPacket_9a86 ld de, PlayerLightScreenCount - ld bc, $0010 + ld bc, $10 call CopyBytes ld hl, PalPacket_9bb6 ld de, BlkPacket_9a86 @@ -370,14 +369,14 @@ endr .SGB09: ; 88b1 ld hl, PalPacket_9bd6 - ld de, wcda9 - ld bc, $0010 + ld de, wSGBPals + ld bc, $10 call CopyBytes - call .GetPermission - ld hl, wcda9 + 1 + call .GetMapPalsIndex + ld hl, wSGBPals + 1 ld [hld], a ld de, BlkPacket_9a86 - ld a, SCGB_09 + ld a, SCGB_MAPPALS ld [SGBPredef], a ret ; 88cd @@ -385,14 +384,14 @@ endr .SGB0b: ; 88cd push bc ld hl, PalPacket_9ce6 - ld de, wcda9 - ld bc, $0010 + ld de, wSGBPals + ld bc, $10 call CopyBytes pop bc ld a, c and a jr z, .asm_88ef - ld hl, wcda9 + 3 + ld hl, wSGBPals + 3 ld [hl], $e7 inc hl ld [hl], $1c @@ -404,7 +403,7 @@ endr .asm_88ef ld hl, PartyMon1DVs - ld bc, $0030 + ld bc, $30 ld a, [CurPartyMon] call AddNTimes ld c, l @@ -412,16 +411,16 @@ endr ld a, [PlayerHPPal] call GetPlayerOrMonPalettePointer ld a, [hli] - ld [wcda9 + 3], a + ld [wSGBPals + 3], a ld a, [hli] - ld [wcda9 + 4], a + ld [wSGBPals + 4], a ld a, [hli] - ld [wcda9 + 5], a + ld [wSGBPals + 5], a ld a, [hl] - ld [wcda9 + 6], a + ld [wSGBPals + 6], a .asm_8913 - ld hl, wcda9 + ld hl, wSGBPals ld de, BlkPacket_9a86 ret ; 891a @@ -441,20 +440,20 @@ endr .SGB12: ; 8928 ld hl, PalPacket_9bd6 - ld de, wcda9 - ld bc, $0010 + ld de, wSGBPals + ld bc, $10 call CopyBytes ld hl, BlkPacket_9a86 - ld de, wcda9 + $10 - ld bc, $0010 + ld de, wSGBPals + $10 + ld bc, $10 call CopyBytes - call .GetPermission - ld hl, wcda9 + 1 + call .GetMapPalsIndex + ld hl, wSGBPals + 1 ld [hl], a - ld hl, wcda9 + 3 + ld hl, wSGBPals + 3 ld [hl], $2e - ld hl, wcda9 + $13 - ld a, $5 + ld hl, wSGBPals + $13 + ld a, 5 ld [hli], a ld a, [wMenuBorderLeftCoord] ld [hli], a @@ -464,15 +463,15 @@ endr ld [hli], a ld a, [wMenuBorderBottomCoord] ld [hl], a - ld hl, wcda9 - ld de, wcda9 + $10 + ld hl, wSGBPals + ld de, wSGBPals + $10 ret ; 8969 .SGB1e: ; 8969 ld hl, PalPacket_9ce6 - ld de, wcda9 - ld bc, $0010 + ld de, wSGBPals + ld bc, $10 call CopyBytes ld a, [CurPartySpecies] ld l, a @@ -490,14 +489,14 @@ endr ld b, 0 add hl, bc ld a, [hli] - ld [wcda9 + 3], a + ld [wSGBPals + 3], a ld a, [hli] - ld [wcda9 + 4], a + ld [wSGBPals + 4], a ld a, [hli] - ld [wcda9 + 5], a + ld [wSGBPals + 5], a ld a, [hl] - ld [wcda9 + 6], a - ld hl, wcda9 + ld [wSGBPals + 6], a + ld hl, wSGBPals ld de, BlkPacket_9a86 ret ; 89a6 @@ -510,21 +509,21 @@ endr .SGB1a: ; 89ad ld hl, PalPacket_9ce6 - ld de, wcda9 - ld bc, $0010 + ld de, wSGBPals + ld bc, $10 call CopyBytes ld a, [CurPartySpecies] - ld bc, wd10e + 21 + ld bc, TempMonDVs call GetPlayerOrMonPalettePointer ld a, [hli] - ld [wcda9 + 3], a + ld [wSGBPals + 3], a ld a, [hli] - ld [wcda9 + 4], a + ld [wSGBPals + 4], a ld a, [hli] - ld [wcda9 + 5], a + ld [wSGBPals + 5], a ld a, [hl] - ld [wcda9 + 6], a - ld hl, wcda9 + ld [wSGBPals + 6], a + ld hl, wSGBPals ld de, BlkPacket_9a86 ret ; 89d9 @@ -535,99 +534,99 @@ endr ret ; 89e0 -.SGB1c: ; 89e0 +.SGB_FrontpicPals: ; 89e0 ld hl, PalPacket_9ce6 - ld de, wcda9 - ld bc, $0010 + ld de, wSGBPals + ld bc, $10 call CopyBytes ld a, [CurPartySpecies] - ld bc, wd10e + 21 + ld bc, TempMonDVs call GetFrontpicPalettePointer ld a, [hli] - ld [wcda9 + 3], a + ld [wSGBPals + 3], a ld a, [hli] - ld [wcda9 + 4], a + ld [wSGBPals + 4], a ld a, [hli] - ld [wcda9 + 5], a + ld [wSGBPals + 5], a ld a, [hl] - ld [wcda9 + 6], a - ld hl, wcda9 + ld [wSGBPals + 6], a + ld hl, wSGBPals ld de, BlkPacket_9a86 ret ; 8a0c -.GetPermission: ; 8a0c +.GetMapPalsIndex: ; 8a0c ld a, [TimeOfDayPal] - cp $2 - jr c, .asm_8a16 + cp NITE + jr c, .morn_day ld a, $19 ret -.asm_8a16 +.morn_day ld a, [wPermission] - cp $2 - jr z, .asm_8a39 - cp $4 - jr z, .asm_8a3c - cp $7 - jr z, .asm_8a3c - cp $5 - jr z, .asm_8a3f - cp $6 - jr z, .asm_8a42 + cp ROUTE + jr z, .route + cp CAVE + jr z, .cave + cp DUNGEON + jr z, .cave + cp PERM_5 + jr z, .perm5 + cp GATE + jr z, .gate ld a, [MapGroup] ld e, a ld d, 0 - ld hl, .Unknown_8a45 + ld hl, .SGBRoofPalInds add hl, de ld a, [hl] ret -.asm_8a39 - ld a, $0 +.route + ld a, $00 ret -.asm_8a3c +.cave ld a, $18 ret -.asm_8a3f - ld a, $6 +.perm5 + ld a, $06 ret -.asm_8a42 - ld a, $3 +.gate + ld a, $03 ret ; 8a45 -.Unknown_8a45: ; 8a45 - db $00 - db $12 - db $14 - db $18 - db $11 - db $15 - db $09 - db $04 - db $0f - db $16 - db $0e - db $10 - db $06 - db $01 - db $03 - db $06 - db $0b - db $08 - db $05 - db $17 - db $08 - db $07 - db $13 - db $02 - db $0c - db $0a - db $0d +.SGBRoofPalInds: ; 8a45 + db $00 ; Unused + db $12 ; Olivine + db $14 ; Mahogany + db $18 ; Various Dungeons + db $11 ; Ecruteak + db $15 ; Blackthorn + db $09 ; Cinnabar + db $04 ; Cerulean + db $0f ; Azalea + db $16 ; Lake Of Rage + db $0e ; Violet + db $10 ; Goldenrod + db $06 ; Vermilion + db $01 ; Palette + db $03 ; Pewter + db $06 ; Fast Ship + db $0b ; Indigo Plateau + db $08 ; Fuchsia + db $05 ; Lavender + db $17 ; Silver Cave Outside + db $08 ; Pokemon Center 2F + db $07 ; Celadon + db $13 ; Cianwood + db $02 ; Viridian + db $0c ; New Bark + db $0a ; Saffron + db $0d ; Cherrygrove ; 8a60 .Finish: ; 8a60 |
