pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:pret/pokecrystal into scriptmacrorenaming

Browse Source
This commit is contained in:
PikalaxALT
2015-12-24 14:30:32 -05:00
parent 2a2222476a da87d2a929
commit 1df28a6beb
11 changed files with 3263 additions and 4158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -23,6 +23,7 @@ data/egg_moves_crystal.o \
data/evos_attacks_crystal.o \ data/evos_attacks_crystal.o \
data/pokedex/entries_crystal.o \ data/pokedex/entries_crystal.o \
misc/crystal_misc.o \ misc/crystal_misc.o \
text/common_text.o \
gfx/pics.o gfx/pics.o
crystal_obj := \ crystal_obj := \
@@ -38,6 +39,7 @@ data/egg_moves_crystal.o \
data/evos_attacks_crystal.o \ data/evos_attacks_crystal.o \
data/pokedex/entries_crystal.o \ data/pokedex/entries_crystal.o \
misc/crystal_misc.o \ misc/crystal_misc.o \
text/common_text.o \
gfx/pics.o gfx/pics.o
all_obj := $(crystal_obj) crystal11.o wram11.o all_obj := $(crystal_obj) crystal11.o wram11.o

2
macros/text.asm
View File

@@ -46,7 +46,7 @@ text_low: macro
endm endm
enum WAIT_BUTTON enum WAIT_BUTTON
text_waitsfx: macro text_waitbutton: macro
db WAIT_BUTTON db WAIT_BUTTON
endm endm

12
main.asm
View File

@@ -15397,18 +15397,6 @@ INCLUDE "text/phone/bill.asm"
INCLUDE "text/phone/elm.asm" INCLUDE "text/phone/elm.asm"
INCLUDE "text/phone/trainers1.asm" INCLUDE "text/phone/trainers1.asm"
SECTION "Common Text 2", ROMX, BANK[$6F]
INCLUDE "text/common_2.asm"
SECTION "Common Text 3", ROMX, BANK[$70]
INCLUDE "text/common_3.asm"
SECTION "Common Text 4", ROMX, BANK[$71]
INCLUDE "text/common_4.asm"
SECTION "bank72", ROMX, BANK[$72] SECTION "bank72", ROMX, BANK[$72]
ItemNames:: ItemNames::

2
maps/BattleTower1F.asm
View File

@@ -533,7 +533,7 @@ Text_PlayerGotFive: ; 0x9eb7e
text_from_ram StringBuffer4 text_from_ram StringBuffer4
text "!@" text "!@"
sound_item sound_item
text_waitsfx text_waitbutton
db "@" db "@"
Text_YourPackIsStuffedFull: ; 0x9eb94 Text_YourPackIsStuffedFull: ; 0x9eb94

6
text/battle.asm
View File

@@ -397,13 +397,9 @@ BattleText_StringBuffer1GrewToLevel: ; 0x80c9c
deciram CurPartyLevel, 1, 3 deciram CurPartyLevel, 1, 3
text "!@" text "!@"
sound_dex_fanfare_50_79 sound_dex_fanfare_50_79
db "@" db "@@"
; 0x80cb9 ; 0x80cb9
BattleText_0x80cb9: ; 0x80cb9
db "@"
; 0x80cba
BattleText_WildPkmnIsEating: ; 0x80cba BattleText_WildPkmnIsEating: ; 0x80cba
text "Wild @" text "Wild @"
text_from_ram EnemyMonNick text_from_ram EnemyMonNick

1836
text/common_1.asm Normal file
View File

File diff suppressed because it is too large Load Diff

2485
text/common_2.asm
View File

File diff suppressed because it is too large Load Diff

1038
text/common_3.asm
View File

File diff suppressed because it is too large Load Diff

1233
text/common_4.asm
View File

File diff suppressed because it is too large Load Diff

793
text/common_5.asm Normal file
View File

File diff suppressed because it is too large Load Diff

12
text/common_text.asm Normal file
View File

@@ -0,0 +1,12 @@
INCLUDE "includes.asm"
SECTION "Text 1", ROMX, BANK[$6F]
INCLUDE "text/common_1.asm"
SECTION "Text 2", ROMX, BANK[$70]
INCLUDE "text/common_2.asm"
INCLUDE "text/common_3.asm"
SECTION "Text 3", ROMX, BANK[$71]
INCLUDE "text/common_4.asm"
INCLUDE "text/common_5.asm"