Merge pull request #245 from yenatch/master

Picking off small incbins and static labels.

constants/misc_constants.asm

@@ -3,6 +3,9 @@
 PLAYER_NAME_LENGTH EQU 8
 PKMN_NAME_LENGTH EQU 11
 
+; boxes
+NUM_BOXES EQU 14
+
 
 ; predefs
 PREDEF_FLAG EQU $03

constants/trainer_constants.asm

@@ -1,3 +1,5 @@
+NUM_TRAINER_CLASSES EQU $44
+
 ; trainer groups
 FALKNER      EQU $01
 WHITNEY      EQU $02

engine/color.asm

@@ -1927,16 +1927,9 @@ Palettes_a8be: ; a8be
 Palettes_a8ca: ; a8ca
 	RGB 30, 26, 15
 	RGB 04, 17, 31
+; a8ce
 
-Palettes_a8ce: ; a8ce
-	RGB 30, 22, 17
-	RGB 16, 14, 19
-
-	RGB 30, 22, 17
-	RGB 16, 14, 19
-; a8d6
-
-; a8d6
+; a8ce
 INCLUDE "gfx/pics/palette_pointers.asm"
 ; b0ce
 

engine/scripting.asm

@@ -519,7 +519,7 @@ Script_interpretmenu2: ; 0x96f30
 ; script command 0x59
 
 	ld a, [ScriptBank]
-	ld hl, $1d81
+	ld hl, Function1d81
 	rst FarCall
 	ld a, [$cfa9]
 	jr nc, .asm_96f3d ; 0x96f3a $1
@@ -533,7 +533,7 @@ Script_interpretmenu: ; 0x96f41
 ; script command 0x58
 
 	ld a, [ScriptBank]
-	ld hl, $202a
+	ld hl, Function202a
 	rst FarCall
 	ld a, [$cf88]
 	jr nc, .asm_96f4e ; 0x96f4b $1
@@ -2284,7 +2284,7 @@ Script_stringtotext: ; 0x9777d
 	call GetScriptByte
 	ld d, a
 	ld a, [ScriptBank]
-	ld hl, $30d6
+	ld hl, CopyName1
 	rst FarCall
 	ld de, StringBuffer2
 	jp Unknown_976c0

gfx/pics.asm

@@ -3,19 +3,19 @@ INCLUDE "includes.asm"
 
 SECTION "Pic Pointers", ROMX, BANK[PIC_POINTERS]
 
-PicPointers:
+PicPointers::
 INCLUDE "gfx/pics/pic_pointers.asm"
 
 
 SECTION "Unown Pic Pointers", ROMX, BANK[UNOWN_PIC_POINTERS]
 
-UnownPicPointers:
+UnownPicPointers::
 INCLUDE "gfx/pics/unown_pic_pointers.asm"
 
 
 SECTION "Trainer Pic Pointers", ROMX, BANK[TRAINER_PIC_POINTERS]
 
-TrainerPicPointers:
+TrainerPicPointers::
 INCLUDE "gfx/pics/trainer_pic_pointers.asm"
 
 

gfx/pics/palette_pointers.asm

@@ -1,4 +1,11 @@
-PokemonPalettes: ; a8d6
+PokemonPalettes: ; a8ce
+
+; 000
+	RGB 30, 22, 17
+	RGB 16, 14, 19
+; 000 shiny
+	RGB 30, 22, 17
+	RGB 16, 14, 19
 
 BulbasaurPalette:       INCLUDE "gfx/pics/bulbasaur/normal.pal"
 BulbasaurShinyPalette:  INCLUDE "gfx/pics/bulbasaur/shiny.pal"

predef/sgb.asm

@@ -464,7 +464,7 @@ Function8969: ; 8969
 	add hl, hl
 	add hl, hl
 	add hl, hl
-	ld de, Palettes_a8ce
+	ld de, PokemonPalettes
 	add hl, de
 	ld a, [$cf65]
 	and 3

wram.asm

@@ -1880,7 +1880,13 @@ EventFlags:: ; da72
 	ds 250
 ; db6c
 
-SECTION "BoxNames",WRAMX[$db75],BANK[1]
+SECTION "Boxes",WRAMX[$db72],BANK[1]
+
+wCurBox:: ; db72
+	ds 1
+
+	ds 2
+
 ; 8 chars + $50
 Box1Name:: ; db75
 	ds 9