diff options
| author | dannye <33dannye@gmail.com> | 2020-05-20 19:40:33 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-05-20 20:02:53 -0500 |
| commit | 10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /scripts/GameCorner.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| download | pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip | |
Sync with pokered
Diffstat (limited to '')
| -rwxr-xr-x | scripts/GameCorner.asm (renamed from scripts/celadongamecorner.asm) | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/scripts/celadongamecorner.asm b/scripts/GameCorner.asm index 43aae927..e2b7690c 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/GameCorner.asm @@ -1,10 +1,10 @@ -CeladonGameCornerScript: +GameCorner_Script: call CeladonGameCornerScript_48bcf call CeladonGameCornerScript_48bec call EnableAutoTextBoxDrawing - ld hl, CeladonGameCornerScriptPointers - ld a, [wCeladonGameCornerCurScript] - jp JumpTable + ld hl, GameCorner_ScriptPointers + ld a, [wGameCornerCurScript] + jp CallFunctionInTable CeladonGameCornerScript_48bcf: ld hl, wCurrentMapScriptFlags @@ -38,11 +38,11 @@ CeladonGameCornerScript_48bec: CeladonGameCornerScript_48c07: xor a ld [wJoyIgnore], a - ld [wCeladonGameCornerCurScript], a + ld [wGameCornerCurScript], a ld [wCurMapScript], a ret -CeladonGameCornerScriptPointers: +GameCorner_ScriptPointers: dw CeladonGameCornerScript0 dw CeladonGameCornerScript1 dw CeladonGameCornerScript2 @@ -82,7 +82,7 @@ CeladonGameCornerScript1: ld [H_SPRITEINDEX], a call MoveSprite ld a, $2 - ld [wCeladonGameCornerCurScript], a + ld [wGameCornerCurScript], a ret MovementData_48c5a: @@ -117,10 +117,10 @@ CeladonGameCornerScript2: set 5, [hl] set 6, [hl] ld a, $0 - ld [wCeladonGameCornerCurScript], a + ld [wGameCornerCurScript], a ret -CeladonGameCornerTextPointers: +GameCorner_TextPointers: dw CeladonGameCornerText1 dw CeladonGameCornerText2 dw CeladonGameCornerText3 @@ -271,7 +271,7 @@ CeladonGameCornerText_48d9c: Received10CoinsText: TX_FAR _Received10CoinsText - TX_SFX_ITEM + TX_SFX_ITEM_1 db "@" CeladonGameCornerText_48da7: @@ -349,7 +349,8 @@ CeladonGameCornerText_48e26: Received20CoinsText: TX_FAR _Received20CoinsText - db $0B, "@" + TX_SFX_ITEM_1 + db "@" CeladonGameCornerText_48e31: TX_FAR _CeladonGameCornerText_48e31 @@ -400,7 +401,8 @@ CeladonGameCornerText_48e88: CeladonGameCornerText_48e8d: TX_FAR _CeladonGameCornerText_48e8d - db $0B, "@" + TX_SFX_ITEM_1 + db "@" CeladonGameCornerText_48e93: TX_FAR _CeladonGameCornerText_48e93 @@ -429,7 +431,7 @@ CeladonGameCornerText11: ld [hJoyPressed], a ld [hJoyReleased], a ld a, $1 - ld [wCeladonGameCornerCurScript], a + ld [wGameCornerCurScript], a jp TextScriptEnd CeladonGameCornerText_48ece: |