From fac958b280056922a1828b71a04d84a36e1e807a Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 20 Sep 2020 13:58:03 -0400 Subject: - Remove trailing whitespace - Indent with single tabs, not spaces - Colons after labels - Capitalize BANK, HIGH, and LOW - dbw BANK(X), X -> dba X --- engine/dumps/bank01.asm | 184 ++++++++++++++++++++++++------------------------ engine/dumps/bank02.asm | 84 +++++++++++----------- engine/dumps/bank03.asm | 118 +++++++++++++++---------------- 3 files changed, 193 insertions(+), 193 deletions(-) (limited to 'engine/dumps') diff --git a/engine/dumps/bank01.asm b/engine/dumps/bank01.asm index fd57ba1..3495b00 100755 --- a/engine/dumps/bank01.asm +++ b/engine/dumps/bank01.asm @@ -109,32 +109,32 @@ Table416b: Unknown41eb: ; 01:41eb db $00, $01, $02, $03 - + Unknown41ef: ; 01:41ef db $80, $81, $82, $83 - + Unknown41f3: ; 01:41f3 db $04, $05, $06, $07 - + Unknown41f7: ; 01:41f7 db $84, $85, $86, $87 - + Unknown41fb: ; 01:41fb db $08, $09, $0a, $0b - + Unknown41ff: ; 01:41ff db $88, $89, $8a, $8b - + Unknown4203: ; 01:4203 db $00, $00, $00, $00 db $08, $00, $08, $00 db $02, $08, $08, $03 - + Unknown420f: ; 01:420f db $00, $08, $20, $00 db $00, $20, $08, $08 db $22, $08, $00, $23 - + Table421b: ; 01:421b dw Unknown423b dw Unknown424b @@ -152,13 +152,13 @@ Table421b: ; 01:421b dw Unknown42cb dw Unknown42ab dw Unknown42cb - + Unknown423b: ; 01:423b db $00, $00, $00, $00 db $00, $08, $01, $00 db $08, $00, $02, $02 db $08, $08, $03, $03 - + Unknown424b: ; 01:424b db $00, $00, $80, $00 db $00, $08, $81, $00 @@ -170,49 +170,49 @@ Unknown425b: ; 01:425b db $00, $00, $81, $20 db $08, $08, $82, $22 db $08, $00, $83, $23 - + Unknown426b: ; 01:426b db $00, $00, $04, $00 db $00, $08, $05, $00 db $08, $00, $06, $02 db $08, $08, $07, $03 - + Unknown427b: ; 01:427b db $00, $00, $84, $00 db $00, $08, $85, $00 db $08, $00, $86, $02 db $08, $08, $87, $03 - + Unknown428b: ; 01:428b db $00, $08, $84, $20 db $00, $00, $85, $20 db $08, $08, $86, $22 db $08, $00, $87, $23 - + Unknown429b: ; 01:429b db $00, $00, $08, $00 db $00, $08, $09, $00 db $08, $00, $0a, $02 db $08, $08, $0b, $03 - + Unknown42ab: ; 01:42ab db $00, $08, $08, $20 db $00, $00, $09, $20 db $08, $08, $0a, $22 db $08, $00, $0b, $23 - + Unknown42bb: ; 01:42bb db $00, $00, $88, $00 db $00, $08, $89, $00 db $08, $00, $8a, $02 db $08, $08, $8b, $03 - + Unknown42cb: ; 01:42cb db $00, $08, $88, $20 db $00, $00, $89, $20 db $08, $08, $8a, $22 db $08, $00, $8b, $23 - + Function42db: ; 01:42db ld bc, wCmdQueue ld a, $01 @@ -256,7 +256,7 @@ Function42db: ; 01:42db ld h, [hl] ld l, a jp hl - + Table431d:: dw Function4333 dw Function439e @@ -264,14 +264,14 @@ Table431d:: dw Function4374 dw Function4374 dw Function43c9 - + Table4329:: dw Function4334 dw Function4452 dw Function4459 dw Function446c dw Function4495 - + Function4333: ; 01:4333 ret @@ -338,11 +338,11 @@ Function4366: ; 01:4366 Function4374: ; 01:4374 ld de, Table437a jp Function4358 - + Table437a: ; 01:437a dw Function437e dw Function439b - + Function437e: ; 01:437e call Function4341 ld hl, $000e @@ -360,14 +360,14 @@ Function437e: ; 01:437e ld hl, $0007 add hl, bc ld [hl], a - + Function439b: ; 01:439b jp Function4402 Function439e: ; 01:439e ld de, Table43a4 jp Function4358 - + Table43a4: ; 01:43a4 dw Function43a8 dw Function43c6 @@ -464,11 +464,11 @@ Function4402: ; 01:4402 Function4430: ; 01:4430 ld hl, Table4436 jp Function4358 - + Table4436: ; 01:4436 dw Function443a dw Function444f - + Function443a: ; 01:443a call Function4341 ld hl, $000b @@ -549,39 +549,39 @@ Function4495: ; 01:4495 add hl, bc ld [hl], a ret - + Table44ab: ; 01:44ab dw Unknown44b5 dw Unknown44b6 dw Unknown44c7 dw Unknown44d0 dw Unknown44e1 - + Unknown44b5: ; 01:44b5 db $00 - + Unknown44b6: ; 01:44b6 db $04, $00, $00, $00 db $00, $00, $08, $01 db $00, $08, $00, $02 db $00, $08, $08, $03, $00 - + Unknown44c7: ; 01:44c7 db $02, $00, $00, $00 db $00, $00, $08, $00, $20 - + Unknown44d0: ; 01:44d0 db $04, $00, $00, $00 db $00, $00, $08, $00 db $00, $08, $00, $00 db $00, $08, $08, $00, $00 - + Unknown44e1: ; 01:44e1 db $04, $00, $00, $00 db $40, $00, $08, $00 db $40, $08, $00, $00 db $40, $08, $08, $00, $40 - + Function44f2: ; 01:44f2 ld hl, $0008 add hl, bc @@ -605,7 +605,7 @@ Function44f2: ; 01:44f2 ld h, [hl] ld l, a jp hl - + Table4516:: dw Function486a dw Function47b8 @@ -627,13 +627,13 @@ Table4516:: dw Function4a05 dw Function4a8b dw Function4869 - + Function453e: ; 01:453e ld hl, $000a add hl, bc ld [hl], $02 ret - + Function4545: ; 01:4545 ld hl, $0005 add hl, bc @@ -644,7 +644,7 @@ Function4545: ; 01:4545 ld a, [hl] ld hl, Table4558 jp CallJumptable - + Table4558: ; 01:4558 dw Function4560 dw Function4567 @@ -729,7 +729,7 @@ Function45a0: ; 01:45a0 add hl, bc ld [hl], a ret - + Unknown45d0: ; 01:45d0 db $00, $0C, $04, $08 @@ -806,7 +806,7 @@ Function4636: ; 01:4636 res 7, [hl] and a ret - + Function4644: ; 01:4644 ld hl, $0005 add hl, bc @@ -860,7 +860,7 @@ Function4678: ; 01:4678 add hl, bc ld [hl], $ff ret - + Function468a: ; 01:468a and $0f ld hl, $0006 @@ -938,7 +938,7 @@ Function46e5: ; 01:46e5 ld a, [hli] ld h, [hl] ret - + Function46f9: ; 01:46f9 ld hl, $0006 add hl, bc @@ -950,10 +950,10 @@ Function46f9: ; 01:46f9 add hl, de ld a, [hl] ret - + Table4708: ; 01:4708 db $00, $01, $10 - + Table470b: ; 01:470b db $01, $00, $ff db $10, $01, $ff @@ -1068,7 +1068,7 @@ Function47b8: ; 01:47b8 and $1f ld hl, Table47c5 jp CallJumptable - + Table47c5: ; 01:47c5 dw Function47fb dw Function4812 @@ -1205,7 +1205,7 @@ Function486a: ; 01:486a add hl, bc ld [hl], a ret - + Function488c: ; 01:488c call Function468a call Function771e @@ -1262,7 +1262,7 @@ Function48da: ; 01:48da add hl, bc ld [hl], a jp Function4b65 - + Function48f5: ; 01:48f5 ld hl, $0008 add hl, bc @@ -1368,11 +1368,11 @@ Function497a: ; 01:497a add hl, bc ld [hl], a ret - + Table4994: ; 01:4994 db $00, $FF, $FE, $FD db $FC, $FD, $FE, $FF - + Function499c: ; 01:499c call Function46f9 ld hl, $001f @@ -1411,7 +1411,7 @@ Function499c: ; 01:499c add hl, bc ld [hl], $02 ret - + Unknown49dc: ; 01:49dc db $FC, $FB, $FA, $F9 db $F8, $F7, $F6, $F5 @@ -1431,13 +1431,13 @@ Function49fc: ; 01:49fc Function4a05: ; 01:4a05 ld de, Table4a0b jp Function47ab - + Table4a0b: ; 01:4a0b dw Function4a13 dw Function4a28 dw Function4a38 dw Function4a53 - + Function4a13: ; 01:4a13 ld hl, $001e add hl, bc @@ -1503,7 +1503,7 @@ Function4a53: ; 01:4a53 ld [hl], $00 call Function4792 ret - + Function4a82: ; 01:4a82 ld hl, $0008 add hl, bc @@ -1513,7 +1513,7 @@ Function4a82: ; 01:4a82 Function4a8b: ; 01:4a8b ld de, Table4a91 jp Function47ab - + Table4a91: ; 01:4a91 dw Function4a9f dw Function4aaf @@ -1555,7 +1555,7 @@ Function4ab8: ; 01:4ab8 ld [hl], $10 call Function4799 ret - + Function4ad4: ; 01:4ad4 ld hl, $000a add hl, bc @@ -1583,7 +1583,7 @@ Function4af6: ; 01:4af6 ld [hl], $10 call Function4799 ret - + Function4b00: ; 01:4b00 ld hl, $000a add hl, bc @@ -1605,10 +1605,10 @@ Function4b0c: ; 01:4b0c ld [hl], $00 call Function4792 ret - + Function4b22: ; 01:4b22 call Function4792 - + Function4b25: ; 01:4b25 ret @@ -1630,10 +1630,10 @@ Function4b26: ; 01:4b26 add hl, de ld [hl], a ret - + Unknown4b42: ; 01:4b42 db $01, $01, $FC, $02, $00, $08 - + Function4b48: ; 01:4b48 ld e, a add a @@ -1653,7 +1653,7 @@ Function4b48: ; 01:4b48 Unknown4b5f: ; 01:4b5f db $05, $04, $FC, $02, $02, $08 - + Function4b65: ; 01:4b65 ld hl, $000a add hl, bc @@ -1733,7 +1733,7 @@ Function4bc9: ; 01:4bc9 add hl, bc ld [hl], $ff ret - + Function4bed: ; 01:4bed ld a, [wPlayerMovement] jp Function4c37 @@ -1798,7 +1798,7 @@ Function4c37: ; 01:4c37 ld h, [hl] ld l, a jp hl - + Table4c48: ; 01:4c48 dw Function4d94 dw Function4d98 @@ -2238,7 +2238,7 @@ Function4ed5: ; 01:4ed5 Table4edb: ; 01:4edb dw Function4edf dw Function4efb - + Function4edf: ; 01:4edf call Function46d3 call Function499c @@ -2271,12 +2271,12 @@ Function4efb: ; 01:4efb Function4f14: ; 01:4f14 ld de, Table4f1a jp Function47ab - + Table4f1a: ; 01:4f1a dw Function4f20 dw Function4f40 dw Function4f4b - + Function4f20: ; 01:4f20 call Function499c call Function4750 @@ -2916,7 +2916,7 @@ Function52dc: ; 01:52dc add hl, de call PrintPlayTime ret - + SECTION "engine/dumps/bank01.asm@Function5388", ROMX Function5388: ; 01:5388 @@ -2955,7 +2955,7 @@ Function53b0: ; 01:53b0 ld [wce66], a call CloseSRAM ret - + SECTION "engine/dumps/bank01.asm@ReanchorBGMap_NoOAMUpdate", ROMX ReanchorBGMap_NoOAMUpdate: ; 01:63d8 @@ -3016,7 +3016,7 @@ LoadFonts_NoOAMUpdate: ; 01:6437 ld a, $90 ldh [hWY], a ret - + Function6445: ; 01:6445 call BackUpTilesToBuffer @@ -3182,7 +3182,7 @@ Function6445: ; 01:6445 .sub_658a scf ret - + Text658c: ; 01:658c text_from_ram wcd11 text "は あたらしく" @@ -3198,7 +3198,7 @@ Text65a5: ; 01:65a5 sound_dex_fanfare_50_79 text_waitbutton text_end - + Text65a8: ; 01:65a8 text "どの わざを" next "わすれさせたい?" @@ -3207,30 +3207,30 @@ Text65a8: ; 01:65a8 Text65b9: ; 01:65b9 text "それでは<⋯⋯> " text_end - + Text65c1: ; 01:65c1 text_from_ram wStringBuffer2 text "を" line "おぼえるのを あきらめますか?" done - + Text65d7: ; 01:65d7 text_from_ram wcd11 text "は " text_end - + Text65de: ; 01:65de text_from_ram wStringBuffer2 text "を" line "おぼえずに おわった!" prompt - + Text65f0: ; 01:65f0 text_from_ram wcd11 text "は あたらしく" line "" text_end - + Text65fd: ; 01:65fd text_from_ram wStringBuffer2 text "を おぼえたい<⋯⋯>!" @@ -3249,11 +3249,11 @@ Text662e: ; 01:662e text "の かわりに" line "ほかの わざを わすれさせますか?" done - + Text664b: ; 01:664b text "1 2の <⋯⋯>" text_end - + Text6653: ; 01:6653 text_exit start_asm @@ -3263,17 +3263,17 @@ Text6653: ; 01:6653 pop de ld hl, Text6661 ret - + Text6661: ; 01:6661 text " ポカン!" text_end - + Text6668: ; 01:6668 text_exit text "" para "" text_end - + Text666c: ; 01:666c text_from_ram wcd11 text "は " @@ -3285,7 +3285,7 @@ Text6673: ; 01:6673 line "つかいかたを きれいに わすれた!" para "そして<⋯⋯>!" prompt - + Text6691: ; 01:6691 text "それは たいせつなわざです" line "わすれさせることは できません!" @@ -3340,7 +3340,7 @@ Function66b1: ; 01:66b1 ldh [hConnectionStripLength], a ldh [hSpriteOffset], a ret - + Table66fa: ; 01:66fa db $32, $21, $34, $24 db $34, $21, $45, $55 @@ -3407,13 +3407,13 @@ Function6713: ; 01:6713 .sub_6784 call CloseWindow ret - + Text6788: ; 01:6788 text_from_ram wStringBuffer1 text "に" line "ニックネームを つけますか?" done - + Function679d: ; 01:679d ld de, wFieldMoveScriptID push de @@ -3482,12 +3482,12 @@ CorrectNickErrors: ; 01:67d5 pop de pop bc ret - + Table6805:: ; 01:6805 db $00, $05, $14, $19, $1d db $26, $35, $3a, $49, $7f db $ff - + SECTION "engine/dumps/bank01.asm@Function771e", ROMX Function771e: ; 01:771e @@ -3569,7 +3569,7 @@ Function77a1: ; 01:77a1 add hl, bc ld e, [hl] jr _CheckObjectCollision - + Function77ad: ; 01:77ad ldh a, [hConnectionStripLength] call GetObjectStruct @@ -4048,7 +4048,7 @@ Function7a93: ; 01:7a93 add $f7 ld [hl], a ret - + Text7bad: ; 01:7bad db "はなしの はやさ" next " はやい    ふつう    おそい" @@ -4075,15 +4075,15 @@ Text7c12: ; 01:7c12 Text7c17: ; 01:7c17 db " わく を かえる " text_end - + Table7c22: ; 01:7c22 db $0F - + Table7c23: ; 01:7c23 db $05, $08, $03 db $01, $01, $08 db $FF - + Unknown7c2a: ; 01:7c2a rept 491 db $39, $00 diff --git a/engine/dumps/bank02.asm b/engine/dumps/bank02.asm index 500091e..5f373b6 100755 --- a/engine/dumps/bank02.asm +++ b/engine/dumps/bank02.asm @@ -56,7 +56,7 @@ Function806c: ; 02:406c ld a, $ff ld [wObjectFollow_Leader], a ret - + Function807b: ; 02:407b ld a, $01 ld hl, Data8089 @@ -152,7 +152,7 @@ Function80eb: ; 02:40eb add hl, de set 5, [hl] ret - + Function811a: ; 02:411a ldh a, [hConnectionStripLength] ld e, a @@ -306,7 +306,7 @@ Function81f8: ; 02:41f8 add hl, de ld [hl], a ret - + Function820d: ; 02:420d push af ldh a, [hConnectionStripLength] @@ -360,7 +360,7 @@ Function824c: ; 02:424c ret z ld hl, Table8259 jp CallJumptable - + Table8259: ; 02:4259 dw Function8299 dw Function8292 @@ -411,7 +411,7 @@ Function8292: ; 02:4292 Function8299: ; 02:4299 ld a, [wYCoord] add $09 - + Function829e: ; 02:429e ld d, a ld a, [wXCoord] @@ -669,7 +669,7 @@ Function8425: ; 02:4425 ld [wVBCopyFarDst], a ld a, d ld [wVBCopyFarDst+1], a - + Function842d: ; 02:442d ld a, b ld [wVBCopyFarSize], a @@ -768,7 +768,7 @@ Function84b8: ; 02:44b8 jp Function842d SECTION "engine/dumps/bank02.asm@QueueFollowerFirstStep", ROMX - + QueueFollowerFirstStep: ; 02:45df call Function85f2 jr c, .sub_85ec @@ -914,7 +914,7 @@ Function86a0: ; 02:46a0 and $03 jr z, .sub_86b4 ret - + FlyMap: ; 02:46cb ld hl, hJoyDebounceSrc ld a, [hl] @@ -1011,10 +1011,10 @@ Function8747: ; 02:4747 ret z ld [wFlyDestination], a ret - + Text8776: ; 02:4776 db "とびさき を えらんでください@" - + Function8786: ; 02:4786 ld a, [wFlyDestination] push af @@ -1059,7 +1059,7 @@ Function8786: ; 02:4786 Text87e4: ; 02:47e4 db "の すみか@" - + Function87ea: ; 02:47ea ld a, [wFlyDestination] and $10 @@ -1195,7 +1195,7 @@ Function88b3: ; 02:48b3 add hl, bc ld [hl], $08 ret - + TownMapTilemap: ; 02:48da db $04, $05 db $19, $01 @@ -1352,44 +1352,44 @@ TownMapTilemap: ; 02:48da db $10, $01 db $04, $01 db $00 - + SECTION "engine/dumps/bank02.asm@Data8a17", ROMX Data8a17: ; 02:4a17 db $0b db $ff - + db $01, $0a, $03, $00, $02, $00, $05, $01, $03, $01, $04, $02, $0d, $02 db $0d, $03, $0d, $05, $04, $02, $04, $06, $07 db $ff - + db $05, $08 db $ff - + db $06 db $ff - + db $ff - + db $0e, $09, $06, $0e, $08, $0a, $0a db $08, $09, $00, $00, $09, $0c, $00 db $ff - + db $ff - + db $ff - + db $0b db $ff - + db $ff - + db $04, $03 db $ff - + db $04 db $ff - + db $08, $08 db $ff @@ -1557,7 +1557,7 @@ Function8bd5: ; 02:4bd5 ld bc, $8102 call PrintNumber ret - + Function8bfd: ; 02:4bfd ld a, [wJumptableIndex] ld e, a @@ -1579,7 +1579,7 @@ Table8c0c: ; 02:4c0c dw Function8d62 dw Function8e6c dw Function8e9e - + Function8c1c: ; 02:4c1c ld hl, wJumptableIndex inc [hl] @@ -1656,7 +1656,7 @@ DrawMap: ; 02:4c7c add $18 ld [hl], a ret - + Function8cab: ; 02:4cab ld hl, hJoyDown ld a, [hl] @@ -1665,7 +1665,7 @@ Function8cab: ; 02:4cab xor a ld [wJumptableIndex], a ret - + Function8cb7: ; 02:4cb7 call Function8c1c call Function8eaa @@ -1740,7 +1740,7 @@ Function8cb7: ; 02:4cb7 xor a ld [wcb61], a ret - + Function8d62: ; 02:4d62 ld hl, hJoyDown ld a, [hl] @@ -1749,7 +1749,7 @@ Function8d62: ; 02:4d62 xor a ld [wJumptableIndex], a ret - + Function8d6e: ; 02:4d6e ld hl, wcb61 ld e, [hl] @@ -1886,12 +1886,12 @@ Function8dfd: ; 02:4dfd ld h, [hl] ld l, a jp hl - + Function8e2c: ; 02:4e2c pop bc scf ret - + Table8e2f: ; 02:4e2f dw Data8e4d dw Data8e4d @@ -1913,21 +1913,21 @@ Data8e4d: ; 02:4e4d db $10, $02 dw Function8e66 dw Function8e66 - + db $20, $05 dw Function8e66 dw Function8e66 - + db $40, $07 dw Function8e66 dw Function8e66 - + db $48, $09 dw Function8e66 dw Function8e66 - + db $00 - + Function8e66: ; 02:4e66 ld d, $00 call PlayMusic @@ -2012,7 +2012,7 @@ Function8eca: ; 02:4eca Data8ef5: ; 02:4ef5 db $00, $18, $30, $00 - + Function8ef9: ; 02:4ef9 dec c dec c @@ -2079,7 +2079,7 @@ SetTitleBGDecorationBorder: ; 02:51d2 ld b, $54 call Function91ef ret - + Function91ef: ; 02:51ef xor a ld c, $14 @@ -2282,10 +2282,10 @@ Function93bb: ; 02:53bb Table93cc: ; 02:53cc dw Data986c dw Data996c - + dw Data987c dw Data998c - + dw Data986c dw Data999c diff --git a/engine/dumps/bank03.asm b/engine/dumps/bank03.asm index 2c2a21c..456c903 100755 --- a/engine/dumps/bank03.asm +++ b/engine/dumps/bank03.asm @@ -281,7 +281,7 @@ Functionca68: ; 03:4a68 pop hl .sub_caa0 ret - + SECTION "engine/dumps/bank03.asm@Functiond41d", ROMX @@ -337,7 +337,7 @@ Textd491: ; 03:5491 text "それは とても たいせつなモノです" line "すてることは できません!" prompt - + Functiond4b2: ; 03:54b2 push hl push bc @@ -385,7 +385,7 @@ Functiond4e6: ; 03:54e6 ret .sub_d4f8 jr Functiond505 - + Functiond4fa: ; 03:54fa call Functiond51e ld hl, Function8261 @@ -2239,7 +2239,7 @@ Texte1c3: ; 03:61c3 text "に" line "なまえを つけますか?" done - + Functione1d5: ; 03:61d5 call Functione284 ret c @@ -2272,11 +2272,11 @@ Functione1d5: ; 03:61d5 call LoadFontExtra call CloseWindow ret - + Texte224: ; 03:6224 text "なんに するん?" done - + Datae22e: ; 03:622e db $40, $00, $00, $11, $0e dw Datae236 @@ -2287,10 +2287,10 @@ Datae236: ; 03:6236 dw Datae27c db $8a, $1f dw Texte23e - + Texte23e: ; 03:623e db "#の ようすをみる@" - + Texte248: ; 03:6248 db "#を つれていく@" @@ -2305,7 +2305,7 @@ Texte260: ; 03:6260 Texte26a: ; 03:626a db "さようなら@" - + Tablee270: ; 03:6270 dw Functione5c5 dw Functione31b @@ -2342,7 +2342,7 @@ Functione2a6: ; 03:62a6 .sub_e2ae and a ret - + Functione2b0: ; 03:72b0 ld a, [wPartyCount] and a @@ -2516,7 +2516,7 @@ Datae414: ; 03:6414 db $38, $64, $00, $00, $00, $03, $9d, $64 db $0a, $01, $02, $03, $04, $05, $06, $07 db $08, $09, $0a, $ff - + Functione438: ; 03:6438 push de ld a, [wMenuSelection] @@ -2539,7 +2539,7 @@ Functione438: ; 03:6438 pop hl call PlaceString ret - + Texte461: ; 03:6461 db "・.01 @" db "・.02 @" @@ -2551,7 +2551,7 @@ Texte461: ; 03:6461 db "・.08 @" db "・.09 @" db "・.10 @" - + Functione49d: ; 03:649d ld h, d ld l, e @@ -2569,7 +2569,7 @@ Functione49d: ; 03:649d ld de, Texte4ca call PlaceString ret - + Texte4bf: ; 03:64bf db "あずかっている#" next " @" @@ -2594,7 +2594,7 @@ Functione4ce: ; 03:64ce ld a, [hl] call CloseSRAM ret - + Datae4e7: ; 03:64e7 db $02, $00, $a0 db $02, $48, $a5 @@ -2643,7 +2643,7 @@ Functione53e: ; 03:653e Functione54d: ; 03:654d ld a, [wMenuSelection] ret - + Texte551: ; 03:6551 text "# ボックスを かえると" line "どうじに レポートが かかれます" @@ -2672,7 +2672,7 @@ Datae5a5: ; 03:65a5 db $40, $06, $00, $0e, $0e dw Datae5ad db $01 - + Datae5ad: ; 03:65ad db $80, $03 db "ボックスきりかえ@" @@ -2801,38 +2801,38 @@ Functione6a4: ; 03:66a4 Texte6d0: ; 03:66d0 text "#を えらんだ!" prompt - + Tablee6da: ; 03:66da dw Datae6e0 dw wcd3c dw wcd46 - + Datae6e0: ; 03:66e0 db $40, $03, $05, $0b, $12 dw Datae6e8 db $01 - + Datae6e8: ; 03:e6e8 db $00, $04 - + Datae6ea: ; 03:66ea db $08, $01, $00, $aa, $d6, $09, $a6 db $47, $09, $ba, $47, $00, $00, $00 - + Datae6f8: ; 03:66f8 dw Datae6fe dw wcd3c dw wcd46 - + Datae6fe: ; 03:66fe db $40, $03, $05, $0b, $12 dw Datae706 db $01 - + Datae706: ; 03:6706 db $00, $04, $08, $01, $00, $83, $da, $09 db $ab, $47, $09, $c1, $47, $00, $00, $00 - + Datae716: ; 03:6716 dw Datae71c dw wcd3c @@ -2842,7 +2842,7 @@ Datae71c: ; 03:671c db $40, $04, $01, $0b, $13, $24, $67, $01 db $00, $04, $00, $01, $00, $83, $da, $09 db $d8, $47, $00, $00, $00, $00, $00, $00 - + Function6734: ; 03:6734 call RefreshScreen call LowVolume @@ -3423,11 +3423,11 @@ Textebdc: ; 03:6bdc text "おしい!" line "あと ちょっとの ところだったのに!" prompt - + Textebf5: ; 03:6bf5 text "やったー!" line "@" - + Textebfd: ; 03:6bfd text_from_ram wBattleMonNickname text "を つかまえたぞ!@" @@ -3538,7 +3538,7 @@ Functionecd5: ; 03:6cd5 call PlayMapMusic call Function1fea ret - + Functioned00: ; 03:6d00 ld a, [wBattleMode] and a @@ -3651,7 +3651,7 @@ Textedd2: ; 03:6dd2 text "の" line "きそ ポイントが あがった!" prompt - + Textede7: ; 03:6de7 @@ -3664,7 +3664,7 @@ Tableedf7: ; 03:6df7 dw Textee0f dw Textee17 dw Textee1c - + Textee01: ; 03:6e01 db "たいりょく@" @@ -3679,7 +3679,7 @@ Textee17: ; 03:6e17 Textee1c: ; 03:6e1c db "とくしゅのうりょく@" - + Functionee26: ; 03:6e26 ld a, [wCurItem] ld hl, Dataee38 @@ -3694,14 +3694,14 @@ Functionee26: ; 03:6e26 ld c, a ld b, $00 ret - + Dataee38: ; 03:6e38 db $1a, $00 db $1b, $02 db $1c, $04 db $1d, $06 db $1f, $08 - + Functionee42: ; 03:6e42 ld a, [wBattleMode] and a @@ -3865,7 +3865,7 @@ Functionef17: ; 03:6f17 ld c, [hl] pop hl ret - + Dataef77: ; 03:6f77 db $09, $f0, $08 db $0a, $f1, $10 @@ -3874,7 +3874,7 @@ Dataef77: ; 03:6f77 db $0d, $f4, $40 db $26, $f6, $ff db $ff, $00, $00 - + Functionef8c: ; 03:6f8c ld a, [wPartyCount] and a @@ -3923,7 +3923,7 @@ Functionef8c: ; 03:6f8c Functionefed: ; 03:6fed ret - + Functionefee: ; 03:6fee ld a, [wPartyCount] and a @@ -4014,7 +4014,7 @@ Functionf05b: ; 03:705b call Functionf0d8 call Functionf7a2 jp Functionf104 - + Functionf0af: ; 03:70af ret @@ -4175,7 +4175,7 @@ Functionf195: ; 03:7195 ld a, [wHPBarNewHP] ld e, a ret - + Functionf19e: ; 03:719e ld a, $22 call GetPartyParamLocation @@ -4226,7 +4226,7 @@ Functionf1ce: ; 03:71ce ldh a, [hQuotient+2] ld e, a ret - + Functionf1e9: ; 03:71e9 push hl ld a, [wCurItem] @@ -4249,7 +4249,7 @@ Functionf1e9: ; 03:71e9 ld d, [hl] pop hl ret - + Dataf203: ; 03:7203 db $2e, $32, $00 db $2f, $3c, $00 @@ -4258,7 +4258,7 @@ Dataf203: ; 03:7203 db $11, $32, $00 db $12, $14, $00 db $ff, $00, $00 - + Functionf218: ; 03:7218 ld a, [wcd3c] dec a @@ -4343,7 +4343,7 @@ Textf2a6: ; 03:72a6 text "その#には " line "つかえません" done - + Functionf2b5: ; 03:72b5 xor a ld [wFieldMoveSucceeded], a @@ -4519,7 +4519,7 @@ Textf3da: ; 03:73da Textf3ec: ; 03:73ec text "は" line "#のふえを ふいてみた!@" - + Functionf3fd: ; 03:73fd ld b, $08 ld a, [wBattleMode] @@ -4541,16 +4541,16 @@ Functionf413: ; 03:7413 call MenuTextBox call CloseWindow ret - + Textf424: ; 03:7424 text "あなたの コイン" line "@" - + Textf42f: ; 03:742f deciram wd15b, 2, 4 text "まい" prompt - + Functionf437: ; 03:7437 call Functionf49f jp c, Functionf7dd @@ -4585,7 +4585,7 @@ Functionf444: ; 03:7444 Dataf46a: ; 03:746a db $0a, $9d, $0a, $47 - + Functionf46e: ; 03:746e call Functionf49f jp c, Functionf7dd @@ -5033,7 +5033,7 @@ Functionf7f4: ; 03:77f4 xor a ld [wFieldMoveSucceeded], a jp PrintText - + Textf7fb: ; 03:77fb text "オーキドの ことば<⋯⋯>" line "よ! こういうものには" @@ -5051,7 +5051,7 @@ Textf832: ; 03:7832 Textf841: ; 03:7841 text "つかっても こうかがないよ" prompt - + Textf850: ; 03:7850 text "に ボールを はじかれた!" prompt @@ -5105,7 +5105,7 @@ Textf8ea: ; 03:78ea text_from_ram wStringBuffer2 text "から おりた" prompt - + SECTION "engine/dumps/bank03.asm@Functionf960", ROMX Functionf960: ; 03:7960 @@ -5168,7 +5168,7 @@ Functionf960: ; 03:7960 Functionf9c9: ; 03:79c9 ld a, [wWhichPokemon] call AddNTimes - + Functionf9cf: ; 03:79cf ld a, [w2DMenuDataEnd] ld c, a @@ -5212,7 +5212,7 @@ Functionf9d9: ; 03:79d9 ld c, [hl] ld e, $01 ret - + Datafa08: ; 03:7a08 dbw $00, Datafa6c dbw $01, Datafa6c @@ -5248,7 +5248,7 @@ Datafa08: ; 03:7a08 dbw $e3, Datafaa2 dbw $e4, Datafaa2 db $ff - + Datafa6c: ; 03:7a6c db $02, $0f, $18, $0f, $47 @@ -5450,7 +5450,7 @@ Datafc30: ; 03:7c30 db $40, $04, $0d, $0b, $13 dw Datafc38 db $01 - + Datafc38: ; 03:7c38 db $80, $03 db "あずける@" @@ -5620,12 +5620,12 @@ Textfdc7: ; 03:7dc7 text_from_ram wStringBuffer1 text "は すでに" line "@" - + Textfdd2: ; 03:7dd2 text_from_ram wStringBuffer2 text "を おぼえています" prompt - + Textfde0: ; 03:7de0 db "います" prompt @@ -5656,7 +5656,7 @@ Functionfdf3: ; 03:7df3 call PrintText scf ret - + Textfe0a: ; 03:7e0a text_from_ram wStringBuffer1 text "は すでに" @@ -5666,7 +5666,7 @@ Textfe15: ; 03:7e15 text_from_ram wStringBuffer2 text "を おぼえています" prompt - + Datafe23: ; 03:7e23 db $e0, $22, $47, $24, $80, $a3, $01, $50 db $02, $85, $b0, $09, $35, $51, $2c, $08 -- cgit v1.2.3