ref: faa2d8f26e3a1a691a3319adebfd60977490415a
parent: 451dad420e89444ee1459c112b0d06376db4d84a
author: PikalaxALT <PikalaxALT@gmail.com>
date: Wed Nov 4 02:26:27 EST 2015
Reorganize BTTrainerClassGenders
--- a/constants/misc_constants.asm
+++ b/constants/misc_constants.asm
@@ -119,6 +119,9 @@
MOBILE_EVENT_OBJECT_GS_BALL EQU $b
+MALE EQU 0
+FEMALE EQU 1
+
PRINTNUM_MONEY_F EQU 5
PRINTNUM_RIGHTALIGN_F EQU 6
PRINTNUM_LEADINGZEROS_F EQU 7
--- a/misc/battle_tower_47.asm
+++ b/misc/battle_tower_47.asm
@@ -2889,7 +2889,7 @@
ld [rSVBK], a
ld hl, Palette_11d33a
ld de, Unkn1Pals
- ld bc, $0080
+ ld bc, 16 * 8
call CopyBytes
pop af
ld [rSVBK], a
@@ -2901,66 +2901,82 @@
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
+
RGB 31, 16, 31
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
+
RGB 23, 17, 31
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
+
RGB 31, 31, 31
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
+
RGB 31, 31, 31
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
+
RGB 31, 31, 31
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
+
RGB 31, 31, 31
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
+
RGB 31, 31, 31
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
+
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
+
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
+
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
+
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
+
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
+
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
+
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
+
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
+
; 11d3ba
Function11d3ba: ; 11d3ba
@@ -4159,17 +4175,72 @@
db $00, $00, $09, $00
BTTrainerClassGenders:
- db 0, 1, 1, 0, 0, 1 ; FALKNER, WHITNEY, BUGSY, MORTY, PRYCE, JASMINE
- db 0, 1, 0, 0, 1, 0 ; CHUCK, CLAIR, RIVAL1, POKEMON_PROF, WILL, CAL
- db 0, 1, 0, 0, 0, 1 ; BRUNO, KARN, KOGA, CHAMPION, BROCK, MISTY
- db 0, 0, 1, 0, 0, 0 ; LT_SURGE, SCIENTIST, ERIKA, YOUNGSTER, SCHOOLBOY, BIRD_KEEPER
- db 1, 1, 0, 1, 1, 0 ; LASS, JANINE, COOLTRAINERM, COOLTRAINERF, BEAUTY, POKEMANIAC
- db 0, 0, 1, 1, 1, 0 ; GRUNTM, GENTLEMAN, SKIER, TEACHER, SABRINA, BUG_CATCHER
- db 0, 0, 1, 0, 0, 0 ; FISHER, SWIMMERM, SWIMMERF, SAILOR, SUPER_NERD, RIVAL2
- db 0, 0, 0, 0, 0, 0 ; GUITARIST, HIKER, BIKER, BLAINE, BURGLAR, FIREBREATHER
- db 0, 0, 0, 0, 1, 0 ; JUGGLER, BLACKBELT_T, EXECUTIVEM, PSYCHIC_T, PICNICKER, CAMPER
- db 1, 0, 1, 0, 0, 1 ; EXECUTIVEF, SAGE, MEDIUM, BOARDER, POKEFANM, KIMONO_GIRL
- db 1, 1, 0, 0, 0, 1 ; TWINS, POKEFANF RED, BLUE, OFFICER, GRUNTF
+ db MALE ; FALKNER
+ db FEMALE ; WHITNEY
+ db FEMALE ; BUGSY
+ db MALE ; MORTY
+ db MALE ; PRYCE
+ db FEMALE ; JASMINE
+ db MALE ; CHUCK
+ db FEMALE ; CLAIR
+ db MALE ; RIVAL1
+ db MALE ; POKEMON_PROF
+ db FEMALE ; WILL
+ db MALE ; CAL
+ db MALE ; BRUNO
+ db FEMALE ; KAREN
+ db MALE ; KOGA
+ db MALE ; CHAMPION
+ db MALE ; BROCK
+ db FEMALE ; MISTY
+ db MALE ; LT_SURGE
+ db MALE ; SCIENTIST
+ db FEMALE ; ERIKA
+ db MALE ; YOUNGSTER
+ db MALE ; SCHOOLBOY
+ db MALE ; BIRD_KEEPER
+ db FEMALE ; LASS
+ db FEMALE ; JANINE
+ db MALE ; COOLTRAINERM
+ db FEMALE ; COOLTRAINERF
+ db FEMALE ; BEAUTY
+ db MALE ; POKEMANIAC
+ db MALE ; GRUNTM
+ db MALE ; GENTLEMAN
+ db FEMALE ; SKIER
+ db FEMALE ; TEACHER
+ db FEMALE ; SABRINA
+ db MALE ; BUG_CATCHER
+ db MALE ; FISHER
+ db MALE ; SWIMMERM
+ db FEMALE ; SWIMMERF
+ db MALE ; SAILOR
+ db MALE ; SUPER_NERD
+ db MALE ; RIVAL2
+ db MALE ; GUITARIST
+ db MALE ; HIKER
+ db MALE ; BIKER
+ db MALE ; BLAINE
+ db MALE ; BURGLAR
+ db MALE ; FIREBREATHER
+ db MALE ; JUGGLER
+ db MALE ; BLACKBELT_T
+ db MALE ; EXECUTIVEM
+ db MALE ; PSYCHIC_T
+ db FEMALE ; PICNICKER
+ db MALE ; CAMPER
+ db FEMALE ; EXECUTIVEF
+ db MALE ; SAGE
+ db FEMALE ; MEDIUM
+ db MALE ; BOARDER
+ db MALE ; POKEFANM
+ db FEMALE ; KIMONO_GIRL
+ db FEMALE ; TWINS
+ db FEMALE ; POKEFANF
+ db MALE ; RED
+ db MALE ; BLUE
+ db MALE ; OFFICER
+ db FEMALE ; GRUNTF
BTMaleTrainerTexts: ; 11f332
@@ -5006,12 +5077,12 @@
Function16c15c: ; 16c15c
hlcoord 0, 0, AttrMap
- ld bc, $0014
+ ld bc, SCREEN_WIDTH
xor a
call ByteFill
ld hl, Tilemap_16c79b
decoord 0, 1, AttrMap
- ld bc, $0154
+ ld bc, 17 * SCREEN_WIDTH
call CopyBytes
ret
; 16c173
@@ -5030,34 +5101,42 @@
RGB 04, 10, 20
RGB 16, 19, 25
RGB 25, 27, 29
+
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
+
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
+
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
+
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
+
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
+
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
+
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
+
; 16c943
Function16c943: ; 16c943
@@ -5644,6 +5723,7 @@
RGB 31, 31, 31
RGB 07, 07, 07
+
Unknown_16cfb1:
RGB 31, 31, 31
RGB 13, 09, 18
@@ -5650,11 +5730,13 @@
RGB 26, 21, 16
RGB 07, 07, 07
+
Unknown_16cfb9:
RGB 31, 31, 31
RGB 18, 05, 02
RGB 27, 11, 12
RGB 07, 07, 07
+
; 16cfc1
GFX_16cfc1: