diff options
| -rw-r--r-- | constants/map_constants.asm | 17 | ||||
| -rwxr-xr-x | engine/color.asm | 23 | ||||
| -rw-r--r-- | main.asm | 14 | ||||
| -rwxr-xr-x | predef/cgb.asm | 4 | ||||
| -rwxr-xr-x | predef/sgb.asm | 2 |
5 files changed, 35 insertions, 25 deletions
diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 1ed12662..b63c17be 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -244,10 +244,9 @@ MAP_NONE EQU 0 mapgroup GOLDENROD_DEPT_STORE_ROOF, 4, 8 ; 18 mapgroup GOLDENROD_GAME_CORNER, 7, 10 ; 19 mapgroup GOLDENROD_POKECENTER_1F, 4, 5 ; 20 - mapgroup GOLDENROD_POKECOM_CENTER_2F_MOBILE, 16, 16 ; 21 - mapgroup ILEX_FOREST_AZALEA_GATE, 4, 5 ; 22 - mapgroup ROUTE_34_ILEX_FOREST_GATE, 4, 5 ; 23 - mapgroup DAYCARE, 4, 5 ; 24 + mapgroup ILEX_FOREST_AZALEA_GATE, 4, 5 ; 21 + mapgroup ROUTE_34_ILEX_FOREST_GATE, 4, 5 ; 22 + mapgroup DAYCARE, 4, 5 ; 23 newgroup ; 12 @@ -357,8 +356,6 @@ MAP_NONE EQU 0 mapgroup TRADE_CENTER, 4, 5 ; 2 mapgroup COLOSSEUM, 4, 5 ; 3 mapgroup TIME_CAPSULE, 4, 5 ; 4 - mapgroup MOBILE_TRADE_ROOM_MOBILE, 4, 5 ; 5 - mapgroup MOBILE_BATTLE_ROOM, 4, 5 ; 6 newgroup ; 21 @@ -400,13 +397,6 @@ MAP_NONE EQU 0 mapgroup CIANWOOD_PHARMACY, 4, 4 ; 7 mapgroup CIANWOOD_CITY_PHOTO_STUDIO, 4, 4 ; 8 mapgroup CIANWOOD_LUGIA_SPEECH_HOUSE, 4, 4 ; 9 - mapgroup POKE_SEERS_HOUSE, 4, 4 ; 10 - mapgroup BATTLE_TOWER_1F, 5, 8 ; 11 - mapgroup BATTLE_TOWER_BATTLE_ROOM, 4, 4 ; 12 - mapgroup BATTLE_TOWER_ELEVATOR, 2, 2 ; 13 - mapgroup BATTLE_TOWER_HALLWAY, 2, 11 ; 14 - mapgroup ROUTE_40_BATTLE_TOWER_GATE, 4, 5 ; 15 - mapgroup BATTLE_TOWER_OUTSIDE, 14, 10 ; 16 newgroup ; 23 @@ -472,6 +462,7 @@ MAP_NONE EQU 0 mapgroup MR_POKEMONS_HOUSE, 4, 4 ; 10 mapgroup ROUTE_31_VIOLET_GATE, 4, 5 ; 11 +NUM_MAP_GROUPS EQU const_value ; elevator floors diff --git a/engine/color.asm b/engine/color.asm new file mode 100755 index 00000000..f5f27050 --- /dev/null +++ b/engine/color.asm @@ -0,0 +1,23 @@ +PALPACKET_LENGTH EQU $10 +INCLUDE "predef/sgb.asm" + +SHINY_ATK_BIT EQU 5 +SHINY_DEF_VAL EQU 10 +SHINY_SPD_VAL EQU 10 +SHINY_SPC_VAL EQU 10 + +CheckShininess: + dr $9052, $9072 +CheckContestMon: + dr $9072, $91e5 +ApplyMonOrTrainerPals: + dr $91e5, $9311 + +INCLUDE "predef/cgb.asm" + +Function9a94: + dr $9a94, $9cc0 +InitSGBBorder: + dr $9cc0, $9cfd +InitCGBPals:: ; 9cfd + dr $9cfd, $bc3a @@ -314,24 +314,14 @@ ScrollBGMapPalettes:: ; 804f (2:404f) INCLUDE "tilesets/palette_maps.asm" Unknown85d7: - rept 26 + rept NUM_MAP_GROUPS db PAL_BG_ROOF endr INCLUDE "engine/player_object.asm" INCLUDE "engine/sine.asm" INCLUDE "engine/predef.asm" - -Predef_LoadSGBLayout: - dr $8c2d, $9072 -CheckContestMon: - dr $9072, $91e5 -ApplyMonOrTrainerPals: - dr $91e5, $9cc0 -InitSGBBorder: - dr $9cc0, $9cfd -InitCGBPals:: ; 9cfd - dr $9cfd, $bc3a +INCLUDE "engine/color.asm" SECTION "bank3", ROMX, BANK[$3] CheckTime:: diff --git a/predef/cgb.asm b/predef/cgb.asm new file mode 100755 index 00000000..ed71d8be --- /dev/null +++ b/predef/cgb.asm @@ -0,0 +1,4 @@ +CheckCGB: + dr $9311, $9315 +Predef_LoadSGBLayoutCGB: + dr $9315, $9a94 diff --git a/predef/sgb.asm b/predef/sgb.asm new file mode 100755 index 00000000..c7a2b950 --- /dev/null +++ b/predef/sgb.asm @@ -0,0 +1,2 @@ +Predef_LoadSGBLayout: + dr $8c2d, $9052 |