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

Add subdirectories to data/ similar to pokecrystal

Browse source 
Top level text/ is now solely for the former text/maps/ files, and other files are in their respective subdirectories in data/.
This commit is contained in:
Rangi 2020-07-03 11:51:00 -04:00
parent c85050497c
commit b29e5ee203
564 changed files with 3511 additions and 3505 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engine/battle/animations.asm
View file

@ -649,7 +649,7 @@ DoSpecialEffectByAnimationId:
pop hl
ret
INCLUDE "data/move_animation_special_effects.asm"
INCLUDE "data/moves/animation_special_effects.asm"
DoBallTossSpecialEffects:
ld a, [wcf91]
@ -911,7 +911,7 @@ TailWhipAnimationUnused:
ld c, 20
jp DelayFrames
INCLUDE "data/move_animation_pointers.asm"
INCLUDE "data/moves/animation_special_effect_pointers.asm"
AnimationDelay10:
ld c, 10
@ -2208,7 +2208,7 @@ IsCryMove:
scf
ret
INCLUDE "data/move_sfx.asm"
INCLUDE "data/moves/sfx.asm"
CopyPicTiles:
ld a, [H_WHOSETURN]

2
engine/battle/battle_transitions.asm
View file

@ -151,7 +151,7 @@ GetBattleTransitionID_IsDungeonMap:
res 2, c
ret
INCLUDE "data/dungeon_maps.asm"
INCLUDE "data/maps/dungeon_maps.asm"
LoadBattleTransitionTile:
ld hl, vChars1 + $7f0

4
engine/battle/core.asm
View file

@ -3814,7 +3814,7 @@ DetermineExclamationPointTextNum:
pop bc
ret
INCLUDE "data/move_grammar.asm"
INCLUDE "data/moves/grammar.asm"
PrintMoveFailureText:
ld de, wPlayerMoveEffect
@ -5317,7 +5317,7 @@ AIGetTypeEffectiveness:
ld [wTypeEffectiveness], a ; store damage multiplier
ret
INCLUDE "data/type_effects.asm"
INCLUDE "data/types/type_matchups.asm"
; some tests that need to pass for a move to hit
MoveHitTest:

4
engine/battle/effects.asm
View file

@ -21,7 +21,7 @@ _JumpMoveEffect:
ld l, a
jp hl ; jump to special effect handler
INCLUDE "data/effects_pointers.asm"
INCLUDE "data/moves/effects_pointers.asm"
SleepEffect:
ld de, wEnemyMonStatus
@ -751,7 +751,7 @@ PrintStatText:
ld bc, $a
jp CopyData
INCLUDE "text/stat_names.asm"
INCLUDE "data/battle/stat_names.asm"
INCLUDE "data/battle/stat_modifiers.asm"

2
engine/battle/print_type.asm
View file

@ -49,4 +49,4 @@ PrintType_:
pop hl
jp PlaceString
INCLUDE "text/type_names.asm"
INCLUDE "data/types/names.asm"

2
engine/battle/save_trainer_name.asm
View file

@ -18,4 +18,4 @@ SaveTrainerName::
jr nz, .CopyCharacter
ret
INCLUDE "text/trainer_name_pointers.asm"
INCLUDE "data/trainers/name_pointers.asm"

12
engine/battle/trainer_ai.asm
View file

@ -273,19 +273,19 @@ ReadMove:
pop hl
ret
INCLUDE "data/trainer_move_choices.asm"
INCLUDE "data/trainers/move_choices.asm"
INCLUDE "data/trainer_pic_money_pointers.asm"
INCLUDE "data/trainers/pic_pointers_money.asm"
INCLUDE "text/trainer_names.asm"
INCLUDE "data/trainers/names.asm"
INCLUDE "engine/battle/misc.asm"
INCLUDE "engine/battle/read_trainer_party.asm"
INCLUDE "data/trainer_moves.asm"
INCLUDE "data/trainers/special_moves.asm"
INCLUDE "data/trainer_parties.asm"
INCLUDE "data/trainers/parties.asm"
TrainerAI:
and a
@ -319,7 +319,7 @@ TrainerAI:
call Random
jp hl
INCLUDE "data/trainer_ai_pointers.asm"
INCLUDE "data/trainers/ai_pointers.asm"
JugglerAI:
cp 25 percent + 1

