diff options
Diffstat (limited to 'predef/sgb.asm')
| -rw-r--r-- | predef/sgb.asm | 170 |
1 files changed, 101 insertions, 69 deletions
diff --git a/predef/sgb.asm b/predef/sgb.asm index 323a0fbb7..c7da48da2 100644 --- a/predef/sgb.asm +++ b/predef/sgb.asm @@ -59,24 +59,24 @@ Table866f: ; 866f ; 86ad Function86ad: ; 86ad - ld hl, $5c66 - ld de, $5aa6 + ld hl, PalPacket_9c66 + ld de, BlkPacket_9aa6 ret ; 86b4 Function86b4: ; 86b4 - ld hl, $5aa6 + ld hl, BlkPacket_9aa6 call Function9809 - ld hl, $5ce6 + ld hl, PalPacket_9ce6 ld de, $cda9 ld bc, $0010 call CopyBytes ld a, [PlayerHPPal] ld l, a - ld h, $0 + ld h, 0 add hl, hl add hl, hl - ld de, $68be + ld de, Palettes_a8be add hl, de ld a, [hli] ld [$cdac], a @@ -101,7 +101,7 @@ Function86b4: ; 86b4 ld [$cdb4], a ld a, [hl] ld [$cdb5], a - ld hl, $5cf6 + ld hl, PalPacket_9cf6 ld de, $cdb9 ld bc, $0010 call CopyBytes @@ -131,7 +131,7 @@ Function86b4: ; 86b4 ; 873c Function873c: ; 873c - ld hl, $5bd6 + ld hl, PalPacket_9bd6 ld de, $cda9 ld bc, $0010 call CopyBytes @@ -143,18 +143,18 @@ Function873c: ; 873c add $2f ld [hl], a ld hl, $cda9 - ld de, $5ad6 + ld de, BlkPacket_9ad6 ret ; 875c Function875c: ; 875c - ld hl, $5c76 - ld de, $5a86 + ld hl, PalPacket_9c76 + ld de, BlkPacket_9a86 ret ; 8763 Function8763: ; 8763 - ld hl, $5ce6 + ld hl, PalPacket_9ce6 ld de, $cda9 ld bc, $0010 call CopyBytes @@ -163,7 +163,7 @@ Function8763: ; 8763 ld h, $0 add hl, hl add hl, hl - ld de, $68be + ld de, Palettes_a8be add hl, de ld a, [hli] ld [$cdac], a @@ -185,18 +185,18 @@ Function8763: ; 8763 ld a, [hl] ld [$cdb5], a ld hl, $cda9 - ld de, $5ac6 + ld de, BlkPacket_9ac6 ret ; 87ab Function87ab: ; 87ab - ld hl, $5c56 + ld hl, PalPacket_9c56 ld de, $cdaa ret ; 87b2 Function87b2: ; 87b2 - ld hl, $5ce6 + ld hl, PalPacket_9ce6 ld de, $cda9 ld bc, $0010 call CopyBytes @@ -219,12 +219,12 @@ Function87b2: ; 87b2 ld a, [hl] ld [$cdb5], a ld hl, $cda9 - ld de, $5ae6 + ld de, BlkPacket_9ae6 ret ; 87e9 Function87e9: ; 87e9 - ld hl, $5ce6 + ld hl, PalPacket_9ce6 ld de, $cda9 ld bc, $0010 call CopyBytes @@ -248,18 +248,18 @@ Function87e9: ; 87e9 ld a, [hl] ld [$cdb5], a ld hl, $cda9 - ld de, $5ae6 + ld de, BlkPacket_9ae6 ret ; 8823 Function8823: ; 8823 call Function87b2 - ld de, $5af6 + ld de, BlkPacket_9af6 ret ; 882a Function882a: ; 882a - ld hl, $5ce6 + ld hl, PalPacket_9ce6 ld de, $cda9 ld bc, $0010 call CopyBytes @@ -272,37 +272,37 @@ Function882a: ; 882a inc hl ld [hl], $19 ld hl, $cda9 - ld de, $5a86 + ld de, BlkPacket_9a86 ret ; 884b Function884b: ; 884b - ld hl, $5c36 - ld de, $5a86 + ld hl, PalPacket_9c36 + ld de, BlkPacket_9a86 ret ; 8852 Function8852: ; 8852 - ld hl, $5c96 - ld de, $5b06 + ld hl, PalPacket_9c96 + ld de, BlkPacket_9b06 ret ; 8859 Function8859: ; 8859 - ld hl, $5ca6 - ld de, $5b76 + ld hl, PalPacket_9ca6 + ld de, BlkPacket_9b76 ret ; 8860 Function8860: ; 8860 - ld hl, $5cb6 - ld de, $5a86 + ld hl, PalPacket_9cb6 + ld de, BlkPacket_9a86 ret ; 8867 Function8867: ; 8867 - ld b, $0 - ld hl, $4878 + ld b, 0 + ld hl, Unknown_8878 add hl, bc add hl, bc add hl, bc @@ -317,47 +317,51 @@ Function8867: ; 8867 ret ; 8878 -INCBIN "baserom.gbc", $8878, $8884 - $8878 +Unknown_8878: ; 8878 + dw BlkPacket_9a86, PalPacket_9be6 + dw BlkPacket_9a96, PalPacket_9c06 + dw BlkPacket_9a86, PalPacket_9c16 +; 8884 Function8884: ; 8884 - ld hl, $5b96 - ld de, $5b56 + ld hl, PalPacket_9b96 + ld de, BlkPacket_9b56 ld a, $8 ld [SGBPredef], a ret ; 8890 Function8890: ; 8890 - ld hl, $5ba6 - ld de, $5b86 + ld hl, PalPacket_9ba6 + ld de, BlkPacket_9b86 ret ; 8897 Function8897: ; 8897 - ld hl, $5c46 - ld de, $5a86 + ld hl, PalPacket_9c46 + ld de, BlkPacket_9a86 ret ; 889e Function889e: ; 889e - ld hl, $5a86 + ld hl, BlkPacket_9a86 ld de, PlayerLightScreenCount ld bc, $0010 call CopyBytes - ld hl, $5bb6 - ld de, $5a86 + ld hl, PalPacket_9bb6 + ld de, BlkPacket_9a86 ret ; 88b1 Function88b1: ; 88b1 - ld hl, $5bd6 + ld hl, PalPacket_9bd6 ld de, $cda9 ld bc, $0010 call CopyBytes call Function8a0c ld hl, $cdaa ld [hld], a - ld de, $5a86 + ld de, BlkPacket_9a86 ld a, $9 ld [SGBPredef], a ret @@ -365,7 +369,7 @@ Function88b1: ; 88b1 Function88cd: ; 88cd push bc - ld hl, $5ce6 + ld hl, PalPacket_9ce6 ld de, $cda9 ld bc, $0010 call CopyBytes @@ -403,28 +407,28 @@ Function88cd: ; 88cd .asm_8913 ld hl, $cda9 - ld de, $5a86 + ld de, BlkPacket_9a86 ret ; 891a Function891a: ; 891a - ld hl, $5cb6 - ld de, $5a86 + ld hl, PalPacket_9cb6 + ld de, BlkPacket_9a86 ret ; 8921 Function8921: ; 8921 - ld hl, $5bc6 - ld de, $5a86 + ld hl, PalPacket_9bc6 + ld de, BlkPacket_9a86 ret ; 8928 Function8928: ; 8928 - ld hl, $5bd6 + ld hl, PalPacket_9bd6 ld de, $cda9 ld bc, $0010 call CopyBytes - ld hl, $5a86 + ld hl, BlkPacket_9a86 ld de, $cdb9 ld bc, $0010 call CopyBytes @@ -450,24 +454,24 @@ Function8928: ; 8928 ; 8969 Function8969: ; 8969 - ld hl, $5ce6 + ld hl, PalPacket_9ce6 ld de, $cda9 ld bc, $0010 call CopyBytes ld a, [CurPartySpecies] ld l, a - ld h, $0 + ld h, 0 add hl, hl add hl, hl add hl, hl - ld de, $68ce + ld de, Palettes_a8ce add hl, de ld a, [$cf65] - and $3 + and 3 sla a sla a ld c, a - ld b, $0 + ld b, 0 add hl, bc ld a, [hli] ld [$cdac], a @@ -478,18 +482,18 @@ Function8969: ; 8969 ld a, [hl] ld [$cdaf], a ld hl, $cda9 - ld de, $5a86 + ld de, BlkPacket_9a86 ret ; 89a6 Function89a6: ; 89a6 - ld hl, $5cd6 - ld de, $5a86 + ld hl, PalPacket_9cd6 + ld de, BlkPacket_9a86 ret ; 89ad Function89ad: ; 89ad - ld hl, $5ce6 + ld hl, PalPacket_9ce6 ld de, $cda9 ld bc, $0010 call CopyBytes @@ -505,18 +509,18 @@ Function89ad: ; 89ad ld a, [hl] ld [$cdaf], a ld hl, $cda9 - ld de, $5a86 + ld de, BlkPacket_9a86 ret ; 89d9 Function89d9: ; 89d9 - ld hl, $5cc6 - ld de, $5a86 + ld hl, PalPacket_9cc6 + ld de, BlkPacket_9a86 ret ; 89e0 Function89e0: ; 89e0 - ld hl, $5ce6 + ld hl, PalPacket_9ce6 ld de, $cda9 ld bc, $0010 call CopyBytes @@ -532,7 +536,7 @@ Function89e0: ; 89e0 ld a, [hl] ld [$cdaf], a ld hl, $cda9 - ld de, $5a86 + ld de, BlkPacket_9a86 ret ; 8a0c @@ -557,8 +561,8 @@ Function8a0c: ; 8a0c jr z, .asm_8a42 ld a, [MapGroup] ld e, a - ld d, $0 - ld hl, $4a45 + ld d, 0 + ld hl, Unknown_8a45 add hl, de ld a, [hl] ret @@ -580,7 +584,35 @@ Function8a0c: ; 8a0c ret ; 8a45 -INCBIN "baserom.gbc", $8a45, $8a60 - $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 +; 8a60 Function8a60: ; 8a60 push de |