summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm34
1 files changed, 7 insertions, 27 deletions
diff --git a/main.asm b/main.asm
index d7379749..3fda5410 100644
--- a/main.asm
+++ b/main.asm
@@ -346,32 +346,12 @@ INCLUDE "engine/pokemon/evolve.asm"
SECTION "bank11", ROMX
-FruitTreeScript::
- dr $44000, $440c8
+INCLUDE "engine/events/fruit_trees.asm"
INCLUDE "engine/battle/ai/move.asm"
INCLUDE "engine/pokedex/pokedex_2.asm"
-PlayBattleMusic::
- dr $44556, $445f2
-ClearBattleRAM::
- dr $445f2, $44648
-PlaceGraphic::
- dr $44648, $44679
-SendMailToPC::
- dr $44679, $4475f
-CheckPokeMail::
- dr $4475f, $447d7
-GivePokeMail::
- dr $447d7, $44830
-BackupPartyMonMail::
- dr $44830, $44850
-RestorePartyMonMail::
- dr $44850, $44870
-DeletePartyMonMail::
- dr $44870, $4488c
-IsAnyMonHoldingMail::
- dr $4488c, $448ab
-_PlayerMailBoxMenu::
- dr $448ab, $44aa2
+INCLUDE "engine/battle/start_battle.asm"
+INCLUDE "engine/gfx/place_graphic.asm"
+INCLUDE "engine/pokemon/mail.asm"
SECTION "bank14", ROMX
@@ -896,10 +876,10 @@ InitMysteryGiftLayout::
dr $fcfb2, $fde20
-SECTION "bank40", ROMX
+SECTION "Standard Scripts", ROMX
-StdScripts::
- dr $100000, $10110c
+INCLUDE "engine/events/std_scripts.asm"
+INCLUDE "data/text/std_text.asm"
INCLUDE "data/text/battle.asm"