2
engine/battle/wild_encounters.asm
View file

@ -101,4 +101,4 @@ TryDoWildEncounter:
xor a
ret
INCLUDE "data/wild_probabilities.asm"
INCLUDE "data/wild/probabilities.asm"

4
engine/events/hidden_items.asm
View file

@ -18,7 +18,7 @@ HiddenItems:
call GetItemName
tx_pre_jump FoundHiddenItemText
INCLUDE "data/hidden_item_coords.asm"
INCLUDE "data/events/hidden_item_coords.asm"
FoundHiddenItemText::
TX_FAR _FoundHiddenItemText
@ -118,7 +118,7 @@ HiddenCoins:
.done
jp PrintPredefTextID
INCLUDE "data/hidden_coins.asm"
INCLUDE "data/events/hidden_coins.asm"
FoundHiddenCoinsText::
TX_FAR _FoundHiddenCoinsText

2
engine/events/hidden_object_functions3.asm
View file

@ -36,7 +36,7 @@ PrintBookshelfText::
ld [$ffdb], a
jpba PrintCardKeyText
INCLUDE "data/bookshelf_tile_ids.asm"
INCLUDE "data/tilesets/bookshelf_tile_ids.asm"
IndigoPlateauStatues::
TX_ASM

2
engine/events/in_game_trades.asm
View file

@ -84,7 +84,7 @@ InGameTrade_GetMonName:
ld bc, NAME_LENGTH
jp CopyData
INCLUDE "data/trades.asm"
INCLUDE "data/events/trades.asm"
InGameTrade_DoTrade:
xor a ; NORMAL_PARTY_MENU

4
engine/events/prize_menu.asm
View file

@ -145,7 +145,7 @@ GetPrizeMenuId:
ld c, (1 << 7 | 2)
jp PrintBCDNumber
INCLUDE "data/prizes.asm"
INCLUDE "data/events/prizes.asm"
PrintPrizePrice:
coord hl, 11, 0
@ -303,4 +303,4 @@ GetPrizeMonLevel:
ld [wCurEnemyLVL], a
ret
INCLUDE "data/prize_mon_levels.asm"
INCLUDE "data/events/prize_mon_levels.asm"

2
engine/events/saffron_guards.asm
View file

@ -12,4 +12,4 @@ RemoveGuardDrink::
jr z, .drinkLoop
jpba RemoveItemByID
INCLUDE "data/guard_drink_items.asm"
INCLUDE "data/items/guard_drink_items.asm"

2
engine/events/set_blackout_map.asm
View file

@ -22,4 +22,4 @@ SetLastBlackoutMap:
pop hl
ret
INCLUDE "data/rest_house_maps.asm"
INCLUDE "data/maps/rest_house_maps.asm"

2
engine/events/vending_machine.asm
View file

@ -130,4 +130,4 @@ LoadVendingMachineItem:
ld [hVendingMachinePrice + 2], a
ret
INCLUDE "data/vending_prices.asm"
INCLUDE "data/items/vending_prices.asm"

4
engine/gfx/mon_icons.asm
View file

@ -162,7 +162,7 @@ LoadMonPartySpriteGfxWithLCDDisabled:
jr nz, .loop
jp EnableLCD
INCLUDE "data/mon_party_sprite_pointers.asm"
INCLUDE "data/icon_pointers.asm"
WriteMonPartySpriteOAMByPartyIndex:
; Write OAM blocks for the party mon in [hPartyMonIndex].
@ -278,7 +278,7 @@ GetPartyMonSpriteID:
srl a
ret
INCLUDE "data/mon_party_sprites.asm"
INCLUDE "data/pokemon/menu_icons.asm"
INC_FRAME_1 EQUS "0, $20"
INC_FRAME_2 EQUS "$20, $20"

