diff options
| author | yenatch <yenatch@gmail.com> | 2013-09-26 18:40:20 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2013-09-26 18:40:20 -0400 |
| commit | ad3293595d239ddfc22784d937de7f025999f859 (patch) | |
| tree | 92434cceb03ac620f7586abf1927ac8f87a9355f /engine | |
| parent | 73bd376cfd3fc39e30d0c06178e8f34f36604f84 (diff) | |
script commands if_greater_than and if_less_than were swapped
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/scripting.asm | 6 | ||||
| -rw-r--r-- | engine/std_scripts.asm | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engine/scripting.asm b/engine/scripting.asm index c2eeb30f4..b5b2ca707 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -9,8 +9,8 @@ ScriptCommandTable: ; 0x96cb1 dw Script_if_not_equal dw Script_iffalse dw Script_iftrue - dw Script_if_less_than dw Script_if_greater_than + dw Script_if_less_than dw Script_jumpstd dw Script_callstd dw Script_3callasm @@ -1734,7 +1734,7 @@ Script_if_not_equal: ; 0x9754b jr SkipTwoScriptBytes ; 0x97554 $40 ; 0x97556 -Script_if_less_than: ; 0x97556 +Script_if_greater_than: ; 0x97556 ; script command 0xa ; parameters: ; byte (SingleByteParam) @@ -1748,7 +1748,7 @@ Script_if_less_than: ; 0x97556 jr SkipTwoScriptBytes ; 0x97560 $34 ; 0x97562 -Script_if_greater_than: ; 0x97562 +Script_if_less_than: ; 0x97562 ; script command 0xb ; parameters: ; byte (SingleByteParam) diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index 7c927d044..22e2e9478 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -2298,8 +2298,8 @@ UnknownScript_0xbce7f: ; 0xbce7f faceplayer loadfont special $0059 - if_greater_than $32, UnknownScript_0xbce9a - if_greater_than $96, UnknownScript_0xbce93 + if_less_than $32, UnknownScript_0xbce9a + if_less_than $96, UnknownScript_0xbce93 3writetext $6c, $492a closetext loadmovesprites @@ -2497,7 +2497,7 @@ BillPhoneScript1: ; 0xbcfc5 checkcode $10 RAM2MEM $0 if_equal $0, .full - if_greater_than $6, .nearlyfull + if_less_than $6, .nearlyfull 3writetext BANK(BillPhoneNotFullText), BillPhoneNotFullText end |