pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Cleaner roammon and treemon data

Browse Source
This commit is contained in:
Rangi
2018-01-22 11:30:17 -05:00
parent c60f1331fe
commit 9e8f33d605
5 changed files with 80 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
constants/pokemon_data_constants.asm
View File

@@ -188,12 +188,23 @@ MONMENU_MENUOPTION EQU 1
NUM_MONMENU_ITEMS EQU 8
; wild data
NUM_GRASSMON EQU 7 ; data/wild/*_grass.asm table size
NUM_WATERMON EQU 3 ; data/wild/*_water.asm table size
GRASS_WILDDATA_LENGTH EQU (NUM_GRASSMON * 2 + 1) * 3 + 2
WATER_WILDDATA_LENGTH EQU (NUM_WATERMON * 2 + 1) * 1 + 2
NUM_ROAMMON_MAPS EQU 16 ; RoamMaps table size (see data/wild/roammon_maps.asm)
; treemon sets
; TreeMons indexes (see data/wild/treemons.asm)
const_def
const TREEMON_SET_CITY
const TREEMON_SET_CANYON
const TREEMON_SET_AZALEA
const TREEMON_SET_TOWN
const TREEMON_SET_ROUTE
const TREEMON_SET_KANTO
const TREEMON_SET_LAKE
@@ -208,26 +219,6 @@ NUM_TREEMON_SETS EQU const_value
const TREEMON_SCORE_RARE ; 2
; wild data
NUM_GRASSMON EQU 7 ; data/wild/*_grass.asm table size
NUM_WATERMON EQU 3 ; data/wild/*_water.asm table size
GRASS_WILDDATA_LENGTH EQU (NUM_GRASSMON * 2 + 1) * 3 + 2
WATER_WILDDATA_LENGTH EQU (NUM_WATERMON * 2 + 1) * 1 + 2
NUM_ROAMMON_MAPS EQU 16 ; RoamMaps table size (see data/wild/roammon_maps.asm)
; swarms
SWARM_DUNSPARCE EQU 0
SWARM_YANMA EQU 1
FISHSWARM_QWILFISH EQU 1
FISHSWARM_REMORAID EQU 2
; significant happiness values
BASE_HAPPINESS EQU 70
FRIEND_BALL_HAPPINESS EQU 200

76
constants/script_constants.asm
View File

@@ -115,6 +115,40 @@ NUM_PLAYER_EVENTS EQU const_value
const OBJECTTYPE_6
; command queue members
CMDQUEUE_TYPE EQU 0
CMDQUEUE_ADDR EQU 1
CMDQUEUE_03 EQU 3
CMDQUEUE_04 EQU 4
CMDQUEUE_05 EQU 5
CMDQUEUE_ENTRY_SIZE EQU 6
CMDQUEUE_CAPACITY EQU 4
; command queue types
CMDQUEUE_STONETABLE EQU 2
; elevfloor macro values
; ElevatorFloorNames indexes (see data/elevator_floors.asm)
const_def
const FLOOR_B4F
const FLOOR_B3F
const FLOOR_B2F
const FLOOR_B1F
const FLOOR_1F
const FLOOR_2F
const FLOOR_3F
const FLOOR_4F
const FLOOR_5F
const FLOOR_6F
const FLOOR_7F
const FLOOR_8F
const FLOOR_9F
const FLOOR_10F
const FLOOR_11F
const FLOOR_ROOF
; showemote arguments
; Emotes indexes (see data/sprites/emotes.asm)
const_def
@@ -132,7 +166,6 @@ NUM_PLAYER_EVENTS EQU const_value
const EMOTE_GRASS_RUSTLE ; 11
EMOTE_MEM EQU -1
; fruittree arguments
; FruitTreeItems indexes (see data/items/fruit_trees.asm)
const_value set 1
@@ -168,7 +201,6 @@ const_value set 1
const FRUITTREE_FUCHSIA_CITY ; 1e
NUM_FRUIT_TREES EQU const_value +- 1
; describedecoration arguments
; DescribeDecoration.JumpTable indexes (see engine/decorations.asm)
const_def
@@ -178,40 +210,18 @@ NUM_FRUIT_TREES EQU const_value +- 1
const DECODESC_BIG_DOLL ; 3
const DECODESC_CONSOLE ; 4
; elevfloor macro values
; ElevatorFloorNames indexes (see data/elevator_floors.asm)
; swarm arguments
; StoreSwarmMapIndices arguments
const_def
const FLOOR_B4F
const FLOOR_B3F
const FLOOR_B2F
const FLOOR_B1F
const FLOOR_1F
const FLOOR_2F
const FLOOR_3F
const FLOOR_4F
const FLOOR_5F
const FLOOR_6F
const FLOOR_7F
const FLOOR_8F
const FLOOR_9F
const FLOOR_10F
const FLOOR_11F
const FLOOR_ROOF
const SWARM_DUNSPARCE ; 0
const SWARM_YANMA ; 1
; command queue members
CMDQUEUE_TYPE EQU 0
CMDQUEUE_ADDR EQU 1
CMDQUEUE_03 EQU 3
CMDQUEUE_04 EQU 4
CMDQUEUE_05 EQU 5
CMDQUEUE_ENTRY_SIZE EQU 6
CMDQUEUE_CAPACITY EQU 4
; command queue types
CMDQUEUE_STONETABLE EQU 2
; Special_ActivateFishingSwarm writebyte arguments
const_def
const FISHSWARM_NONE ; 0
const FISHSWARM_QWILFISH ; 1
const FISHSWARM_REMORAID ; 2
; SpecialGameboyCheck return values
const_def