thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-21 22:52:15 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move more tables from engine/ to data/

Browse source 
This also splits the end of engine/battle/core.asm into engine/battle/effects.asm.
This commit is contained in:
Rangi 2020-06-23 17:50:50 -04:00
parent bdeb494add
commit 0a62d48df2
65 changed files with 2863 additions and 2825 deletions
Download patch file Download diff file Expand all files Collapse all files

30
engine/battle/battle_transitions.asm
View file

@ -151,35 +151,7 @@ GetBattleTransitionID_IsDungeonMap:
res 2, c
ret
; GetBattleTransitionID_IsDungeonMap checks if wCurMap
; is equal to one of these maps
DungeonMaps1:
db VIRIDIAN_FOREST
db ROCK_TUNNEL_1F
db SEAFOAM_ISLANDS_1F
db ROCK_TUNNEL_B1F
db $FF
; GetBattleTransitionID_IsDungeonMap checks if wCurMap
; is in between or equal to each pair of maps
DungeonMaps2:
; all MT_MOON maps
db MT_MOON_1F
db MT_MOON_B2F
; all SS_ANNE maps, VICTORY_ROAD_1F, LANCES_ROOM, and HALL_OF_FAME
db SS_ANNE_1F
db HALL_OF_FAME
; all POKEMON_TOWER maps and Lavender Town buildings
db LAVENDER_POKECENTER
db LAVENDER_CUBONE_HOUSE
; SILPH_CO_[2-8]F, POKEMON_MANSION[2F-B1F], SAFARI_ZONE, and
; CERULEAN_CAVE maps, except for SILPH_CO_1F
db SILPH_CO_2F
db CERULEAN_CAVE_1F
db $FF
INCLUDE "data/dungeon_maps.asm"
LoadBattleTransitionTile:
ld hl, vChars1 + $7f0