pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Keep more data/ INCLUDEs with relevant routines

Browse Source
This commit is contained in:
Rangi 2018-06-25 13:45:50 -04:00
parent 1caa50a647
commit 67152eab98
9 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/moves/effects.asm
View File

@ -1,3 +1,5 @@
INCLUDE "data/moves/effects_pointers.asm"
MoveEffects: ; used only for BANK(MoveEffects) MoveEffects: ; used only for BANK(MoveEffects)
NormalHit: NormalHit:

2
data/trainers/parties.asm
View File

@ -1,3 +1,5 @@
INCLUDE "data/trainers/party_pointers.asm"
Trainers: Trainers:
; Trainer data structure: ; Trainer data structure:
; - db "NAME@", TRAINERTYPE_* constant ; - db "NAME@", TRAINERTYPE_* constant

2
engine/battle/read_trainer_attributes.asm
View File

@ -62,3 +62,5 @@ GetTrainerAttributes:
ld a, [hl] ld a, [hl]
ld [wEnemyTrainerBaseReward], a ld [wEnemyTrainerBaseReward], a
ret ret
INCLUDE "data/trainers/attributes.asm"

2
engine/battle/read_trainer_dvs.asm
View File

@ -17,3 +17,5 @@ GetTrainerDVs:
pop hl pop hl
ret ret
INCLUDE "data/trainers/dvs.asm"

2
engine/battle/read_trainer_party.asm
View File

@ -387,3 +387,5 @@ Function39990:
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
pop de pop de
ret ret
INCLUDE "data/trainers/parties.asm"

2
engine/items/print_item_description.asm
View File

@ -28,3 +28,5 @@ PrintItemDescription:
ld d, [hl] ld d, [hl]
pop hl pop hl
jp PlaceString jp PlaceString
INCLUDE "data/items/descriptions.asm"

2
engine/pokedex/pokedex_2.asm
View File

@ -279,3 +279,5 @@ endr
ld e, l ld e, l
pop hl pop hl
ret ret
INCLUDE "data/pokemon/dex_entry_pointers.asm"

2
engine/printer/printer.asm
View File

@ -1,5 +1,3 @@
INCLUDE "engine/printer/printer_serial.asm"
SendScreenToPrinter: SendScreenToPrinter:
.loop .loop
call JoyTextDelay call JoyTextDelay

8
main.asm
View File

@ -117,10 +117,8 @@ INCLUDE "engine/events/prof_oaks_pc.asm"
INCLUDE "engine/overworld/decorations.asm" INCLUDE "engine/overworld/decorations.asm"
INCLUDE "engine/pokemon/level_up_happiness.asm" INCLUDE "engine/pokemon/level_up_happiness.asm"
INCLUDE "engine/battle/read_trainer_dvs.asm" INCLUDE "engine/battle/read_trainer_dvs.asm"
INCLUDE "data/trainers/dvs.asm"
INCLUDE "engine/battle/returntobattle_useball.asm" INCLUDE "engine/battle/returntobattle_useball.asm"
INCLUDE "engine/battle/consume_held_item.asm" INCLUDE "engine/battle/consume_held_item.asm"
INCLUDE "data/moves/effects_pointers.asm"
INCLUDE "data/moves/effects.asm" INCLUDE "data/moves/effects.asm"
INCLUDE "engine/events/kurt_selectquantity_interpretjoypad.asm" INCLUDE "engine/events/kurt_selectquantity_interpretjoypad.asm"
@ -162,10 +160,7 @@ SECTION "Enemy Trainers", ROMX
INCLUDE "engine/battle/ai/items.asm" INCLUDE "engine/battle/ai/items.asm"
INCLUDE "engine/battle/ai/scoring.asm" INCLUDE "engine/battle/ai/scoring.asm"
INCLUDE "engine/battle/read_trainer_attributes.asm" INCLUDE "engine/battle/read_trainer_attributes.asm"
INCLUDE "data/trainers/attributes.asm"
INCLUDE "engine/battle/read_trainer_party.asm" INCLUDE "engine/battle/read_trainer_party.asm"
INCLUDE "data/trainers/party_pointers.asm"
INCLUDE "data/trainers/parties.asm"
SECTION "Battle Core", ROMX SECTION "Battle Core", ROMX
@ -186,7 +181,6 @@ SECTION "bank11", ROMX
INCLUDE "engine/events/fruit_trees.asm" INCLUDE "engine/events/fruit_trees.asm"
INCLUDE "engine/battle/ai/move.asm" INCLUDE "engine/battle/ai/move.asm"
INCLUDE "engine/pokedex/pokedex_2.asm" INCLUDE "engine/pokedex/pokedex_2.asm"
INCLUDE "data/pokemon/dex_entry_pointers.asm"
INCLUDE "engine/pokemon/mail.asm" INCLUDE "engine/pokemon/mail.asm"
@ -287,6 +281,7 @@ INCLUDE "engine/menus/debug.asm"
SECTION "bank21", ROMX SECTION "bank21", ROMX
INCLUDE "engine/printer/printer_serial.asm"
INCLUDE "engine/printer/printer.asm" INCLUDE "engine/printer/printer.asm"
INCLUDE "gfx/battle_anims.asm" INCLUDE "gfx/battle_anims.asm"
INCLUDE "engine/events/halloffame.asm" INCLUDE "engine/events/halloffame.asm"
@ -569,7 +564,6 @@ SECTION "Miscellaneous Text", ROMX
INCLUDE "data/items/names.asm" INCLUDE "data/items/names.asm"
INCLUDE "engine/items/print_item_description.asm" INCLUDE "engine/items/print_item_description.asm"
INCLUDE "data/items/descriptions.asm"
INCLUDE "data/moves/names.asm" INCLUDE "data/moves/names.asm"
INCLUDE "engine/overworld/landmarks.asm" INCLUDE "engine/overworld/landmarks.asm"