ref: 7c0e903c4821b3e7ded9b795661ed3608e023cc2
parent: 6f0b81504d6471afe7df6adae83791cc81933ca6
author: xCrystal <rgr.crystal@gmail.com>
date: Tue Jan 2 11:25:40 EST 2018
Clean up leftover code from main.asm
--- /dev/null
+++ b/data/unknown_table.asm
@@ -1,0 +1,13 @@
+Unreferenced_53d84:
+ 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
--- a/engine/card_flip.asm
+++ b/engine/card_flip.asm
@@ -2,6 +2,13 @@
CARDFLIP_LIGHT_ON EQU $f5
CARDFLIP_DECK_SIZE EQU 4 * 6
+; two labels below called from inside ./dummy_game.asm
+Unknown_e00ed: ; e00ed (38:40ed)
+; Graphics for an unused Game Corner
+; game were meant to be here.
+Ret_e00ed: ; e00ed (38:40ed)
+ ret
+
_CardFlip: ; e00ee (38:40ee)
ld hl, Options
set 4, [hl]
--- a/engine/dummy_game.asm
+++ b/engine/dummy_game.asm
@@ -77,7 +77,7 @@
ret
.ResetBoard:
- call ret_e00ed
+ call Ret_e00ed
jr nc, .proceed
ld hl, wJumptableIndex
set 7, [hl]
@@ -232,7 +232,7 @@
ld hl, wJumptableIndex
inc [hl]
.AskPlayAgain:
- call ret_e00ed
+ call Ret_e00ed
jr nc, .restart
ld hl, wJumptableIndex
set 7, [hl]
--- a/engine/sprite_anims.asm
+++ b/engine/sprite_anims.asm
@@ -404,7 +404,7 @@
ret
.ForUnusedCursor ; 8d46e (23:546e)
- callfar ret_e00ed
+ callfar Ret_e00ed
ret
.PokegearArrow ; 8d475 (23:5475)
--- a/main.asm
+++ b/main.asm
@@ -209,14 +209,6 @@
INCLUDE "engine/map_palettes.asm"
INCLUDE "tilesets/palette_maps.asm"
-
-; unused
-; 0x4ce05
-rept 26
- db $06
-endr
-; 0x4ce1f
-
INCLUDE "data/collision_permissions.asm"
INCLUDE "engine/routines/emptyallsrambanks.asm"
INCLUDE "engine/routines/savemenu_copytilemapatonce.asm"
@@ -272,21 +264,8 @@
INCLUDE "engine/move_mon_wo_mail.asm"
INCLUDE "data/pokemon/base_stats.asm"
INCLUDE "data/pokemon/names.asm"
+INCLUDE "data/unknown_table.asm"
-Unreferenced_53d84:
- 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
-
UnknownEggPic:: ; 53d9c
; Another egg pic. This is shifted up a few pixels.
INCBIN "gfx/unknown/unknown_egg.2bpp.lz"
@@ -450,15 +429,6 @@
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"
--- a/tilesets/palette_maps.asm
+++ b/tilesets/palette_maps.asm
@@ -128,3 +128,10 @@
TilesetBattleTowerOutsidePalMap: ; 0x4cd95
INCLUDE "tilesets/battle_tower_outside_palette_map.asm"
; 0x4ce05
+
+; unused
+; 0x4ce05
+rept 26
+ db $06
+endr
+; 0x4ce1f
--
⑨