diff options
| author | entrpntr <entrpntr@gmail.com> | 2020-05-09 23:28:22 -0400 |
|---|---|---|
| committer | entrpntr <entrpntr@gmail.com> | 2020-05-09 23:28:22 -0400 |
| commit | 6de1f826f638e5eb4f0177334c9682e1246fa9f5 (patch) | |
| tree | 726bff750e6beef6fb53dba24fe69e6c4fbf8ee2 /main.asm | |
| parent | c55af0b703ab2b00bb07623e3320146a59ec0453 (diff) | |
Add item/move/class names; update linkerscript and main.asm.
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 17 |
1 files changed, 7 insertions, 10 deletions
@@ -87,7 +87,7 @@ INCLUDE "engine/overworld/load_map_part.asm" INCLUDE "engine/overworld/spawn_points.asm" INCLUDE "engine/overworld/map_setup.asm" INCLUDE "data/tilesets.asm" -INCLUDE "engine/events/pokemon_pc.asm" +INCLUDE "engine/events/pokecenter_pc.asm" INCLUDE "engine/items/mart.asm" INCLUDE "engine/events/money.asm" INCLUDE "data/items/marts.asm" @@ -1033,23 +1033,20 @@ BikeShopPhoneCallerScript:: dr $104a80, $10614d -SECTION "bank6c", ROMX +SECTION "Names", ROMX -ItemNames:: - dr $1b0000, $1b0955 -TrainerClassNames:: - dr $1b0955, $1b0b74 +INCLUDE "data/items/names.asm" +INCLUDE "data/trainers/class_names.asm" INCLUDE "data/pokemon/names.asm" -MoveNames:: - dr $1b1574, $1b1ee1 +INCLUDE "data/moves/names.asm" -SECTION "bank6d", ROMX +SECTION "Move Descriptions", ROMX INCLUDE "data/moves/descriptions.asm" -SECTION "bank6e", ROMX +SECTION "Item Descriptions", ROMX INCLUDE "data/items/descriptions.asm" |