Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)
# Conflicts: # data/items/descriptions.asm # data/sprite_anims/framesets.asm # engine/crystal_colors.asm # engine/events/kurt.asm # engine/events/special.asm # engine/events/std_scripts.asm # engine/events_3.asm # engine/item_effects.asm # engine/namingscreen.asm # engine/scripting.asm # engine/stats_screen.asm # engine/trade_animation.asm # home/audio.asm # main.asm # maps/BattleTower1F.asm # maps/BattleTowerBattleRoom.asm # maps/BurnedTowerB1F.asm # maps/ElmsLab.asm # maps/GoldenrodDeptStore5F.asm # maps/GoldenrodUnderground.asm # maps/HallOfFame.asm # maps/MahoganyTown.asm # maps/ManiasHouse.asm # maps/MobileBattleRoom.asm # maps/MobileTradeRoomMobile.asm # maps/RadioTower2F.asm # maps/Route35NationalParkGate.asm # maps/Route36NationalParkGate.asm # maps/Route39Farmhouse.asm # tilesets/palette_maps.asm
This commit is contained in:
32
main.asm
32
main.asm
@@ -207,14 +207,6 @@ SECTION "bank13", ROMX
|
||||
|
||||
INCLUDE "engine/map_palettes.asm"
|
||||
INCLUDE "gfx/tilesets/palette_maps.asm"
|
||||
|
||||
; unreferenced
|
||||
; 0x4ce05
|
||||
rept 26
|
||||
db $06
|
||||
endr
|
||||
; 0x4ce1f
|
||||
|
||||
INCLUDE "data/collision_permissions.asm"
|
||||
INCLUDE "engine/routines/emptyallsrambanks.asm"
|
||||
INCLUDE "engine/routines/savemenu_copytilemapatonce.asm"
|
||||
@@ -270,20 +262,7 @@ INCLUDE "gfx/load_pics.asm"
|
||||
INCLUDE "engine/move_mon_wo_mail.asm"
|
||||
INCLUDE "data/pokemon/base_stats.asm"
|
||||
INCLUDE "data/pokemon/names.asm"
|
||||
|
||||
Unknown_53d84: ; unreferenced
|
||||
db $1a, $15
|
||||
db $33, $16
|
||||
db $4b, $17
|
||||
db $62, $18
|
||||
db $79, $19
|
||||
db $90, $1a
|
||||
db $a8, $1b
|
||||
db $c4, $1c
|
||||
db $e0, $1d
|
||||
db $f6, $1e
|
||||
db $ff, $1f
|
||||
db $ff, $20
|
||||
INCLUDE "data/unknown_table.asm"
|
||||
|
||||
UnknownEggPic:: ; 53d9c
|
||||
; Another egg pic. This is shifted up a few pixels.
|
||||
@@ -451,15 +430,6 @@ INCLUDE "gfx/pokemon/unown_frames.asm"
|
||||
SECTION "bank38", ROMX
|
||||
|
||||
INCLUDE "engine/events/print_unown_2.asm"
|
||||
|
||||
Unknown_e00ed:
|
||||
; Graphics for an unused Game Corner
|
||||
; game were meant to be here.
|
||||
|
||||
ret_e00ed: ; e00ed (38:40ed)
|
||||
; How many coins?
|
||||
ret
|
||||
|
||||
INCLUDE "engine/card_flip.asm"
|
||||
INCLUDE "engine/unown_puzzle.asm"
|
||||
INCLUDE "engine/dummy_game.asm"
|
||||
|
Reference in New Issue
Block a user