diff options
author | YamaArashi <shadow962@live.com> | 2016-06-11 17:30:20 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-11 17:30:20 -0700 |
commit | 7e12ca56a8d04d33f3945bb5b981c311fcdd44ef (patch) | |
tree | 8a61aee33d6b47e960dc71dbb89c096622bbdc95 /scripts/celadongamecorner.asm | |
parent | d8dae96f35222ababb9688ce2aed3292515f8ca2 (diff) | |
parent | 7f34e28f242ee4d0caba0bd96b040811dcb86c50 (diff) |
Merge pull request #133 from YamaArashi/master
Remove address comments
Diffstat (limited to 'scripts/celadongamecorner.asm')
-rwxr-xr-x | scripts/celadongamecorner.asm | 108 |
1 files changed, 54 insertions, 54 deletions
diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index de9a8e8d..0c4fd963 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -1,4 +1,4 @@ -CeladonGameCornerScript: ; 48bbd (12:4bbd) +CeladonGameCornerScript: call CeladonGameCornerScript_48bcf call CeladonGameCornerScript_48bec call EnableAutoTextBoxDrawing @@ -6,7 +6,7 @@ CeladonGameCornerScript: ; 48bbd (12:4bbd) ld a, [wCeladonGameCornerCurScript] jp CallFunctionInTable -CeladonGameCornerScript_48bcf: ; 48bcf (12:4bcf) +CeladonGameCornerScript_48bcf: ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] @@ -23,7 +23,7 @@ CeladonGameCornerScript_48bcf: ; 48bcf (12:4bcf) ld [wLuckySlotHiddenObjectIndex], a ret -CeladonGameCornerScript_48bec: ; 48bec (12:4bec) +CeladonGameCornerScript_48bec: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] @@ -35,22 +35,22 @@ CeladonGameCornerScript_48bec: ; 48bec (12:4bec) lb bc, 2, 8 predef_jump ReplaceTileBlock -CeladonGameCornerScript_48c07: ; 48c07 (12:4c07) +CeladonGameCornerScript_48c07: xor a ld [wJoyIgnore], a ld [wCeladonGameCornerCurScript], a ld [wCurMapScript], a ret -CeladonGameCornerScriptPointers: ; 48c12 (12:4c12) +CeladonGameCornerScriptPointers: dw CeladonGameCornerScript0 dw CeladonGameCornerScript1 dw CeladonGameCornerScript2 -CeladonGameCornerScript0: ; 48c18 (12:4c18) +CeladonGameCornerScript0: ret -CeladonGameCornerScript1: ; 48c19 (12:4c19) +CeladonGameCornerScript1: ld a, [wIsInBattle] cp $ff jp z, CeladonGameCornerScript_48c07 @@ -81,7 +81,7 @@ CeladonGameCornerScript1: ; 48c19 (12:4c19) ld [wCeladonGameCornerCurScript], a ret -MovementData_48c5a: ; 48c5a (12:4c5a) +MovementData_48c5a: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT @@ -92,7 +92,7 @@ MovementData_48c5a: ; 48c5a (12:4c5a) db NPC_MOVEMENT_RIGHT db $FF -MovementData_48c63: ; 48c63 (12:4c63) +MovementData_48c63: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT @@ -100,7 +100,7 @@ MovementData_48c63: ; 48c63 (12:4c63) db NPC_MOVEMENT_RIGHT db $FF -CeladonGameCornerScript2: ; 48c69 (12:4c69) +CeladonGameCornerScript2: ld a, [wd730] bit 0, a ret nz @@ -116,7 +116,7 @@ CeladonGameCornerScript2: ; 48c69 (12:4c69) ld [wCeladonGameCornerCurScript], a ret -CeladonGameCornerTextPointers: ; 48c8a (12:4c8a) +CeladonGameCornerTextPointers: dw CeladonGameCornerText1 dw CeladonGameCornerText2 dw CeladonGameCornerText3 @@ -131,11 +131,11 @@ CeladonGameCornerTextPointers: ; 48c8a (12:4c8a) dw CeladonGameCornerText12 dw CeladonGameCornerText13 -CeladonGameCornerText1: ; 48ca4 (12:4ca4) +CeladonGameCornerText1: TX_FAR _CeladonGameCornerText1 db "@" -CeladonGameCornerText2: ; 48ca9 (12:4ca9) +CeladonGameCornerText2: TX_ASM call CeladonGameCornerScript_48f1e ld hl, CeladonGameCornerText_48d22 @@ -192,39 +192,39 @@ CeladonGameCornerText2: ; 48ca9 (12:4ca9) call PrintText jp TextScriptEnd -CeladonGameCornerText_48d22: ; 48d22 (12:4d22) +CeladonGameCornerText_48d22: TX_FAR _CeladonGameCornerText_48d22 db "@" -CeladonGameCornerText_48d27: ; 48d27 (12:4d27) +CeladonGameCornerText_48d27: TX_FAR _CeladonGameCornerText_48d27 db "@" -CeladonGameCornerText_48d2c: ; 48d2c (12:4d2c) +CeladonGameCornerText_48d2c: TX_FAR _CeladonGameCornerText_48d2c db "@" -CeladonGameCornerText_48d31: ; 48d31 (12:4d31) +CeladonGameCornerText_48d31: TX_FAR _CeladonGameCornerText_48d31 db "@" -CeladonGameCornerText_48d36: ; 48d36 (12:4d36) +CeladonGameCornerText_48d36: TX_FAR _CeladonGameCornerText_48d36 db "@" -CeladonGameCornerText_48d3b: ; 48d3b (12:4d3b) +CeladonGameCornerText_48d3b: TX_FAR _CeladonGameCornerText_48d3b db "@" -CeladonGameCornerText3: ; 48d40 (12:4d40) +CeladonGameCornerText3: TX_FAR _CeladonGameCornerText3 db "@" -CeladonGameCornerText4: ; 48d45 (12:4d45) +CeladonGameCornerText4: TX_FAR _CeladonGameCornerText4 db "@" -CeladonGameCornerText5: ; 48d4a (12:4d4a) +CeladonGameCornerText5: TX_ASM CheckEvent EVENT_GOT_10_COINS jr nz, .asm_48d89 @@ -261,28 +261,28 @@ CeladonGameCornerText5: ; 48d4a (12:4d4a) call PrintText jp TextScriptEnd -CeladonGameCornerText_48d9c: ; 48d9c (12:4d9c) +CeladonGameCornerText_48d9c: TX_FAR _CeladonGameCornerText_48d9c db "@" -Received10CoinsText: ; 48da1 (12:4da1) +Received10CoinsText: TX_FAR _Received10CoinsText TX_SFX_ITEM db "@" -CeladonGameCornerText_48da7: ; 48da7 (12:4da7) +CeladonGameCornerText_48da7: TX_FAR _CeladonGameCornerText_48da7 db "@" -CeladonGameCornerText_48dac: ; 48dac (12:4dac) +CeladonGameCornerText_48dac: TX_FAR _CeladonGameCornerText_48dac db "@" -CeladonGameCornerText6: ; 48db1 (12:4db1) +CeladonGameCornerText6: TX_FAR _CeladonGameCornerText6 db "@" -CeladonGameCornerText7: ; 48db6 (12:4db6) +CeladonGameCornerText7: TX_ASM CheckEvent EVENT_BEAT_ERIKA ld hl, CeladonGameCornerText_48dca @@ -292,19 +292,19 @@ CeladonGameCornerText7: ; 48db6 (12:4db6) call PrintText jp TextScriptEnd -CeladonGameCornerText_48dca: ; 48dca (12:4dca) +CeladonGameCornerText_48dca: TX_FAR _CeladonGameCornerText_48dca db "@" -CeladonGameCornerText_48dcf: ; 48dcf (12:4dcf) +CeladonGameCornerText_48dcf: TX_FAR _CeladonGameCornerText_48dcf db "@" -CeladonGameCornerText8: ; 48dd4 (12:4dd4) +CeladonGameCornerText8: TX_FAR _CeladonGameCornerText8 db "@" -CeladonGameCornerText9: ; 48dd9 (12:4dd9) +CeladonGameCornerText9: TX_ASM CheckEvent EVENT_GOT_20_COINS_2 jr nz, .asm_48e13 @@ -339,24 +339,24 @@ CeladonGameCornerText9: ; 48dd9 (12:4dd9) call PrintText jp TextScriptEnd -CeladonGameCornerText_48e26: ; 48e26 (12:4e26) +CeladonGameCornerText_48e26: TX_FAR _CeladonGameCornerText_48e26 db "@" -Received20CoinsText: ; 48e2b (12:4e2b) +Received20CoinsText: TX_FAR _Received20CoinsText TX_SFX_ITEM db "@" -CeladonGameCornerText_48e31: ; 48e31 (12:4e31) +CeladonGameCornerText_48e31: TX_FAR _CeladonGameCornerText_48e31 db "@" -CeladonGameCornerText_48e36: ; 48e36 (12:4e36) +CeladonGameCornerText_48e36: TX_FAR _CeladonGameCornerText_48e36 db "@" -CeladonGameCornerText10: ; 48e3b (12:4e3b) +CeladonGameCornerText10: TX_ASM CheckEvent EVENT_GOT_20_COINS jr nz, .asm_48e75 @@ -391,24 +391,24 @@ CeladonGameCornerText10: ; 48e3b (12:4e3b) call PrintText jp TextScriptEnd -CeladonGameCornerText_48e88: ; 48e88 (12:4e88) +CeladonGameCornerText_48e88: TX_FAR _CeladonGameCornerText_48e88 db "@" -CeladonGameCornerText_48e8d: ; 48e8d (12:4e8d) +CeladonGameCornerText_48e8d: TX_FAR _CeladonGameCornerText_48e8d TX_SFX_ITEM db "@" -CeladonGameCornerText_48e93: ; 48e93 (12:4e93) +CeladonGameCornerText_48e93: TX_FAR _CeladonGameCornerText_48e93 db "@" -CeladonGameCornerText_48e98: ; 48e98 (12:4e98) +CeladonGameCornerText_48e98: TX_FAR _CeladonGameCornerText_48e98 db "@" -CeladonGameCornerText11: ; 48e9d (12:4e9d) +CeladonGameCornerText11: TX_ASM ld hl, CeladonGameCornerText_48ece call PrintText @@ -430,19 +430,19 @@ CeladonGameCornerText11: ; 48e9d (12:4e9d) ld [wCeladonGameCornerCurScript], a jp TextScriptEnd -CeladonGameCornerText_48ece: ; 48ece (12:4ece) +CeladonGameCornerText_48ece: TX_FAR _CeladonGameCornerText_48ece db "@" -CeladonGameCornerText_48ed3: ; 48ed3 (12:4ed3) +CeladonGameCornerText_48ed3: TX_FAR _CeladonGameCornerText_48ed3 db "@" -CeladonGameCornerText13: ; 48ed8 (12:4ed8) +CeladonGameCornerText13: TX_FAR _CeladonGameCornerText_48ed8 db "@" -CeladonGameCornerText12: ; 48edd (12:4edd) +CeladonGameCornerText12: TX_ASM ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a @@ -459,7 +459,7 @@ CeladonGameCornerText12: ; 48edd (12:4edd) predef ReplaceTileBlock jp TextScriptEnd -CeladonGameCornerText_48f09: ; 48f09 (12:4f09) +CeladonGameCornerText_48f09: TX_FAR _CeladonGameCornerText_48f09 TX_ASM ld a, SFX_SWITCH @@ -467,11 +467,11 @@ CeladonGameCornerText_48f09: ; 48f09 (12:4f09) call WaitForSoundToFinish jp TextScriptEnd -CeladonGameCornerText_48f19: ; 48f19 (12:4f19) +CeladonGameCornerText_48f19: TX_FAR _CeladonGameCornerText_48f19 db "@" -CeladonGameCornerScript_48f1e: ; 48f1e (12:4f1e) +CeladonGameCornerScript_48f1e: ld hl, wd730 set 6, [hl] coord hl, 11, 0 @@ -507,19 +507,19 @@ CeladonGameCornerScript_48f1e: ; 48f1e (12:4f1e) res 6, [hl] ret -GameCornerMoneyText: ; 48f7a (12:4f7a) +GameCornerMoneyText: db "MONEY@" -GameCornerCoinText: ; 48f80 (12:4f80) +GameCornerCoinText: db "COIN@" -GameCornerBlankText1: ; 48f85 (12:4f85) +GameCornerBlankText1: db " @" -GameCornerBlankText2: ; 48f8d (12:4f8d) +GameCornerBlankText2: db " @" -Has9990Coins: ; 48f95 (12:4f95) +Has9990Coins: ld a, $99 ld [hCoins], a ld a, $90 |