diff options
| author | yenatch <yenatch@gmail.com> | 2016-01-29 01:00:48 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2016-01-29 01:00:48 -0500 |
| commit | 11173a3807bde4e2d5b681717258b5b14f5f2d43 (patch) | |
| tree | 8e1692fe02b30ceeb2d797c001e0594175e29b78 /constants/map_constants.asm | |
| parent | 289d3dea86b82c4ce7eb7268ef33980688306587 (diff) | |
| parent | 5322b56a8357e5e5a8847f3329b52faa3f7016d8 (diff) | |
Merge pull request #333 from PikalaxALT/master
Split base stats, rearrange wram.asm, naming screen
Diffstat (limited to 'constants/map_constants.asm')
| -rw-r--r-- | constants/map_constants.asm | 61 |
1 files changed, 31 insertions, 30 deletions
diff --git a/constants/map_constants.asm b/constants/map_constants.asm index ede44c546..bedcf29dd 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -668,36 +668,37 @@ EMOTE_OBJECT EQU 7 ; fruit trees const_value SET 1 - const FRUITTREE_ROUTE_29 - const FRUITTREE_ROUTE_30_1 - const FRUITTREE_ROUTE_38 - const FRUITTREE_ROUTE_46_1 - const FRUITTREE_ROUTE_30_2 - const FRUITTREE_ROUTE_33 - const FRUITTREE_ROUTE_31 - const FRUITTREE_ROUTE_43 - const FRUITTREE_VIOLET_CITY - const FRUITTREE_ROUTE_46_2 - const FRUITTREE_ROUTE_35 - const FRUITTREE_ROUTE_45 - const FRUITTREE_ROUTE_36 - const FRUITTREE_ROUTE_26 - const FRUITTREE_ROUTE_39 - const FRUITTREE_ROUTE_44 - const FRUITTREE_ROUTE_37_1 - const FRUITTREE_ROUTE_37_2 - const FRUITTREE_ROUTE_37_3 - const FRUITTREE_AZALEA_TOWN - const FRUITTREE_ROUTE_42_1 - const FRUITTREE_ROUTE_42_2 - const FRUITTREE_ROUTE_42_3 - const FRUITTREE_ROUTE_11 - const FRUITTREE_ROUTE_2 - const FRUITTREE_ROUTE_1 - const FRUITTREE_ROUTE_8 - const FRUITTREE_PEWTER_CITY_1 - const FRUITTREE_PEWTER_CITY_2 - const FRUITTREE_FUCHSIA_CITY + const FRUITTREE_ROUTE_29 ; 01 + const FRUITTREE_ROUTE_30_1 ; 02 + const FRUITTREE_ROUTE_38 ; 03 + const FRUITTREE_ROUTE_46_1 ; 04 + const FRUITTREE_ROUTE_30_2 ; 05 + const FRUITTREE_ROUTE_33 ; 06 + const FRUITTREE_ROUTE_31 ; 07 + const FRUITTREE_ROUTE_43 ; 08 + const FRUITTREE_VIOLET_CITY ; 09 + const FRUITTREE_ROUTE_46_2 ; 0a + const FRUITTREE_ROUTE_35 ; 0b + const FRUITTREE_ROUTE_45 ; 0c + const FRUITTREE_ROUTE_36 ; 0d + const FRUITTREE_ROUTE_26 ; 0e + const FRUITTREE_ROUTE_39 ; 0f + const FRUITTREE_ROUTE_44 ; 10 + const FRUITTREE_ROUTE_37_1 ; 11 + const FRUITTREE_ROUTE_37_2 ; 12 + const FRUITTREE_ROUTE_37_3 ; 13 + const FRUITTREE_AZALEA_TOWN ; 14 + const FRUITTREE_ROUTE_42_1 ; 15 + const FRUITTREE_ROUTE_42_2 ; 16 + const FRUITTREE_ROUTE_42_3 ; 17 + const FRUITTREE_ROUTE_11 ; 18 + const FRUITTREE_ROUTE_2 ; 19 + const FRUITTREE_ROUTE_1 ; 1a + const FRUITTREE_ROUTE_8 ; 1b + const FRUITTREE_PEWTER_CITY_1 ; 1c + const FRUITTREE_PEWTER_CITY_2 ; 1d + const FRUITTREE_FUCHSIA_CITY ; 1e +NUM_FRUIT_TREES EQU const_value +- 1 CMDQUEUE_TYPE EQU 0 CMDQUEUE_ADDR EQU 1 |