From 023cfdbb051ea5184ebc7fa329db3ca43f1ca23e Mon Sep 17 00:00:00 2001 From: yenatch Date: Thu, 12 Jun 2014 18:32:42 -0700 Subject: Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared. --- engine/scripting.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/scripting.asm') diff --git a/engine/scripting.asm b/engine/scripting.asm index 43af00669..63c5ca1f2 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -2659,7 +2659,7 @@ Script_giveegg: ; 0x97968 ld [CurPartySpecies], a call GetScriptByte ld [CurPartyLevel], a - callba Functiondf8c + callba GiveEgg ret nc ld a, $2 ld [ScriptVar], a -- cgit v1.2.3 From 8639fcd29b0e929ec6cc236a209d0e07a495db14 Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 16 Jun 2014 11:20:01 -0700 Subject: Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will. --- engine/scripting.asm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'engine/scripting.asm') diff --git a/engine/scripting.asm b/engine/scripting.asm index 63c5ca1f2..2a978e0ea 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -1531,8 +1531,7 @@ Script_startbattle: ; 0x97436 ; script command 0x5f call Function2879 - ld a, PREDEF_START_BATTLE - call Predef + predef StartBattle ld a, [$d0ee] and $3f ld [ScriptVar], a -- cgit v1.2.3 From c2dba431884fdd9d61a90f6c3efd1876aa1cfa14 Mon Sep 17 00:00:00 2001 From: yenatch Date: Tue, 17 Jun 2014 11:58:11 -0700 Subject: Contest battle type and comment the battle menu. --- engine/scripting.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engine/scripting.asm') diff --git a/engine/scripting.asm b/engine/scripting.asm index 2a978e0ea..756192a0d 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -1544,7 +1544,7 @@ Script_catchtutorial: ; 0x97447 ; byte (SingleByteParam) call GetScriptByte - ld [$d230], a + ld [BattleType], a call Function2879 callba Function4e554 jp Script_reloadmap @@ -1572,8 +1572,8 @@ Script_returnafterbattle: ; 0x97459 ld a, [$d0ee] bit 7, a jr z, .asm_9748e ; 0x97481 $b - ld b, $24 - ld de, $4255 + ld b, BANK(UnknownScript_0x90255) + ld de, UnknownScript_0x90255 callba Function97c4f .asm_9748e jp Script_reloadmap -- cgit v1.2.3