diff options
Diffstat (limited to 'misc')
| -rwxr-xr-x | misc/battle_tower_5c.asm | 30 | ||||
| -rwxr-xr-x | misc/fixed_words.asm | 110 | ||||
| -rw-r--r-- | misc/gbc_only.asm | 4 | ||||
| -rwxr-xr-x | misc/gfx_41.asm | 24 | ||||
| -rwxr-xr-x | misc/mobile_12_2.asm | 4 | ||||
| -rw-r--r-- | misc/mobile_22.asm | 6 | ||||
| -rw-r--r-- | misc/mobile_22_2.asm | 10 | ||||
| -rw-r--r-- | misc/mobile_40.asm | 6 | ||||
| -rwxr-xr-x | misc/mobile_41.asm | 2 | ||||
| -rw-r--r-- | misc/mobile_42.asm | 18 | ||||
| -rwxr-xr-x | misc/mobile_46.asm | 24 | ||||
| -rw-r--r-- | misc/mobile_5f.asm | 20 | ||||
| -rwxr-xr-x | misc/mobile_menu.asm | 2 |
13 files changed, 130 insertions, 130 deletions
diff --git a/misc/battle_tower_5c.asm b/misc/battle_tower_5c.asm index c975f4901..fb441a3f8 100755 --- a/misc/battle_tower_5c.asm +++ b/misc/battle_tower_5c.asm @@ -125,7 +125,7 @@ Function170139: ; 170139 ld a, PartyMonNicknames / $100 ld [wcd4c], a ld a, 3 -.CopyLoop +.CopyLoop: push af ld a, [wcd49] ld l, a @@ -212,7 +212,7 @@ _BattleTowerBattle: ; 17022c ret ; 17023a -.do_dw: ; 17023a +.do_dw ; 17023a ld a, [wBattleTowerBattleEnded] ld e, a ld d, 0 @@ -226,7 +226,7 @@ endr jp [hl] ; 170249 -.dw: ; 170249 +.dw ; 170249 dw RunBattleTowerTrainer dw SkipBattleTowerTrainer ; 17024d @@ -699,7 +699,7 @@ endr jp [hl] ; 17051f -.dw: ; 17051f +.dw ; 17051f dw .Jumptable_0 dw .Jumptable_1 dw .Jumptable_2 @@ -957,7 +957,7 @@ endr ; 170696 -.dw: ; 170696 (5c:4696) +.dw ; 170696 (5c:4696) dw Function17075f ; 0x00 dw Function170788 ; 0x01 dw Function170778 ; 0x02 @@ -1085,9 +1085,9 @@ Function17075f: ; 17075f (5c:475f) BattleTowerAction $00 and a ret z - ld a, BANK(sbe4f) + ld a, BANK(s1_be4f) call GetSRAMBank - ld a, [sbe4f] + ld a, [s1_be4f] and $2 ld [ScriptVar], a call CloseSRAM @@ -1103,11 +1103,11 @@ Function170778: ; 170778 (5c:4778) BattleTowerAction $02 ret Function170788: ; 170788 (5c:4788) BattleTowerAction $01 - ld a, BANK(sbe4f) + ld a, BANK(s1_be4f) call GetSRAMBank - ld a, [sbe4f] + ld a, [s1_be4f] or $2 - ld [sbe4f], a + ld [s1_be4f], a call CloseSRAM ret @@ -1591,20 +1591,20 @@ Function170abe: ; 170abe (5c:4abe) BattleTowerAction $14 and a ret z - ld a, BANK(sbe4f) + ld a, BANK(s1_be4f) call GetSRAMBank - ld a, [sbe4f] + ld a, [s1_be4f] and $1 ld [ScriptVar], a call CloseSRAM ret Function170ad7: ; 170ad7 (5c:4ad7) BattleTowerAction $15 - ld a, BANK(sbe4f) + ld a, BANK(s1_be4f) call GetSRAMBank - ld a, [sbe4f] + ld a, [s1_be4f] or $1 - ld [sbe4f], a + ld [s1_be4f], a call CloseSRAM ret diff --git a/misc/fixed_words.asm b/misc/fixed_words.asm index c7f1390e5..ed4160351 100755 --- a/misc/fixed_words.asm +++ b/misc/fixed_words.asm @@ -2509,7 +2509,7 @@ Function11d0b6: ; 11d0b6 (47:50b6) ld l, a jp [hl] -.Jumptable +.Jumptable: dw .zero dw .one dw .two @@ -2523,21 +2523,21 @@ Function11d0b6: ; 11d0b6 (47:50b6) dw .ten -.zero: ; 11d0dd (47:50dd) +.zero ; 11d0dd (47:50dd) ld a, [wcd20] ; wcd20 (aliases: CreditsPos) sla a ld hl, Unknown_11d208 ld e, $1 jr .load -.one: ; 11d0e9 (47:50e9) +.one ; 11d0e9 (47:50e9) ld a, [wcd21] sla a ld hl, Unknown_11d21a ld e, $2 jr .load -.two: ; 11d0f5 (47:50f5) +.two ; 11d0f5 (47:50f5) ld hl, Unknown_11d2be ld a, [wcd22] ld e, a @@ -2551,14 +2551,14 @@ Function11d0b6: ; 11d0b6 (47:50b6) ld e, $4 jr .load -.three: ; 11d10f (47:510f) +.three ; 11d10f (47:510f) ld a, SPRITE_ANIM_FRAMESET_27 call ReinitSpriteAnimFrame ld a, [wcd25] sla a ld hl, Unknown_11d29e ld e, $8 -.load: ; 11d11e (47:511e) +.load ; 11d11e (47:511e) push de ld e, a ld d, $0 @@ -2577,7 +2577,7 @@ Function11d0b6: ; 11d0b6 (47:50b6) call Function11d2ee ret -.four: ; 11d134 (47:5134) +.four ; 11d134 (47:5134) ld a, SPRITE_ANIM_FRAMESET_27 call ReinitSpriteAnimFrame ld a, [wcd2a] @@ -2586,7 +2586,7 @@ Function11d0b6: ; 11d0b6 (47:50b6) ld e, $10 jr .load -.five: ; 11d145 (47:5145) +.five ; 11d145 (47:5145) ld a, SPRITE_ANIM_FRAMESET_27 call ReinitSpriteAnimFrame ld a, [wcd2c] @@ -2595,7 +2595,7 @@ Function11d0b6: ; 11d0b6 (47:50b6) ld e, $20 jr .load -.six: ; 11d156 (47:5156) +.six ; 11d156 (47:5156) ld a, SPRITE_ANIM_FRAMESET_2A call ReinitSpriteAnimFrame ld a, [wcd4a] @@ -2613,7 +2613,7 @@ Function11d0b6: ; 11d0b6 (47:50b6) call Function11d2ee ret -.seven: ; 11d175 (47:5175) +.seven ; 11d175 (47:5175) ld a, [wcd4d] cp $4 jr z, .asm_11d180 @@ -2666,15 +2666,15 @@ Function11d0b6: ; 11d0b6 (47:50b6) call Function11d2ee ret -.nine: ; 11d1d1 (47:51d1) +.nine ; 11d1d1 (47:51d1) ld d, -13 * 8 ld a, SPRITE_ANIM_FRAMESET_2C jr .eight_nine_load -.eight: ; 11d1d7 (47:51d7) +.eight ; 11d1d7 (47:51d7) ld d, 2 * 8 ld a, SPRITE_ANIM_FRAMESET_2B -.eight_nine_load: ; 11d1db (47:51db) +.eight_nine_load ; 11d1db (47:51db) push de call ReinitSpriteAnimFrame ld a, [wcd4a] @@ -2695,7 +2695,7 @@ Function11d0b6: ; 11d0b6 (47:50b6) call Function11d2ee ret -.ten: ; 11d1fc (47:51fc) +.ten ; 11d1fc (47:51fc) ld a, SPRITE_ANIM_FRAMESET_26 call ReinitSpriteAnimFrame ld a, $8 @@ -3142,7 +3142,7 @@ Function11d3ba: ; 11d3ba jr z, .ExitMasterLoop jp .MasterLoop -.ExitMasterLoop +.ExitMasterLoop: pop af ld [rSVBK], a ret @@ -3289,84 +3289,84 @@ SortedPokemon: db -1 .o: db FERALIGATR, FURRET, OCTILLERY, PRIMEAPE, SENTRET, STANTLER, SPEAROW, FEAROW, OMASTAR, OMANYTE db -1 -.ka_ga: db GROWLITHE, MACHAMP, DRAGONITE, PINSIR, SNORLAX, KABUTO, KABUTOPS, HITMONTOP, WARTORTLE, BLASTOISE, FARFETCH_D, CUBONE, MAROWAK, KANGASKHAN +.ka_ga db GROWLITHE, MACHAMP, DRAGONITE, PINSIR, SNORLAX, KABUTO, KABUTOPS, HITMONTOP, WARTORTLE, BLASTOISE, FARFETCH_D, CUBONE, MAROWAK, KANGASKHAN db -1 -.ki_gi: db SUNFLORA, CATERPIE, GYARADOS, RAPIDASH, NINETALES, GIRAFARIG, BELLOSSOM, KINGDRA, KINGLER +.ki_gi db SUNFLORA, CATERPIE, GYARADOS, RAPIDASH, NINETALES, GIRAFARIG, BELLOSSOM, KINGDRA, KINGLER db -1 -.ku_gu: db GLOOM, PINECO, GLIGAR, KRABBY, GRANBULL, CROBAT +.ku_gu db GLOOM, PINECO, GLIGAR, KRABBY, GRANBULL, CROBAT db -1 -.ke_ge: db ABRA, GENGAR, TAUROS +.ke_ge db ABRA, GENGAR, TAUROS db -1 -.ko_go: db MAGIKARP, MAGNEMITE, GASTLY, HAUNTER, MACHOKE, KAKUNA, PSYDUCK, PHANPY, RATTATA, GOLDUCK, GOLBAT, GOLEM, GRAVELER, VENONAT +.ko_go db MAGIKARP, MAGNEMITE, GASTLY, HAUNTER, MACHOKE, KAKUNA, PSYDUCK, PHANPY, RATTATA, GOLDUCK, GOLBAT, GOLEM, GRAVELER, VENONAT db -1 -.sa_za: db RHYHORN, PUPITAR, CORSOLA, HITMONLEE, ZAPDOS, JOLTEON, SANDSHREW, SANDSLASH ; RHYDON should lead this list +.sa_za db RHYHORN, PUPITAR, CORSOLA, HITMONLEE, ZAPDOS, JOLTEON, SANDSHREW, SANDSLASH ; RHYDON should lead this list db -1 -.shi_ji: db SEADRA, SHELLDER, VAPOREON, DEWGONG +.shi_ji db SEADRA, SHELLDER, VAPOREON, DEWGONG db -1 -.su_zu: db SUICUNE, STARMIE, SCYTHER, ZUBAT, BEEDRILL, HYPNO, DROWZEE +.su_zu db SUICUNE, STARMIE, SCYTHER, ZUBAT, BEEDRILL, HYPNO, DROWZEE db -1 -.se_ze: db SQUIRTLE, CELEBI +.se_ze db SQUIRTLE, CELEBI db -1 -.so_zo: db WOBBUFFET +.so_zo db WOBBUFFET db -1 -.ta_da: db DUGTRIO, HORSEA, EXEGGCUTE +.ta_da db DUGTRIO, HORSEA, EXEGGCUTE db -1 -.chi_dhi: db CHIKORITA, CHINCHOU +.chi_dhi db CHIKORITA, CHINCHOU db -1 -.tsu_du: db SHUCKLE +.tsu_du db SHUCKLE db -1 -.te_de: db DIGLETT, REMORAID, DELIBIRD, HOUNDOUR, AMPHAROS +.te_de db DIGLETT, REMORAID, DELIBIRD, HOUNDOUR, AMPHAROS db -1 -.to_do: db DODUO, DODRIO, SMEARGLE, KOFFING, TENTACRUEL, TOGETIC, TOGEPI, GOLDEEN, METAPOD, DONPHAN +.to_do db DODUO, DODRIO, SMEARGLE, KOFFING, TENTACRUEL, TOGETIC, TOGEPI, GOLDEEN, METAPOD, DONPHAN db -1 -.na: db ODDISH, EXEGGUTOR +.na db ODDISH, EXEGGUTOR db -1 -.ni: db NIDOKING, NIDOQUEEN, NIDORAN_M, NIDORAN_F, NIDORINA, NIDORINO, MEOWTH, SNEASEL, POLIWHIRL, POLITOED, POLIWRATH, POLIWAG +.ni db NIDOKING, NIDOQUEEN, NIDORAN_M, NIDORAN_F, NIDORINA, NIDORINO, MEOWTH, SNEASEL, POLIWHIRL, POLITOED, POLIWRATH, POLIWAG db -1 -.nu: db QUAGSIRE +.nu db QUAGSIRE db -1 -.ne: db NATU, XATU +.ne db NATU, XATU db -1 -.no: db DUNSPARCE +.no db DUNSPARCE db -1 -.ha_ba_pa: db SEEL, STEELIX, TYPHLOSION, DRAGONAIR, BUTTERFREE, SCIZOR, HOPPIP, BLISSEY, PARAS, PARASECT, QWILFISH, MR__MIME, TYROGUE, CLOYSTER, TYRANITAR +.ha_ba_pa db SEEL, STEELIX, TYPHLOSION, DRAGONAIR, BUTTERFREE, SCIZOR, HOPPIP, BLISSEY, PARAS, PARASECT, QWILFISH, MR__MIME, TYROGUE, CLOYSTER, TYRANITAR db -1 -.hi_bi_pi: db CLEFFA, WEEDLE, PIKACHU, CLEFABLE, PIDGEOT, PIDGEOTTO, PICHU, CLEFAIRY, CHARMANDER, STARYU, CYNDAQUIL, SUNKERN, TEDDIURSA, VOLTORB +.hi_bi_pi db CLEFFA, WEEDLE, PIKACHU, CLEFABLE, PIDGEOT, PIDGEOTTO, PICHU, CLEFAIRY, CHARMANDER, STARYU, CYNDAQUIL, SUNKERN, TEDDIURSA, VOLTORB db -1 -.fu_bu_pu: db MOLTRES, FLAREON, ALAKAZAM, MAGMAR, FORRETRESS, WIGGLYTUFF, IVYSAUR, BULBASAUR, VENUSAUR, AERODACTYL, MAGBY, IGGLYBUFF, UMBREON, ARTICUNO, JIGGLYPUFF, SNUBBULL +.fu_bu_pu db MOLTRES, FLAREON, ALAKAZAM, MAGMAR, FORRETRESS, WIGGLYTUFF, IVYSAUR, BULBASAUR, VENUSAUR, AERODACTYL, MAGBY, IGGLYBUFF, UMBREON, ARTICUNO, JIGGLYPUFF, SNUBBULL db -1 -.he_be_pe: db BAYLEEF, GRIMER, MUK, HERACROSS, HOUNDOOM, PERSIAN, LICKITUNG +.he_be_pe db BAYLEEF, GRIMER, MUK, HERACROSS, HOUNDOOM, PERSIAN, LICKITUNG db -1 -.ho_bo_po: db HO_OH, HOOTHOOT, PIDGEY, PONYTA, SKIPLOOM, PORYGON, PORYGON2 +.ho_bo_po db HO_OH, HOOTHOOT, PIDGEY, PONYTA, SKIPLOOM, PORYGON, PORYGON2 db -1 -.ma: db MAGCARGO, SLUGMA, QUILAVA, BELLSPROUT, WEEZING, MARILL, AZUMARILL, ELECTRODE, MANKEY, MANTINE +.ma db MAGCARGO, SLUGMA, QUILAVA, BELLSPROUT, WEEZING, MARILL, AZUMARILL, ELECTRODE, MANKEY, MANTINE db -1 -.mi: db DRATINI, MEW, MEWTWO, MILTANK +.mi db DRATINI, MEW, MEWTWO, MILTANK db -1 -.mu: db MISDREAVUS, SMOOCHUM +.mu db MISDREAVUS, SMOOCHUM db -1 -.me: db MEGANIUM, DITTO, TENTACOOL, MAREEP +.me db MEGANIUM, DITTO, TENTACOOL, MAREEP db -1 -.mo: db FLAAFFY, VENOMOTH, TANGELA +.mo db FLAAFFY, VENOMOTH, TANGELA db -1 -.ya: db SLOWKING, SLOWBRO, SLOWPOKE, MURKROW, YANMA +.ya db SLOWKING, SLOWBRO, SLOWPOKE, MURKROW, YANMA db -1 -.yu: db KADABRA +.yu db KADABRA db -1 -.yo: db LARVITAR, NOCTOWL +.yo db LARVITAR, NOCTOWL db -1 -.ra: db RAIKOU, RAICHU, CHANSEY, RATICATE, LAPRAS, VILEPLUME, LANTURN +.ra db RAIKOU, RAICHU, CHANSEY, RATICATE, LAPRAS, VILEPLUME, LANTURN db -1 -.ri: db CHARMELEON, CHARIZARD, URSARING +.ri db CHARMELEON, CHARIZARD, URSARING db -1 -.ru: db JYNX, LUGIA +.ru db JYNX, LUGIA db -1 -.re: db MAGNETON, LEDIAN, LEDYBA +.re db MAGNETON, LEDIAN, LEDYBA db -1 -.ro: db VULPIX +.ro db VULPIX db -1 -.wa: db JUMPLUFF, TOTODILE, MACHOP -.end: db -1 +.wa db JUMPLUFF, TOTODILE, MACHOP +.end db -1 ; 11d67e GFX_11d67e: diff --git a/misc/gbc_only.asm b/misc/gbc_only.asm index 2349bb687..cae976a1c 100644 --- a/misc/gbc_only.asm +++ b/misc/gbc_only.asm @@ -96,7 +96,7 @@ DrawGBCOnlyBorder: ; 4eaea ret ; 4eb15 -.FillRow ; 4eb15 +.FillRow: ; 4eb15 ld c, SCREEN_WIDTH - 2 .next_column ld [hli], a @@ -105,7 +105,7 @@ DrawGBCOnlyBorder: ; 4eaea ret ; 4eb1c -.FillColumn ; 4eb1c +.FillColumn: ; 4eb1c ld de, SCREEN_WIDTH ld c, SCREEN_HEIGHT - 2 .next_row diff --git a/misc/gfx_41.asm b/misc/gfx_41.asm index 7efdf41b8..dc5110e2e 100755 --- a/misc/gfx_41.asm +++ b/misc/gfx_41.asm @@ -2,7 +2,7 @@ Function104000:: ; 104000 ld hl, .Function jp CallInSafeGFXMode -.Function +.Function: decoord 0, 0, AttrMap ld hl, wBackupAttrMap call CutAndPasteAttrMap @@ -24,7 +24,7 @@ Function10402d:: ; 10402d ld hl, .Function jp CallInSafeGFXMode -.Function +.Function: decoord 0, 0 ld hl, wDecompressScratch call CutAndPasteTilemap @@ -39,7 +39,7 @@ Function104047: ; 104047 ld hl, .Function jp CallInSafeGFXMode -.Function +.Function: decoord 0, 0, AttrMap ld hl, wBackupAttrMap call CutAndPasteAttrMap @@ -54,7 +54,7 @@ ReloadMapPart:: ; 104061 ld hl, .Function jp CallInSafeGFXMode -.Function +.Function: decoord 0, 0, AttrMap ld hl, wBackupAttrMap call CutAndPasteAttrMap @@ -83,7 +83,7 @@ Function104099: ; 104099 ld hl, .Function jp CallInSafeGFXMode -.Function +.Function: decoord 0, 0, AttrMap ld hl, wBackupAttrMap call CutAndPasteAttrMap @@ -112,7 +112,7 @@ Function1040d4: ; 1040d4 ld hl, .Function jp CallInSafeGFXMode -.Function +.Function: ld a, $1 ld [rVBK], a ld a, $3 @@ -136,7 +136,7 @@ Function1040fb: ; 1040fb ld hl, .Function jp CallInSafeGFXMode -.Function +.Function: ld a, $1 ld [rVBK], a ld a, $3 @@ -151,7 +151,7 @@ Function104110:: ; 104110 ld hl, .Function jp CallInSafeGFXMode -.Function +.Function: decoord 0, 0, AttrMap ld hl, wBackupAttrMap call CutAndPasteAttrMap @@ -181,7 +181,7 @@ Function104148: ; 104148 (41:4148) ld hl, .Function jp CallInSafeGFXMode -.Function +.Function: decoord 0, 0, AttrMap ld hl, wBackupAttrMap call CutAndPasteAttrMap @@ -228,7 +228,7 @@ CallInSafeGFXMode: ; 104177 ret ; 10419c -._hl_: ; 10419c +._hl_ ; 10419c jp [hl] ; 10419d @@ -454,7 +454,7 @@ endr ld l, e ld de, wDecompressScratch call FarCopyBytes - + pop hl pop bc @@ -500,7 +500,7 @@ _Get1bpp:: ; 1042b2 jr .loop ; 1042d6 -.bankswitch: ; 1042d6 +.bankswitch ; 1042d6 ld a, [rSVBK] push af ld a, $6 diff --git a/misc/mobile_12_2.asm b/misc/mobile_12_2.asm index 86583aa40..05e92cd55 100755 --- a/misc/mobile_12_2.asm +++ b/misc/mobile_12_2.asm @@ -443,7 +443,7 @@ Function4aad3: ; 4aad3 push bc push hl ld e, 0 - callba Function8e83f + callba LoadMenuMonIcon ld a, [hObjectStructIndexBuffer] inc a ld [hObjectStructIndexBuffer], a @@ -481,7 +481,7 @@ Function4ab06: ; 4ab06 jr nz, .NotFainted scf -.NotFainted +.NotFainted: ret ; 4ab1a diff --git a/misc/mobile_22.asm b/misc/mobile_22.asm index b849b8405..c9a844b42 100644 --- a/misc/mobile_22.asm +++ b/misc/mobile_22.asm @@ -2216,7 +2216,7 @@ Function89d85: ; 89d85 (22:5d85) push hl call Function8923c call _hl_ - call Function3238 + call CGBOnly_LoadEDTile pop hl asm_89d90: ; 89d90 (22:5d90) @@ -2661,7 +2661,7 @@ rept 3 endr ld a, $6 call Function8a5a3 - call Function3238 + call CGBOnly_LoadEDTile pop bc ld a, c cp $b @@ -2676,7 +2676,7 @@ endr ld a, $6 hlcoord 15, 4, AttrMap call Function8a5a3 - call Function3238 + call CGBOnly_LoadEDTile jp Function89e36 Function8a0a1: ; 8a0a1 (22:60a1) diff --git a/misc/mobile_22_2.asm b/misc/mobile_22_2.asm index 70fc96095..880ae460a 100644 --- a/misc/mobile_22_2.asm +++ b/misc/mobile_22_2.asm @@ -19,21 +19,21 @@ Function8b342:: ; 8b342 ret ; 8b354 -.dw: ; 8b354 +.dw ; 8b354 dw .zero dw .one dw .two ; 8b35a -.zero: ; 8b35a +.zero ; 8b35a mobile ; 8b35b -.one: ; 8b35b +.one ; 8b35b mobile ; 8b35c -.two: ; 8b35c +.two ; 8b35c mobile ; 8b35d @@ -401,7 +401,7 @@ Function8b539: ; 8b539 (22:7539) call Function8b4fd ld e, $0 call Function89c44 - call Function3238 + call CGBOnly_LoadEDTile ret Function8b555: ; 8b555 (22:7555) diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm index 8594f0044..c2a6c20b9 100644 --- a/misc/mobile_40.asm +++ b/misc/mobile_40.asm @@ -1998,7 +1998,7 @@ Function100c98: ; 100c98 ret ; 100cad -.attrs: ; 100cad +.attrs ; 100cad db 10, 1 db 255, 1 db $a0, $00 @@ -3079,7 +3079,7 @@ Function1013d6: ; 1013d6 ; 1013dd Function1013dd: ; 1013dd - call Function3238 + call CGBOnly_LoadEDTile ret ; 1013e1 @@ -6880,7 +6880,7 @@ Function102e07: ; 102e07 ret ; 102e32 -.waiting: ; 102e32 +.waiting ; 102e32 db "Waiting...!@" ; 102e3e diff --git a/misc/mobile_41.asm b/misc/mobile_41.asm index 525bd7b80..44db58602 100755 --- a/misc/mobile_41.asm +++ b/misc/mobile_41.asm @@ -1095,5 +1095,5 @@ LoadOverworldFont:: ; 106594 ret ; 1065ad -.bgfont: +.bgfont INCBIN "gfx/unknown/1065ad.2bpp" diff --git a/misc/mobile_42.asm b/misc/mobile_42.asm index 950a3f0c2..a24efd10c 100644 --- a/misc/mobile_42.asm +++ b/misc/mobile_42.asm @@ -9,7 +9,7 @@ MobileTradeAnimation_SendGivemonToGTS: ; 108000 mobiletradeanim_showgtsgivemon mobiletradeanim_12 mobiletradeanim_10 - mobiletradeanim_sendmon + mobiletradeanim_sendmon mobiletradeanim_06 mobiletradeanim_0f mobiletradeanim_end @@ -29,7 +29,7 @@ asm_108018: .TradeAnimScript: mobiletradeanim_11 mobiletradeanim_07 - mobiletradeanim_receivemon + mobiletradeanim_receivemon mobiletradeanim_showgtsgetmon mobiletradeanim_end @@ -50,9 +50,9 @@ asm_10802c: mobiletradeanim_showgivemon mobiletradeanim_12 mobiletradeanim_02 - mobiletradeanim_sendmon + mobiletradeanim_sendmon mobiletradeanim_05 - mobiletradeanim_receivemon + mobiletradeanim_receivemon mobiletradeanim_showgetmon mobiletradeanim_end @@ -66,7 +66,7 @@ Function10803d: ; 10803d .TradeAnimScript: mobiletradeanim_11 mobiletradeanim_07 - mobiletradeanim_receivemon + mobiletradeanim_receivemon mobiletradeanim_showoddegg mobiletradeanim_end @@ -351,7 +351,7 @@ MobileTradeAnim_JumptableLoop: ; 10824b and a ret -.StopAnim +.StopAnim: xor a ld [hSCX], a ld [hSCY], a @@ -382,7 +382,7 @@ endr ; 10828a .Jumptable: ; 10828a - + dw GetMobileTradeAnimByte ; 00 dw MobileTradeAnim_ShowPlayerMonToBeSent ; 01 dw MobileTradeAnim_02 ; 02 @@ -1534,7 +1534,7 @@ Function108b78: ; 108b78 ld de, (31 << 10) + (31 << 5) + 31 ; $7fff jr .load_pal -.Orange +.Orange: ld de, ( 1 << 10) + (15 << 5) + 31 ; $05ff .load_pal ld a, e @@ -1680,7 +1680,7 @@ Function108c40: ; 108c40 call DelayFrames ret -.Getmon +.Getmon: ld hl, .TakeGoodCareOf call PrintText ld c, 80 diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm index a5f9bbddb..a7feeea28 100755 --- a/misc/mobile_46.asm +++ b/misc/mobile_46.asm @@ -1858,7 +1858,7 @@ Function118f14: ld hl, Text_SaveFileWillBeSent call Function11a9c0 -.DontSendSaveFile +.DontSendSaveFile: ld a, [wcd57] ld l, a ld a, [wcd58] @@ -4252,10 +4252,10 @@ Function119ed8: ; 119ed8 (46:5ed8) ld [hBGMapMode], a ret -.RunJumptable +.RunJumptable: jumptable .Jumptable, wcd3c -.Jumptable +.Jumptable: dw Function119f3f dw Function119f45 dw Function119f56 @@ -5846,12 +5846,12 @@ Function11ad1b: ; 11ad1b ld [hObjectStructIndexBuffer], a ld a, $10 ld [wCurIconTile], a - ld hl, Function8e83f - ld a, BANK(Function8e83f) + ld hl, LoadMenuMonIcon + ld a, BANK(LoadMenuMonIcon) ld e, $4 rst FarCall - ld hl, Function8e83f - ld a, BANK(Function8e83f) + ld hl, LoadMenuMonIcon + ld a, BANK(LoadMenuMonIcon) ld e, $5 rst FarCall ld hl, $c6d0 @@ -7086,7 +7086,7 @@ Mobile46_RunJumptable: ; 11b45c .IterateJumptable: ; 11b46a jumptable .Jumptable, wJumptableIndex -.Jumptable +.Jumptable: dw Function11b483 dw Function11b570 dw Function11b5c0 @@ -7232,7 +7232,7 @@ Function11b483: ; 11b483 call CloseSRAM jp Function11ad8a -.InitRAM +.InitRAM: ld bc, $c626 ld a, [PlayerID] ld [wcd2a], a @@ -7285,7 +7285,7 @@ Function11b570: ; 11b570 ld [wJumptableIndex], a ret -.SaveData +.SaveData: ld a, $3 ld [rSVBK], a @@ -7390,9 +7390,9 @@ Function11b5e8: ; 11b5e8 jr nz, .loop ret -.RunJumptable +.RunJumptable: jumptable .Jumptable, wJumptableIndex -.Jumptable +.Jumptable: dw Function11b66d dw Function11b6b3 ; 11b66d diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm index e031d962c..415ff7e38 100644 --- a/misc/mobile_5f.asm +++ b/misc/mobile_5f.asm @@ -213,15 +213,15 @@ CheckStringForErrors: ; 17d073 cp $49 jr c, .NextChar -.Fail +.Fail: scf ret -.NextChar +.NextChar: dec c jr nz, .loop -.Done +.Done: and a ret ; 17d0b3 @@ -448,12 +448,12 @@ Special_Menu_ChallengeExplanationCancel: ; 17d224 ld hl, MenuDataHeader_17d26a ; Japanese Menu, where you can choose 'News' as an option jr .Load_Interpret -.English +.English: ld a, $4 ld [ScriptVar], a ld hl, MenuDataHeader_ChallengeExplanationCancel ; English Menu -.Load_Interpret +.Load_Interpret: call LoadMenuDataHeader call Function17d246 call CloseWindow @@ -473,14 +473,14 @@ Function17d246: ; 17d246 dec a jr .LoadToScriptVar -.UsewMenuCursorY +.UsewMenuCursorY: ld a, [wMenuCursorY] -.LoadToScriptVar +.LoadToScriptVar: ld [ScriptVar], a ret -.Exit +.Exit: ld a, $4 ld [ScriptVar], a ret @@ -4869,7 +4869,7 @@ Function17f6b7: ; 17f6b7 ret ; 17f6cd -.bcd_two_digits: ; 17f6cd +.bcd_two_digits ; 17f6cd ld c, a and $f0 swap a @@ -4877,7 +4877,7 @@ Function17f6b7: ; 17f6b7 ld a, c and $f -.bcd_digit: ; 17f6d8 +.bcd_digit ; 17f6d8 add "0" ld [hli], a ret diff --git a/misc/mobile_menu.asm b/misc/mobile_menu.asm index 8975a5151..d9fd3dd34 100755 --- a/misc/mobile_menu.asm +++ b/misc/mobile_menu.asm @@ -424,7 +424,7 @@ Function4a28a: ; 4a28a (12:628a) scf ret -.DeleteLoginPassword +.DeleteLoginPassword: call PlaceHollowCursor ld hl, UnknownText_0x4a358 call PrintText |