8
engine/gfx/palettes.asm
View file

@ -632,10 +632,10 @@ CopySGBBorderTiles:
jr nz, .tileLoop
ret
INCLUDE "data/sgb_packets.asm"
INCLUDE "data/sgb/sgb_packets.asm"
INCLUDE "data/mon_palettes.asm"
INCLUDE "data/pokemon/palettes.asm"
INCLUDE "data/super_palettes.asm"
INCLUDE "data/sgb/sgb_palettes.asm"
INCLUDE "data/sgb_border.asm"
INCLUDE "data/sgb/sgb_border.asm"

8
engine/items/item_effects.asm
View file

@ -1901,7 +1901,7 @@ ItemUseGoodRod:
xor 1
jr RodResponse
INCLUDE "data/good_rod.asm"
INCLUDE "data/wild/good_rod.asm"
ItemUseSuperRod:
call FishingInit
@ -2686,7 +2686,7 @@ IsKeyItem_::
ld [wIsKeyItem], a
ret
INCLUDE "data/key_items.asm"
INCLUDE "data/items/key_items.asm"
SendNewMonToBox:
ld de, wNumInBox
@ -2881,7 +2881,7 @@ IsNextTileShoreOrWater:
and a
ret
INCLUDE "data/water_tilesets.asm"
INCLUDE "data/tilesets/water_tilesets.asm"
ReadSuperRodData:
; return e = 2 if no fish on this map
@ -2928,7 +2928,7 @@ ReadSuperRodData:
ld e, $1 ; $1 if there's a bite
ret
INCLUDE "data/super_rod.asm"
INCLUDE "data/wild/super_rod.asm"
; reloads map view and processes sprite data
; for items that cause the overworld to be displayed

2
engine/items/tm_prices.asm
View file

@ -22,4 +22,4 @@ GetMachinePrice::
ld [hItemPrice + 2], a
ret
INCLUDE "data/tm_prices.asm"
INCLUDE "data/items/tm_prices.asm"

2
engine/items/tms.asm
View file

@ -33,4 +33,4 @@ TMToMove:
ld [wd11e], a
ret
INCLUDE "data/tms.asm"
INCLUDE "data/moves/tmhm_moves.asm"

6
engine/items/town_map.asm
View file

@ -103,7 +103,7 @@ DisplayTownMap:
ld [wWhichTownMapLocation], a
jp .townMapLoop
INCLUDE "data/town_map_order.asm"
INCLUDE "data/maps/town_map_order.asm"
TownMapCursor:
INCBIN "gfx/town_map/town_map_cursor.1bpp"
@ -581,9 +581,9 @@ LoadTownMapEntry:
ld l, a
ret
INCLUDE "data/town_map_entries.asm"
INCLUDE "data/maps/town_map_entries.asm"
INCLUDE "text/map_names.asm"
INCLUDE "data/maps/names.asm"
MonNestIcon:
INCBIN "gfx/town_map/mon_nest_icon.1bpp"

4
engine/menus/naming_screen.asm
View file

@ -365,7 +365,7 @@ PrintAlphabet:
ld [H_AUTOBGTRANSFERENABLED], a
jp Delay3
INCLUDE "text/alphabets.asm"
INCLUDE "data/text/alphabets.asm"
PrintNicknameAndUnderscores:
call CalcStringLength
@ -435,7 +435,7 @@ DakutensAndHandakutens:
ld [wNamingScreenLetter], a
ret
INCLUDE "text/dakutens.asm"
INCLUDE "data/text/dakutens.asm"
; calculates the length of the string at wcf4b and stores it in c
CalcStringLength:

