Move more tables from engine/ to data/

This also splits the end of engine/battle/core.asm into engine/battle/effects.asm.
This commit is contained in:
Rangi 2020-06-23 17:50:50 -04:00
parent bdeb494add
commit 0a62d48df2
65 changed files with 2863 additions and 2825 deletions

View file

@ -89,7 +89,7 @@ SomeonesPCText: db "SOMEONE's PC@"
BillsPCText: db "BILL's PC@"
PlayersPCText: db "'s PC@"
OaksPCText: db "PROF.OAK's PC@"
PKMNLeaguePCText: db $4a, "LEAGUE@"
PKMNLeaguePCText: db "<pkmn>LEAGUE@"
LogOffPCText: db "LOG OFF@"
BillsPC_::
@ -339,9 +339,9 @@ DisplayMonListMenu:
ret
BillsPCMenuText:
db "WITHDRAW ", $4a
next "DEPOSIT ", $4a
next "RELEASE ", $4a
db "WITHDRAW <pkmn>"
next "DEPOSIT <pkmn>"
next "RELEASE <pkmn>"
next "CHANGE BOX"
next "SEE YA!"
db "@"

View file

@ -365,11 +365,7 @@ PrintAlphabet:
ld [H_AUTOBGTRANSFERENABLED], a
jp Delay3
LowerCaseAlphabet:
db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥UPPER CASE@"
UpperCaseAlphabet:
db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥lower case@"
INCLUDE "text/alphabets.asm"
PrintNicknameAndUnderscores:
call CalcStringLength
@ -439,21 +435,7 @@ DakutensAndHandakutens:
ld [wNamingScreenLetter], a
ret
Dakutens:
db "かが", "きぎ", "くぐ", "けげ", "こご"
db "さざ", "しじ", "すず", "せぜ", "そぞ"
db "ただ", "ちぢ", "つづ", "てで", "とど"
db "はば", "ひび", "ふぶ", "へべ", "ほぼ"
db "カガ", "キギ", "クグ", "ケゲ", "コゴ"
db "サザ", "シジ", "スズ", "セゼ", "ソゾ"
db "タダ", "チヂ", "ツヅ", "テデ", "トド"
db "ハバ", "ヒビ", "フブ", "へべ", "ホボ"
db $ff
Handakutens:
db "はぱ", "ひぴ", "ふぷ", "へぺ", "ほぽ"
db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ"
db $ff
INCLUDE "text/dakutens.asm"
; calculates the length of the string at wcf4b and stores it in c
CalcStringLength:

View file

@ -446,55 +446,9 @@ CannotGetOffHereText:
TX_FAR _CannotGetOffHereText
db "@"
; items which bring up the party menu when used
UsableItems_PartyMenu:
db MOON_STONE
db ANTIDOTE
db BURN_HEAL
db ICE_HEAL
db AWAKENING
db PARLYZ_HEAL
db FULL_RESTORE
db MAX_POTION
db HYPER_POTION
db SUPER_POTION
db POTION
db FIRE_STONE
db THUNDER_STONE
db WATER_STONE
db HP_UP
db PROTEIN
db IRON
db CARBOS
db CALCIUM
db RARE_CANDY
db LEAF_STONE
db FULL_HEAL
db REVIVE
db MAX_REVIVE
db FRESH_WATER
db SODA_POP
db LEMONADE
db X_ATTACK
db X_DEFEND
db X_SPEED
db X_SPECIAL
db PP_UP
db ETHER
db MAX_ETHER
db ELIXER
db MAX_ELIXER
db $ff
INCLUDE "data/party_items.asm"
; items which close the item menu when used
UsableItems_CloseMenu:
db ESCAPE_ROPE
db ITEMFINDER
db POKE_FLUTE
db OLD_ROD
db GOOD_ROD
db SUPER_ROD
db $ff
INCLUDE "data/overworld_items.asm"
StartMenu_TrainerInfo:
call GBPalWhiteOut

View file

@ -130,10 +130,4 @@ LoadVendingMachineItem:
ld [hVendingMachinePrice + 2], a
ret
VendingPrices:
db FRESH_WATER
money 200
db SODA_POP
money 300
db LEMONADE
money 350
INCLUDE "data/vending_prices.asm"