Some miscellaneous refactoring

4 files changed, 186 insertions, 0 deletions

diff --git a/data/debug/field_debug_entries.inc b/data/debug/field_debug_entries.inc
new file mode 100644
index 0000000..bc32ef1
--- /dev/null
+++ b/data/debug/field_debug_entries.inc
@@ -0,0 +1,129 @@
+; FieldDebug_Jumptable constants
+	const_def
+	const FIELDDEBUG_RESET                   ; 0
+	const FIELDDEBUG_CLOSE_MENU              ; 1
+	const FIELDDEBUG_FRAME_TYPE              ; 2
+	const FIELDDEBUG_MINIGAMES               ; 3
+	const FIELDDEBUG_CHANGE_TRANSPORTATION   ; 4
+	const FIELDDEBUG_CHANGE_TILESET          ; 5
+	const FIELDDEBUG_TOWN_MAP                ; 6
+	const FIELDDEBUG_SPRITE_VIEWER           ; 7
+	const FIELDDEBUG_NAME_PLAYER             ; 8
+	const FIELDDEBUG_TOOLGEAR                ; 9
+	const FIELDDEBUG_CLEAR_EVENT_FLAGS       ; $a
+	const FIELDDEBUG_HEAL_POKEMON            ; $b
+	const FIELDDEBUG_CABLE_CLUB              ; $c
+	const FIELDDEBUG_GO_TO_NEXT_PAGE         ; $d
+	const FIELDDEBUG_NPC_MOVEMENT_TEST       ; $e
+	const FIELDDEBUG_POKEMON_FOLLOWING       ; $f
+	const FIELDDEBUG_FOLLOW_NPC_TEST         ; $10
+	const FIELDDEBUG_WARP                    ; $11
+	const FIELDDEBUG_FIELD_CUT               ; $12
+	const FIELDDEBUG_CHECK_TILE              ; $13
+	const FIELDDEBUG_MOVE_TO_ROUTE1_ENTRANCE ; $14
+	const FIELDDEBUG_TOGGLE_NPC_MOVEMENT     ; $15
+	const FIELDDEBUG_MAP_VIEWER              ; $16
+	const FIELDDEBUG_ITEM_TEST               ; $17
+	const FIELDDEBUG_PC_MENU                 ; $18
+	const FIELDDEBUG_POKEMART_MENU           ; $19
+	const FIELDDEBUG_TELEPORT                ; $1a
+	const FIELDDEBUG_VRAM_VIEWER             ; $1b
+	const FIELDDEBUG_TRAINER_GEAR            ; $1c
+
+FieldDebug_MenuStrings:
+	db "りセット@"
+	db "とじる@"
+	db "わくせん@"
+	db "ゲーム@"
+	db "のりもの@"
+	db "セル@"
+	db "ちず@"
+	db "キャラ@"
+	db "なまえ@"
+	db "ツールギア@"
+	db "イべント@"
+	db "かいふく@"
+	db "つうしん@"
+	db "つぎ▶@"
+	db "アニメ@"
+	db "つれてく@"
+	db "つれてけ@"
+	db "ワープ@"
+	db "くさかり@"
+	db "あしもと@"
+	db "じどう@"
+	db "うごき@"
+	db "マッパー@"
+	db "アイテム@"
+	db "パソコン@"
+	db "ショップ@"
+	db "テレポ！@"
+	db "テスト@"
+	db "じっけん@"
+
+FieldDebug_Jumptable:
+	dw FieldDebug_Reset
+	dw FieldDebug_CloseMenu
+	dw FieldDebug_FrameType
+	dw FieldDebug_Minigames
+	dw FieldDebug_ChangeTransportation
+	dw FieldDebug_ChangeTileset
+	dw FieldDebug_TownMap
+	dw FieldDebug_SpriteViewer
+	dw FieldDebug_NamePlayer
+	dw FieldDebug_Toolgear
+	dw FieldDebug_ClearEventFlags
+	dw FieldDebug_HealPokemon
+	dw FieldDebug_CableClub
+	dw FieldDebug_GoToNextPage
+	dw FieldDebug_NPCMovementTest
+	dw FieldDebug_PokemonFollowing
+	dw FieldDebug_FollowNPCTest
+	dw FieldDebug_Warp
+	dw FieldDebug_FieldCut
+	dw FieldDebug_CheckTile
+	dw FieldDebug_MoveToRoute1Entrance
+	dw FieldDebug_ToggleNPCMovement
+	dw FieldDebug_OpenMapViewer
+	dw FieldDebug_ItemTest
+	dw FieldDebug_PCMenu
+	dw FieldDebug_PokemartMenu
+	dw FieldDebug_Teleport
+	dw FieldDebug_VRAMViewer
+	dw FieldDebug_TrainerGear
+
+FIELDDEBUG_NUM_PAGES EQU 3
+
+FieldDebug_Pages:
+; page 1
+	db 7    ; number of items
+	db FIELDDEBUG_GO_TO_NEXT_PAGE
+	db FIELDDEBUG_WARP
+	db FIELDDEBUG_SPRITE_VIEWER
+	db FIELDDEBUG_CHANGE_TRANSPORTATION
+	db FIELDDEBUG_TOOLGEAR
+	db FIELDDEBUG_PC_MENU
+	db FIELDDEBUG_CLOSE_MENU
+	db -1
+
+; page 2
+	db 7    ; number of items
+	db FIELDDEBUG_GO_TO_NEXT_PAGE
+	db FIELDDEBUG_POKEMART_MENU
+	db FIELDDEBUG_HEAL_POKEMON
+	db FIELDDEBUG_TRAINER_GEAR
+	db FIELDDEBUG_MINIGAMES
+	db FIELDDEBUG_MAP_VIEWER
+	db FIELDDEBUG_CLOSE_MENU
+	db -1
+
+; page 3
+	db 7    ; number of items
+	db FIELDDEBUG_GO_TO_NEXT_PAGE
+	db FIELDDEBUG_CLEAR_EVENT_FLAGS
+	db FIELDDEBUG_VRAM_VIEWER
+	db FIELDDEBUG_TELEPORT
+	db FIELDDEBUG_FOLLOW_NPC_TEST
+	db FIELDDEBUG_TOWN_MAP
+	db FIELDDEBUG_CLOSE_MENU
+	db -1
diff --git a/data/debug/field_debug_pokemart_items.inc b/data/debug/field_debug_pokemart_items.inc
new file mode 100644
index 0000000..c9be9c0
--- /dev/null
+++ b/data/debug/field_debug_pokemart_items.inc
@@ -0,0 +1,10 @@
+DebugMart_ItemList:
+	db ITEM_BICYCLE
+	db ITEM_MOON_STONE
+	db ITEM_ANTIDOTE
+	db ITEM_BURN_HEAL
+	db ITEM_MAX_POTION
+	db ITEM_HYPER_POTION
+	db ITEM_SUPER_POTION
+	db ITEM_POTION
+	db -1
diff --git a/data/debug/field_debug_usable_items_1.inc b/data/debug/field_debug_usable_items_1.inc
new file mode 100644
index 0000000..5115df4
--- /dev/null
+++ b/data/debug/field_debug_usable_items_1.inc
@@ -0,0 +1,38 @@
+ItemTest_UsableItems:
+	db ITEM_BURN_HEAL
+	db ITEM_ICE_HEAL
+	db ITEM_AWAKENING
+	db ITEM_PARLYZ_HEAL
+	db ITEM_FULL_RESTORE
+	db ITEM_MAX_POTION
+	db ITEM_HYPER_POTION
+	db ITEM_SUPER_POTION
+	db ITEM_POTION
+	db ITEM_ESCAPE_ROPE
+	db ITEM_REPEL
+	db ITEM_RARE_CANDY
+	db ITEM_X_ACCURACY
+	db ITEM_LEAF_STONE
+	db ITEM_23
+	db ITEM_NUGGET
+	db ITEM_POKE_DOLL
+	db ITEM_FULL_HEAL
+	db ITEM_REVIVE
+	db ITEM_MAX_REVIVE
+	db ITEM_SODA_POP
+	db ITEM_X_SPEED
+	db ITEM_X_SPECIAL
+	db ITEM_COIN_CASE
+	db ITEM_3C
+	db ITEM_SUPER_ROD
+	db ITEM_PP_UP
+	db ITEM_ELIXER
+	db ITEM_MYSTIC_PETAL
+	db ITEM_WHITE_FEATHER
+	db ITEM_CONFUSE_CLAW
+	db ITEM_SNAKESKIN
+	db ITEM_ELECTRIC_POUCH
+	db ITEM_TOXIC_NEEDLE
+	db ITEM_KINGS_ROCK
+	db ITEM_STRANGE_POWER
+	db -1
diff --git a/data/debug/field_debug_usable_items_2.inc b/data/debug/field_debug_usable_items_2.inc
new file mode 100644
index 0000000..46e66f2
--- /dev/null
+++ b/data/debug/field_debug_usable_items_2.inc
@@ -0,0 +1,9 @@
+ItemTest_UsableItems2:
+	db ITEM_BICYCLE
+	db ITEM_CARBOS
+	db ITEM_UP_GRADE
+	db ITEM_BIG_LEAF
+	db ITEM_SHARP_STONE
+	db ITEM_BLACK_FEATHER
+	db ITEM_SHARP_FANG
+	db -1