4
engine/menus/pokedex.asm
View file

@ -623,7 +623,7 @@ DrawTileLine:
pop bc
ret
INCLUDE "data/pokedex_entries.asm"
INCLUDE "data/pokemon/dex_entries.asm"
PokedexToIndex:
; converts the Pokédex number at wd11e to an index
@ -662,4 +662,4 @@ IndexToPokedex:
pop bc
ret
INCLUDE "data/pokedex_order.asm"
INCLUDE "data/pokemon/dex_order.asm"

4
engine/menus/start_sub_menus.asm
View file

@ -446,9 +446,9 @@ CannotGetOffHereText:
TX_FAR _CannotGetOffHereText
db "@"
INCLUDE "data/party_items.asm"
INCLUDE "data/items/use_party.asm"
INCLUDE "data/overworld_items.asm"
INCLUDE "data/items/use_overworld.asm"
StartMenu_TrainerInfo::
call GBPalWhiteOut

6
engine/movie/credits.asm
View file

@ -104,7 +104,7 @@ DisplayCreditsMon:
ld [rBGP], a
ret
INCLUDE "data/credit_mons.asm"
INCLUDE "data/credits/credits_mons.asm"
ScrollCreditsMonLeft:
ld h, b
@ -261,9 +261,9 @@ TheEndTextString:
db $60," ",$62," ",$64," ",$64," ",$66," ",$68,"@"
db $61," ",$63," ",$65," ",$65," ",$67," ",$69,"@"
INCLUDE "data/credits_order.asm"
INCLUDE "data/credits/credits_order.asm"
INCLUDE "text/credits_text.asm"
INCLUDE "data/credits/credits_text.asm"
TheEndGfx:
INCBIN "gfx/intro_credits/the_end.2bpp"

4
engine/movie/oak_speech/oak_speech2.asm
View file

@ -187,7 +187,7 @@ DisplayIntroNameTextBox:
.namestring
db "NAME@"
INCLUDE "text/player_names.asm"
INCLUDE "data/player_names.asm"
GetDefaultName:
; a = name index
@ -213,7 +213,7 @@ GetDefaultName:
ld bc, $14
jp CopyData
INCLUDE "text/player_names_list.asm"
INCLUDE "data/player_names_list.asm"
TextTerminator_6b20:
db "@"

2
engine/movie/titlescreen.asm → engine/movie/title.asm
View file

@ -382,7 +382,7 @@ CopyrightTextString:
next $60,$61,$62,$61,$63,$61,$64,$7F,$73,$74,$75,$76,$77,$78,$79,$7A,$7B ; ©'95.'96.'98 GAME FREAK inc.
db "@"
INCLUDE "data/title_mons.asm"
INCLUDE "data/pokemon/title_mons.asm"
; prints version text (red, blue)
PrintGameVersionOnTitleScreen:

0
engine/movie/titlescreen2.asm → engine/movie/title2.asm
View file

2
engine/overworld/cut.asm
View file

@ -248,4 +248,4 @@ ReplaceTreeTileBlock:
ld [hl], a
ret
INCLUDE "data/cut_tree_blocks.asm"
INCLUDE "data/tilesets/cut_tree_blocks.asm"

2
engine/overworld/doors.asm
View file

@ -25,4 +25,4 @@ IsPlayerStandingOnDoorTile:
and a
ret
INCLUDE "data/door_tile_ids.asm"
INCLUDE "data/tilesets/door_tile_ids.asm"

2
engine/overworld/hidden_objects.asm
View file

@ -130,4 +130,4 @@ CheckIfCoordsInFrontOfPlayerMatch:
ld [hCoordsInFrontOfPlayerMatch], a
ret
INCLUDE "data/hidden_objects.asm"
INCLUDE "data/events/hidden_objects.asm"

2
engine/overworld/ledges.asm
View file

