diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-06 18:23:00 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-06 18:23:00 -0400 |
| commit | d7a01e92e9b571b91b956cda873de89f4bf8f5f5 (patch) | |
| tree | 2d59ffed7a49afebf6bfc7e7d5a11dfba1a40dca /predef/sgb.asm | |
| parent | 789ebc73042e07b5e50b3cc3c17ebd1df141f000 (diff) | |
Remaining layout constants
Diffstat (limited to 'predef/sgb.asm')
| -rw-r--r-- | predef/sgb.asm | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/predef/sgb.asm b/predef/sgb.asm index ca2fe24f3..65a09756d 100644 --- a/predef/sgb.asm +++ b/predef/sgb.asm @@ -32,13 +32,13 @@ Predef_LoadSGBLayout: ; 864c dw .SGB_SlotMachine dw .SGB06 dw .SGB07 - dw .SGB08 + dw .SGB_Diploma dw .SGB_MapPals - dw .SGB0a - dw .SGB0b + dw .SGB_PartyMenu + dw .SGB_Evolution dw .SGB0c dw .SGB0d - dw .SGB0e + dw .SGB_MoveList dw .SGB0f dw .SGB_PokedexSearchOption dw .SGB11 @@ -47,13 +47,13 @@ Predef_LoadSGBLayout: ; 864c dw .SGB_PackPals dw .SGB_TrainerCard dw .SGB_PokedexUnownMode - dw .SGB17 - dw .SGB18 + dw .SGB_BillsPC + dw .SGB_UnownPuzzle dw .SGB19 dw .SGB_PlayerOrMonFrontpicPals dw .SGB_TradeTube dw .SGB_TrainerOrMonFrontpicPals - dw .SGB1d + dw .SGB_MysteryGift dw .SGB1e ; 86ad @@ -138,7 +138,7 @@ Predef_LoadSGBLayout: ; 864c ret ; 873c -.SGB0e: ; 873c +.SGB_MoveList: ; 873c ld hl, PalPacket_9bd6 ld de, wSGBPals ld bc, $10 @@ -199,7 +199,7 @@ Predef_LoadSGBLayout: ; 864c ret ; 87ab -.SGB0a: ; 87ab +.SGB_PartyMenu: ; 87ab ld hl, PalPacket_9c56 ld de, wSGBPals + 1 ret @@ -233,7 +233,7 @@ Predef_LoadSGBLayout: ; 864c ret ; 87e9 -.SGB17: ; 87e9 +.SGB_BillsPC: ; 87e9 ld hl, PalPacket_9ce6 ld de, wSGBPals ld bc, $10 @@ -304,8 +304,8 @@ Predef_LoadSGBLayout: ; 864c ret ; 8860 -.SGB08: -.SGB1d: ; 8860 +.SGB_Diploma: +.SGB_MysteryGift: ; 8860 ld hl, PalPacket_9cb6 ld de, BlkPacket_9a86 ret @@ -336,7 +336,7 @@ endr .SGB0c: ; 8884 ld hl, PalPacket_9b96 ld de, BlkPacket_9b56 - ld a, SCGB_08 + ld a, SCGB_DIPLOMA ld [SGBPredef], a ret ; 8890 @@ -377,7 +377,7 @@ endr ret ; 88cd -.SGB0b: ; 88cd +.SGB_Evolution: ; 88cd push bc ld hl, PalPacket_9ce6 ld de, wSGBPals @@ -387,11 +387,14 @@ endr ld a, c and a jr z, .partymon + ; Egg ld hl, wSGBPals + 3 + ; RGB 7, 7, 7 ld [hl], $e7 inc hl ld [hl], $1c inc hl + ; RGB 2, 3, 3 ld [hl], $62 inc hl ld [hl], $c @@ -428,7 +431,7 @@ endr ret ; 8921 -.SGB18: ; 8921 +.SGB_UnownPuzzle: ; 8921 ld hl, PalPacket_9bc6 ld de, BlkPacket_9a86 ret |