@ -54,7 +54,7 @@ HandleLedges::
call PlaySound
ret
INCLUDE "data/ledge_tiles.asm"
INCLUDE "data/tilesets/ledge_tiles.asm"
LoadHoppingShadowOAM:
ld hl, vChars1 + $7f0

2
engine/overworld/map_sprites.asm
View file

@ -437,4 +437,4 @@ GetSplitMapSpriteSetID:
ld a, $01
ret
INCLUDE "data/sprite_sets.asm"
INCLUDE "data/maps/sprite_sets.asm"

2
engine/overworld/player_animations.asm
View file

@ -373,7 +373,7 @@ IsPlayerStandingOnWarpPadOrHole::
ld [wStandingOnWarpPadOrHole], a
ret
INCLUDE "data/warp_pad_hole_tile_ids.asm"
INCLUDE "data/tilesets/warp_pad_hole_tile_ids.asm"
FishingAnim:
ld c, 10

6
engine/overworld/player_state.asm
View file

@ -82,7 +82,7 @@ CheckForceBikeOrSurf::
ld [wWalkBikeSurfStateCopy], a
jp ForceBikeOrSurf
INCLUDE "data/force_bike_surf.asm"
INCLUDE "data/maps/force_bike_surf.asm"
IsPlayerFacingEdgeOfMap::
push hl
@ -176,7 +176,7 @@ IsWarpTileInFrontOfPlayer::
pop hl
ret
INCLUDE "data/warp_carpet_tile_ids.asm"
INCLUDE "data/tilesets/warp_carpet_tile_ids.asm"
IsSSAnneBowWarpTileInFrontOfPlayer:
ld a, [wTileInFrontOfPlayer]
@ -215,7 +215,7 @@ IsPlayerStandingOnDoorTileOrWarpTile::
pop hl
ret
INCLUDE "data/warp_tile_ids.asm"
INCLUDE "data/tilesets/warp_tile_ids.asm"
PrintSafariZoneSteps::
ld a, [wCurMap]

2
engine/overworld/special_warps.asm
View file

@ -146,4 +146,4 @@ LoadSpecialWarpData:
ld [wDestinationWarpID], a
ret
INCLUDE "data/special_warps.asm"
INCLUDE "data/maps/special_warps.asm"

4
engine/overworld/tilesets.asm
View file

@ -55,6 +55,6 @@ LoadTilesetHeader:
.done
ret
INCLUDE "data/dungeon_tilesets.asm"
INCLUDE "data/tilesets/dungeon_tilesets.asm"
INCLUDE "data/tileset_headers.asm"
INCLUDE "data/tilesets/tileset_headers.asm"

2
engine/overworld/wild_mons.asm
View file

@ -30,4 +30,4 @@ LoadWildData::
ld bc, $0014
jp CopyData
INCLUDE "data/wild_mons.asm"
INCLUDE "data/wild/grass_water.asm"

2
engine/pokemon/bills_pc.asm
View file

@ -376,7 +376,7 @@ KnowsHMMove::
and a
ret
INCLUDE "data/hm_moves.asm"
INCLUDE "data/moves/hm_moves.asm"
DisplayDepositWithdrawMenu:
coord hl, 9, 10

2
engine/pokemon/evos_moves.asm
View file

@ -510,4 +510,4 @@ WriteMonMoves_ShiftMoveData:
Evolution_FlagAction:
predef_jump FlagActionPredef
INCLUDE "data/evos_moves.asm"
INCLUDE "data/pokemon/evos_moves.asm"

2
engine/slots/slot_machine.asm
View file

@ -881,7 +881,7 @@ SlotMachineMap:
INCBIN "gfx/slots/slots.tilemap"
SlotMachineMapEnd:
INCLUDE "data/slot_machine_wheels.asm"
INCLUDE "data/events/slot_machine_wheels.asm"
SlotMachineTiles1:
IF DEF(_RED)